[nautilus] window: don't care looking for toolbar extension items



commit 6ebdfd9b5477178c9ab28c19e270b9dc4a53d6df
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Feb 15 14:07:46 2011 -0500

    window: don't care looking for toolbar extension items
    
    As we removed them.

 src/Makefile.am                       |    1 -
 src/nautilus-navigation-window-slot.c |    7 --
 src/nautilus-window-manage-views.c    |    5 -
 src/nautilus-window-toolbars.c        |  134 ---------------------------------
 4 files changed, 0 insertions(+), 147 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 7093745..90766a2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -155,7 +155,6 @@ nautilus_SOURCES = \
 	nautilus-window-slot.h			\
 	nautilus-window-slot-dnd.c		\
 	nautilus-window-slot-dnd.h		\
-	nautilus-window-toolbars.c              \
 	nautilus-window.c			\
 	nautilus-window.h			\
 	nautilus-window-types.h			\
diff --git a/src/nautilus-navigation-window-slot.c b/src/nautilus-navigation-window-slot.c
index 4eb132d..edd86a8 100644
--- a/src/nautilus-navigation-window-slot.c
+++ b/src/nautilus-navigation-window-slot.c
@@ -174,13 +174,10 @@ nautilus_navigation_window_slot_update_query_editor (NautilusWindowSlot *slot)
 static void
 nautilus_navigation_window_slot_active (NautilusWindowSlot *slot)
 {
-	NautilusNavigationWindow *window;
 	NautilusNavigationWindowPane *pane;
 	int page_num;
 
 	pane = NAUTILUS_NAVIGATION_WINDOW_PANE (slot->pane);
-	window = NAUTILUS_NAVIGATION_WINDOW (slot->pane->window);
-
 	page_num = gtk_notebook_page_num (GTK_NOTEBOOK (pane->notebook),
 					  slot->content_box);
 	g_assert (page_num >= 0);
@@ -188,10 +185,6 @@ nautilus_navigation_window_slot_active (NautilusWindowSlot *slot)
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (pane->notebook), page_num);
 
 	EEL_CALL_PARENT (NAUTILUS_WINDOW_SLOT_CLASS, active, (slot));
-
-	if (slot->viewed_file != NULL) {
-		nautilus_navigation_window_load_extension_toolbar_items (window);
-	}
 }
  
 static void
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 87304eb..c639c60 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -1598,11 +1598,6 @@ update_for_new_location (NautilusWindowSlot *slot)
 		if (location_really_changed) {
 			nautilus_window_pane_sync_search_widgets (slot->pane);
 		}
-
-		if (NAUTILUS_IS_NAVIGATION_WINDOW (window) &&
-		    slot->pane == window->details->active_pane) {
-			nautilus_navigation_window_load_extension_toolbar_items (NAUTILUS_NAVIGATION_WINDOW (window));
-		}
 	}
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]