pane: cleanup

7 files changed, 9 insertions, 23 deletions

diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 4f2a84221..45fea6b74 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -4771,7 +4771,7 @@ create_properties_window (StartupData *startup_data)
 	NautilusPropertiesWindow *window;
 	GList *l;
 
-	window = NAUTILUS_PROPERTIES_WINDOW (gtk_widget_new (nautilus_properties_window_get_type (), NULL));
+	window = NAUTILUS_PROPERTIES_WINDOW (gtk_widget_new (NAUTILUS_TYPE_PROPERTIES_WINDOW, NULL));
 
 	window->details->original_files = nautilus_file_list_copy (startup_data->original_files);
 	
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 123d04d95..bded52ad2 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -290,12 +290,9 @@ static void
 viewed_file_changed_callback (NautilusFile *file,
                               NautilusWindowSlot *slot)
 {
-	NautilusWindow *window;
         GFile *new_location;
 	gboolean is_in_trash, was_in_trash;
 
-	window = nautilus_window_slot_get_window (slot);
-
         g_assert (NAUTILUS_IS_FILE (file));
 	g_assert (NAUTILUS_IS_WINDOW_PANE (slot->pane));
 	g_assert (file == slot->viewed_file);
@@ -1054,14 +1051,12 @@ load_new_location (NautilusWindowSlot *slot,
 		   gboolean tell_current_content_view,
 		   gboolean tell_new_content_view)
 {
-	NautilusWindow *window;
 	GList *selection_copy;
 	NautilusView *view;
 
 	g_assert (slot != NULL);
 	g_assert (location != NULL);
 
-	window = nautilus_window_slot_get_window (slot);
 	selection_copy = eel_g_object_list_copy (selection);
 	view = NULL;
 	
@@ -1735,7 +1730,6 @@ void
 nautilus_window_slot_set_content_view (NautilusWindowSlot *slot,
 				       const char *id)
 {
-	NautilusWindow *window;
 	NautilusFile *file;
 	char *uri;
 
@@ -1743,8 +1737,6 @@ nautilus_window_slot_set_content_view (NautilusWindowSlot *slot,
 	g_assert (slot->location != NULL);
 	g_assert (id != NULL);
 
-	window = nautilus_window_slot_get_window (slot);
-  
 	uri = nautilus_window_slot_get_location_uri (slot);
 	DEBUG ("Change view of window %s to %s", uri, id);
 	g_free (uri);
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 5d8a18be3..bcd5762aa 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -756,19 +756,19 @@ nautilus_window_update_split_view_actions_sensitivity (NautilusWindow *window)
 	action_group = nautilus_window_get_main_action_group (window);
 
 	/* collect information */
-	have_multiple_panes = (window->details->panes && window->details->panes->next);
+	have_multiple_panes = nautilus_window_split_view_showing (window);
 	if (active_slot != NULL) {
 		active_pane_location = nautilus_window_slot_get_location (active_slot);
 	} else {
 		active_pane_location = NULL;
 	}
+
 	next_pane = nautilus_window_get_next_pane (window);
 	if (next_pane && next_pane->active_slot) {
 		next_pane_location = nautilus_window_slot_get_location (next_pane->active_slot);
 		next_pane_is_in_same_location = (active_pane_location && next_pane_location &&
 						 g_file_equal (active_pane_location, next_pane_location));
-	}
-	else {
+	} else {
 		next_pane_location = NULL;
 		next_pane_is_in_same_location = FALSE;
 	}
diff --git a/src/nautilus-window-pane.c b/src/nautilus-window-pane.c
index fb794846c..d735782ec 100644
--- a/src/nautilus-window-pane.c
+++ b/src/nautilus-window-pane.c
@@ -327,7 +327,7 @@ path_bar_button_pressed_callback (GtkWidget *widget,
 				uri = g_file_get_uri (location);
 				nautilus_view_pop_up_location_context_menu (
 					view, event, uri);
-				g_object_unref (G_OBJECT (location));
+				g_object_unref (location);
 				g_free (uri);
 				return TRUE;
 			}
@@ -1009,7 +1009,7 @@ nautilus_window_pane_slot_close (NautilusWindowPane *pane,
 				DEBUG ("Last slot removed from the pane %p, closing it", pane);
 				nautilus_window_close_pane (window, pane);
 
-				new_pane = window->details->panes->data;
+				new_pane = g_list_nth_data (window->details->panes, 0);
 
 				if (new_pane->active_slot == NULL) {
 					new_pane->active_slot = get_first_inactive_slot (new_pane);
diff --git a/src/nautilus-window-types.h b/src/nautilus-window-types.h
index fa82dec8a..e918588b5 100644
--- a/src/nautilus-window-types.h
+++ b/src/nautilus-window-types.h
@@ -41,9 +41,7 @@ typedef void (* NautilusWindowGoToCallback) (NautilusWindow *window,
                                              gpointer user_data);
 
 typedef enum {
-        /* used in spatial mode */
         NAUTILUS_WINDOW_OPEN_FLAG_CLOSE_BEHIND = 1<<0,
-        /* used in navigation mode */
         NAUTILUS_WINDOW_OPEN_FLAG_NEW_WINDOW = 1<<1,
         NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB = 1<<2
 } NautilusWindowOpenFlags;
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index c31f9d1b9..eb8431e7c 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -60,7 +60,6 @@
 #include <libnautilus-private/nautilus-file-attributes.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <libnautilus-private/nautilus-metadata.h>
-#include <libnautilus-private/nautilus-program-choosing.h>
 #include <libnautilus-private/nautilus-clipboard.h>
 #include <libnautilus-private/nautilus-undo.h>
 #include <libnautilus-private/nautilus-search-directory.h>
@@ -1207,7 +1206,7 @@ replace_extra_viewer_in_view_as_menus (NautilusWindow *window)
 }
 
 /**
- * nautilus_window_synch_view_as_menus:
+ * nautilus_window_sync_view_as_menus:
  * 
  * Set the visible item of the "View as" option menu and
  * the marked "View as" item in the View menu to
@@ -1216,7 +1215,7 @@ replace_extra_viewer_in_view_as_menus (NautilusWindow *window)
  * @window: The NautilusWindow whose "View as" option menu should be synched.
  */
 static void
-nautilus_window_synch_view_as_menus (NautilusWindow *window)
+nautilus_window_sync_view_as_menus (NautilusWindow *window)
 {
 	NautilusWindowSlot *slot;
 	int index;
@@ -1336,10 +1335,9 @@ load_view_as_menu (NautilusWindow *window)
 					    -1);
 	g_object_unref (window->details->view_as_action_group); /* owned by ui_manager */
 
-	nautilus_window_synch_view_as_menus (window);
+	nautilus_window_sync_view_as_menus (window);
 
 	g_signal_emit (window, signals[VIEW_AS_CHANGED], 0);
-
 }
 
 static void
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index 3fdff540f..9a9ca337c 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -56,8 +56,6 @@ typedef enum {
         NAUTILUS_WINDOW_SHOW_HIDDEN_FILES_DISABLE
 } NautilusWindowShowHiddenFilesMode;
 
-GType          nautilus_window_slot_get_type (void);
-
 typedef enum {
         NAUTILUS_WINDOW_NOT_SHOWN,
         NAUTILUS_WINDOW_POSITION_SET,