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-icon-container.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-icon-container.c')
| -rw-r--r-- | libcaja-private/caja-icon-container.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c index f9b01311..0f6898c9 100644 --- a/libcaja-private/caja-icon-container.c +++ b/libcaja-private/caja-icon-container.c @@ -4379,10 +4379,12 @@ select_previous_or_next_icon (CajaIconContainer *container, } #endif -/* GtkObject methods. */ - static void +#if GTK_CHECK_VERSION(3, 0, 0) +destroy (GtkWidget *object) +#else destroy (GtkObject *object) +#endif { CajaIconContainer *container; @@ -4439,8 +4441,11 @@ destroy (GtkObject *object) } } - +#if GTK_CHECK_VERSION(3, 0, 0) + GTK_WIDGET_CLASS (caja_icon_container_parent_class)->destroy (object); +#else GTK_OBJECT_CLASS (caja_icon_container_parent_class)->destroy (object); +#endif } static void @@ -6213,7 +6218,12 @@ caja_icon_container_class_init (CajaIconContainerClass *class) G_OBJECT_CLASS (class)->constructor = caja_icon_container_constructor; G_OBJECT_CLASS (class)->finalize = finalize; + +#if GTK_CHECK_VERSION(3, 0, 0) + GTK_WIDGET_CLASS (class)->destroy = destroy; +#else GTK_OBJECT_CLASS (class)->destroy = destroy; +#endif /* Signals. */ |