diff options
| author | Jasmine Hassan <[email protected]> | 2012-10-31 04:23:12 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:45:51 +0200 |
| commit | 4895118afc287dc511792a5f91f109a2e1f868d0 (patch) | |
| tree | 21a92696c37001614f506534bf3c85b826e79701 /libcaja-private/caja-entry.c | |
| parent | ca47debc4ffe4f3ec5b8d6094261dbef02b73dcd (diff) | |
| download | caja-4895118afc287dc511792a5f91f109a2e1f868d0.tar.bz2 caja-4895118afc287dc511792a5f91f109a2e1f868d0.tar.xz | |
[lc-p] don't use GtkObject (GTK3)
the ::destroy signal of GtkObject has only been moved to GtkWidget in GTK3
(after GtkObject removal): http://developer.gnome.org/gtk3/3.0/ch25s02.html
So, we use conditionals in this case, to keep working with GTK2
Original commit:
http://git.gnome.org/browse/nautilus/commit/?id=aef4cfcf93ef34a0b2d4c87b40fcec2b7a66dd06
Diffstat (limited to 'libcaja-private/caja-entry.c')
| -rw-r--r-- | libcaja-private/caja-entry.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libcaja-private/caja-entry.c b/libcaja-private/caja-entry.c index 863b1b4f..fb9ac38c 100644 --- a/libcaja-private/caja-entry.c +++ b/libcaja-private/caja-entry.c @@ -395,12 +395,10 @@ static void caja_entry_class_init (CajaEntryClass *class) { GtkWidgetClass *widget_class; - GtkObjectClass *object_class; GObjectClass *gobject_class; widget_class = GTK_WIDGET_CLASS (class); gobject_class = G_OBJECT_CLASS (class); - object_class = GTK_OBJECT_CLASS (class); widget_class->button_press_event = caja_entry_button_press; widget_class->button_release_event = caja_entry_button_release; @@ -413,19 +411,17 @@ caja_entry_class_init (CajaEntryClass *class) /* Set up signals */ signals[USER_CHANGED] = g_signal_new ("user_changed", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (CajaEntryClass, - user_changed), + G_STRUCT_OFFSET (CajaEntryClass, user_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); signals[SELECTION_CHANGED] = g_signal_new ("selection_changed", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (CajaEntryClass, - selection_changed), + G_STRUCT_OFFSET (CajaEntryClass, selection_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); |