From aa6696e05a7c2614eccde660bf06554735ace3e2 Mon Sep 17 00:00:00 2001
From: Jasmine Hassan <jasmine.aura@gmail.com>
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 ++++----
 src/caja-spatial-window.c    | 1 -
 src/caja-window.c            | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'src')

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 <libcaja-private/caja-file-utilities.h>
 #include <libcaja-private/caja-file-attributes.h>
 #include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-horizontal-splitter.h>
 #include <libcaja-private/caja-icon-info.h>
 #include <libcaja-private/caja-metadata.h>
 #include <libcaja-private/caja-mime-actions.h>
@@ -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)));
 }
 
 /**
diff --git a/src/caja-spatial-window.c b/src/caja-spatial-window.c
index 524fbb9b..5dd3bbce 100644
--- a/src/caja-spatial-window.c
+++ b/src/caja-spatial-window.c
@@ -56,7 +56,6 @@
 #include <libcaja-private/caja-ui-utilities.h>
 #include <libcaja-private/caja-file-attributes.h>
 #include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-horizontal-splitter.h>
 #include <libcaja-private/caja-metadata.h>
 #include <libcaja-private/caja-mime-actions.h>
 #include <libcaja-private/caja-program-choosing.h>
diff --git a/src/caja-window.c b/src/caja-window.c
index 27e2852f..14c5d5c4 100644
--- a/src/caja-window.c
+++ b/src/caja-window.c
@@ -55,7 +55,6 @@
 #include <libcaja-private/caja-file-utilities.h>
 #include <libcaja-private/caja-file-attributes.h>
 #include <libcaja-private/caja-global-preferences.h>
-#include <libcaja-private/caja-horizontal-splitter.h>
 #include <libcaja-private/caja-metadata.h>
 #include <libcaja-private/caja-mime-actions.h>
 #include <libcaja-private/caja-program-choosing.h>
-- 
cgit v1.2.1