Fixed multipane again..

Author: mtwebster

src/nemo-window-menus.c

@@ -648,9 +648,6 @@ action_split_view_callback (GtkAction *action,
 		NemoWindowSlot *slot;
 
 		if (is_active) {
-            if (nemo_window_preview_pane_showing (window)) {
-                nemo_window_preview_pane_off (window);
-            }
 			nemo_window_split_view_on (window);
 		} else {
 			nemo_window_split_view_off (window);
@@ -661,7 +658,6 @@ action_split_view_callback (GtkAction *action,
 			nemo_view_update_menus (slot->content_view);
 		}
 	}
-    nemo_window_update_show_hide_ui_elements (window);
 }
 
 static void
@@ -682,9 +678,6 @@ action_preview_pane_callback (GtkAction *action,
 		NemoWindowSlot *slot;
 
 		if (is_active) {
-            if (nemo_window_split_view_showing (window)) {
-                nemo_window_split_view_off (window);
-            }
 			nemo_window_preview_pane_on (window);
 		} else {
 			nemo_window_preview_pane_off (window);
@@ -695,7 +688,6 @@ action_preview_pane_callback (GtkAction *action,
 			nemo_view_update_menus (slot->content_view);
 		}
 	}
-    nemo_window_update_show_hide_ui_elements (window);
 }
 
 static void

src/nemo-window-private.h

@@ -72,6 +72,9 @@ struct NemoWindowDetails
         NemoWindowPane *active_pane;
 
         GtkWidget *content_paned;
+        GtkWidget *base_paned;
+        GtkWidget *secondary_paned;
+
         NemoNavigationState *nav_state;
 
         /* Side Pane */
@@ -92,9 +95,6 @@ struct NemoWindowDetails
 
         guint menu_hide_delay_id;
 
-        /* split view */
-        GtkWidget *split_view_hpane;
-
         // A closed pane's location, valid until the remaining pane
         // location changes.
         GFile *secondary_pane_last_location;