[nautilus] window: misc cleanups

[Cosimo Cecchi <cosimoc src gnome org>]

commit 8de64274a60b9800e7dfe8efbee96d34ea26214c
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed May 30 09:56:07 2012 -0400

    window: misc cleanups

 src/nautilus-window-bookmarks.c |    2 +-
 src/nautilus-window-private.h   |   14 --------------
 src/nautilus-window-slot.h      |    8 ++------
 src/nautilus-window.c           |    1 -
 4 files changed, 3 insertions(+), 22 deletions(-)
---
diff --git a/src/nautilus-window-bookmarks.c b/src/nautilus-window-bookmarks.c
index 2de0e9b..3debe60 100644
--- a/src/nautilus-window-bookmarks.c
+++ b/src/nautilus-window-bookmarks.c
@@ -248,7 +248,7 @@ activate_bookmark_in_menu_item (GtkAction *action, gpointer user_data)
         }
 }
 
-void
+static void
 nautilus_menus_append_bookmark_to_menu (NautilusWindow *window, 
 					NautilusBookmark *bookmark, 
 					const char *parent_path,
diff --git a/src/nautilus-window-private.h b/src/nautilus-window-private.h
index da0ecb6..f3b3866 100644
--- a/src/nautilus-window-private.h
+++ b/src/nautilus-window-private.h
@@ -42,7 +42,6 @@ struct NautilusWindowDetails
         
         GtkUIManager *ui_manager;
         GtkActionGroup *main_action_group; /* owned by ui_manager */
-        guint help_message_cid;
 
         /* Menus. */
         guint extensions_menu_merge_id;
@@ -93,12 +92,8 @@ struct NautilusWindowDetails
         gboolean temporary_navigation_bar;
         gboolean temporary_search_bar;
 
-        guint extensions_toolbar_merge_id;
-        GtkActionGroup *extensions_toolbar_action_group;
-
         /* focus widget before the location bar has been shown temporarily */
         GtkWidget *last_focus_widget;
-        	
 
         gboolean disable_chrome;
 
@@ -121,15 +116,6 @@ typedef void (*NautilusBookmarkFailedCallback) (NautilusWindow *window,
 
 void               nautilus_window_load_view_as_menus                    (NautilusWindow    *window);
 void               nautilus_window_load_extension_menus                  (NautilusWindow    *window);
-void               nautilus_menus_append_bookmark_to_menu                (NautilusWindow    *window, 
-                                                                          NautilusBookmark  *bookmark, 
-                                                                          const char        *parent_path,
-                                                                          const char        *parent_id,
-                                                                          guint              index_in_parent,
-                                                                          GtkActionGroup    *action_group,
-                                                                          guint              merge_id,
-                                                                          GCallback          refresh_callback,
-                                                                          NautilusBookmarkFailedCallback failed_callback);
 
 NautilusWindowSlot *nautilus_window_get_slot_for_view                    (NautilusWindow *window,
 									  NautilusView   *view);
diff --git a/src/nautilus-window-slot.h b/src/nautilus-window-slot.h
index 8fe6147..a1ef1c8 100644
--- a/src/nautilus-window-slot.h
+++ b/src/nautilus-window-slot.h
@@ -51,12 +51,8 @@ struct NautilusWindowSlotClass {
 	void (* inactive) (NautilusWindowSlot *slot);
 };
 
-/* Each NautilusWindowSlot corresponds to
- * a location in the window for displaying
- * a NautilusView.
- *
- * For navigation windows, this would be a
- * tab, while spatial windows only have one slot.
+/* Each NautilusWindowSlot corresponds to a location in the window
+ * for displaying a NautilusView, i.e. a tab.
  */
 struct NautilusWindowSlot {
 	GtkBox parent;
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 4202fb1..a7b2585 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1868,7 +1868,6 @@ load_view_as_menu (NautilusWindow *window)
 		window->details->view_as_action_group = NULL;
 	}
 
-	
 	refresh_stored_viewers (window);
 
 	merge_id = gtk_ui_manager_new_merge_id (window->details->ui_manager);