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-window.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-window.c')
| -rw-r--r-- | src/caja-navigation-window.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/caja-navigation-window.c b/src/caja-navigation-window.c index db9cf523..3cddcb26 100644 --- a/src/caja-navigation-window.c +++ b/src/caja-navigation-window.c @@ -593,7 +593,11 @@ caja_navigation_window_button_press_event (GtkWidget *widget, } static void +#if GTK_CHECK_VERSION (3, 0, 0) +caja_navigation_window_destroy (GtkWidget *object) +#else caja_navigation_window_destroy (GtkObject *object) +#endif { CajaNavigationWindow *window; @@ -609,7 +613,11 @@ caja_navigation_window_destroy (GtkObject *object) window->details->content_paned = NULL; window->details->split_view_hpane = NULL; +#if GTK_CHECK_VERSION (3, 0, 0) + GTK_WIDGET_CLASS (parent_class)->destroy (object); +#else GTK_OBJECT_CLASS (parent_class)->destroy (object); +#endif } static void @@ -1243,7 +1251,11 @@ caja_navigation_window_class_init (CajaNavigationWindowClass *class) CAJA_WINDOW_CLASS (class)->bookmarks_placeholder = MENU_PATH_BOOKMARKS_PLACEHOLDER; G_OBJECT_CLASS (class)->finalize = caja_navigation_window_finalize; +#if GTK_CHECK_VERSION (3, 0, 0) + GTK_WIDGET_CLASS (class)->destroy = caja_navigation_window_destroy; +#else GTK_OBJECT_CLASS (class)->destroy = caja_navigation_window_destroy; +#endif GTK_WIDGET_CLASS (class)->show = caja_navigation_window_show; GTK_WIDGET_CLASS (class)->unrealize = caja_navigation_window_unrealize; GTK_WIDGET_CLASS (class)->window_state_event = caja_navigation_window_state_event; |