From 2472d52a0f28dd84d362dcc5570e747a82aa8ba6 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Wed, 31 Oct 2012 04:42:15 +0200 Subject: [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 --- src/caja-navigation-window.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/caja-navigation-window.c') 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; -- cgit v1.2.1 From aa6696e05a7c2614eccde660bf06554735ace3e2 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Wed, 7 Nov 2012 01:43:35 +0200 Subject: [horizontal-splitter] remove, and use a regular GtkPaned instead The feature it was bringing in (shrink when the paned handle is double-clicked) is even confusing. http://git.gnome.org/browse/nautilus/commit/?id=1620bd8a4e4ab1760c5c518dd954a4471645ce87 --- src/caja-navigation-window.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/caja-navigation-window.c') diff --git a/src/caja-navigation-window.c b/src/caja-navigation-window.c index 3cddcb26..eba87c47 100644 --- a/src/caja-navigation-window.c +++ b/src/caja-navigation-window.c @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include @@ -141,7 +140,7 @@ caja_navigation_window_init (CajaNavigationWindow *window) window->details->header_size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL); gtk_size_group_set_ignore_hidden (window->details->header_size_group, FALSE); - window->details->content_paned = caja_horizontal_splitter_new (); + window->details->content_paned = gtk_hpaned_new (); gtk_table_attach (GTK_TABLE (CAJA_WINDOW (window)->details->table), window->details->content_paned, /* X direction */ /* Y direction */ @@ -151,7 +150,8 @@ caja_navigation_window_init (CajaNavigationWindow *window) gtk_widget_show (window->details->content_paned); vbox = gtk_vbox_new (FALSE, 0); - caja_horizontal_splitter_pack2 (CAJA_HORIZONTAL_SPLITTER (window->details->content_paned), vbox); + gtk_paned_pack2 (GTK_PANED (window->details->content_paned), vbox, + TRUE, FALSE); gtk_widget_show (vbox); hpaned = gtk_hpaned_new (); @@ -1036,7 +1036,7 @@ caja_navigation_window_sidebar_showing (CajaNavigationWindow *window) g_return_val_if_fail (CAJA_IS_NAVIGATION_WINDOW (window), FALSE); return (window->sidebar != NULL) - && caja_horizontal_splitter_is_hidden (CAJA_HORIZONTAL_SPLITTER (window->details->content_paned)); + && gtk_widget_get_visible (gtk_paned_get_child1 (GTK_PANED (window->details->content_paned))); } /** -- cgit v1.2.1 From 1466df20591105550738a1d0784a623af9909abf Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sat, 10 Nov 2012 11:28:29 +0200 Subject: [navigation-window] Use gtk_paned_new for GTK3 instead of gtk_[h|v]paned_new http://git.gnome.org/browse/nautilus/commit/?id=0609431a5cb3803d0b98bd333f90e3c7796f86b7 --- src/caja-navigation-window.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/caja-navigation-window.c') diff --git a/src/caja-navigation-window.c b/src/caja-navigation-window.c index eba87c47..e5622af7 100644 --- a/src/caja-navigation-window.c +++ b/src/caja-navigation-window.c @@ -140,7 +140,11 @@ caja_navigation_window_init (CajaNavigationWindow *window) window->details->header_size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL); gtk_size_group_set_ignore_hidden (window->details->header_size_group, FALSE); +#if GTK_CHECK_VERSION(3, 0, 0) + window->details->content_paned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); +#else window->details->content_paned = gtk_hpaned_new (); +#endif gtk_table_attach (GTK_TABLE (CAJA_WINDOW (window)->details->table), window->details->content_paned, /* X direction */ /* Y direction */ @@ -154,7 +158,11 @@ caja_navigation_window_init (CajaNavigationWindow *window) TRUE, FALSE); gtk_widget_show (vbox); +#if GTK_CHECK_VERSION(3, 0, 0) + hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); +#else hpaned = gtk_hpaned_new (); +#endif gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0); gtk_widget_show (hpaned); window->details->split_view_hpane = hpaned; -- cgit v1.2.1