diff options
| author | Jasmine Hassan <[email protected]> | 2012-10-31 04:42:15 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:45:51 +0200 |
| commit | 2472d52a0f28dd84d362dcc5570e747a82aa8ba6 (patch) | |
| tree | 3761aac83f319d8e4fb76286b0a5e1f3e2430fe9 /src/caja-navigation-bar.c | |
| parent | ae33b1c624c008ca0818ab08735968c8d01fae1c (diff) | |
| download | caja-2472d52a0f28dd84d362dcc5570e747a82aa8ba6.tar.bz2 caja-2472d52a0f28dd84d362dcc5570e747a82aa8ba6.tar.xz | |
[src] 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 it working with GTK2.
A tad similar:
http://git.gnome.org/browse/nautilus/commit/?id=cc6cb51e827c0b15d4ef09f12d37b9f331ddcef8
Diffstat (limited to 'src/caja-navigation-bar.c')
| -rw-r--r-- | src/caja-navigation-bar.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/caja-navigation-bar.c b/src/caja-navigation-bar.c index c71d6503..89cd0e20 100644 --- a/src/caja-navigation-bar.c +++ b/src/caja-navigation-bar.c @@ -54,14 +54,11 @@ EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (caja_navigation_bar, set_location) static void caja_navigation_bar_class_init (CajaNavigationBarClass *klass) { - GtkObjectClass *object_class; GtkBindingSet *binding_set; - object_class = GTK_OBJECT_CLASS (klass); - signals[ACTIVATE] = g_signal_new ("activate", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (CajaNavigationBarClass, activate), @@ -71,7 +68,7 @@ caja_navigation_bar_class_init (CajaNavigationBarClass *klass) signals[CANCEL] = g_signal_new ("cancel", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (CajaNavigationBarClass, cancel), @@ -81,7 +78,7 @@ caja_navigation_bar_class_init (CajaNavigationBarClass *klass) signals[LOCATION_CHANGED] = g_signal_new ("location_changed", - G_TYPE_FROM_CLASS (object_class), + G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (CajaNavigationBarClass, location_changed), |