summaryrefslogtreecommitdiff
path: root/src/caja-location-bar.c
diff options
context:
space:
mode:
authorJasmine Hassan <[email protected]>2012-10-31 04:42:15 +0200
committerJasmine Hassan <[email protected]>2012-11-16 09:45:51 +0200
commit2472d52a0f28dd84d362dcc5570e747a82aa8ba6 (patch)
tree3761aac83f319d8e4fb76286b0a5e1f3e2430fe9 /src/caja-location-bar.c
parentae33b1c624c008ca0818ab08735968c8d01fae1c (diff)
downloadcaja-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-location-bar.c')
-rw-r--r--src/caja-location-bar.c20
1 files changed, 14 insertions, 6 deletions
diff --git a/src/caja-location-bar.c b/src/caja-location-bar.c
index 6fdc34e5..428f26a1 100644
--- a/src/caja-location-bar.c
+++ b/src/caja-location-bar.c
@@ -356,7 +356,11 @@ finalize (GObject *object)
}
static void
+#if GTK_CHECK_VERSION (3, 0, 0)
+destroy (GtkWidget *object)
+#else
destroy (GtkObject *object)
+#endif
{
CajaLocationBar *bar;
@@ -372,21 +376,25 @@ destroy (GtkObject *object)
g_free (bar->details->last_location);
bar->details->last_location = NULL;
+#if GTK_CHECK_VERSION (3, 0, 0)
+ EEL_CALL_PARENT (GTK_WIDGET_CLASS, destroy, (object));
+#else
EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+#endif
}
static void
caja_location_bar_class_init (CajaLocationBarClass *class)
{
- GObjectClass *gobject_class;
- GtkObjectClass *object_class;
CajaNavigationBarClass *navigation_bar_class;
- gobject_class = G_OBJECT_CLASS (class);
- gobject_class->finalize = finalize;
+ G_OBJECT_CLASS (class)->finalize = finalize;
- object_class = GTK_OBJECT_CLASS (class);
- object_class->destroy = destroy;
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GTK_WIDGET_CLASS (class)->destroy = destroy;
+#else
+ GTK_OBJECT_CLASS (class)->destroy = destroy;
+#endif
navigation_bar_class = CAJA_NAVIGATION_BAR_CLASS (class);