nautilus r15140 - in trunk: . src

[cosimoc svn gnome org]

Author: cosimoc
Date: Thu Mar 19 15:32:53 2009
New Revision: 15140
URL: http://svn.gnome.org/viewvc/nautilus?rev=15140&view=rev

Log:
2009-03-19  Cosimo Cecchi  <cosimoc gnome org>

	* src/nautilus-navigation-window.c:
	(always_use_location_entry_changed),
	(nautilus_navigation_window_set_bar_mode):
	Always synchronize the location bar button with the pathbar
	mode. Patch by PaweÅ Paprota (#416891).


Modified:
   trunk/ChangeLog
   trunk/src/nautilus-navigation-window.c

Modified: trunk/src/nautilus-navigation-window.c
==============================================================================
--- trunk/src/nautilus-navigation-window.c	(original)
+++ trunk/src/nautilus-navigation-window.c	Thu Mar 19 15:32:53 2009
@@ -531,14 +531,6 @@
 	} else {
 		nautilus_navigation_window_set_bar_mode (window, NAUTILUS_BAR_PATH);
 	}
-
-	g_signal_handlers_block_by_func (window->details->location_button,
-					 G_CALLBACK (location_button_toggled_cb),
-					 window);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (window->details->location_button), use_entry);
-	g_signal_handlers_unblock_by_func (window->details->location_button,
-					   G_CALLBACK (location_button_toggled_cb),
-					   window);
 }
 
 static void
@@ -1644,6 +1636,8 @@
 nautilus_navigation_window_set_bar_mode (NautilusNavigationWindow *window,
 					 NautilusBarMode mode)
 {
+	gboolean use_entry;
+
 	switch (mode) {
 
 	case NAUTILUS_BAR_PATH:
@@ -1664,6 +1658,19 @@
 		gtk_widget_hide (window->navigation_bar);
 		break;
 	}
+
+	if (mode == NAUTILUS_BAR_NAVIGATION || mode == NAUTILUS_BAR_PATH) {
+		use_entry = (mode == NAUTILUS_BAR_NAVIGATION);
+
+		g_signal_handlers_block_by_func (window->details->location_button,
+						 G_CALLBACK (location_button_toggled_cb),
+						 window);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (window->details->location_button),
+					      use_entry);
+		g_signal_handlers_unblock_by_func (window->details->location_button,
+						   G_CALLBACK (location_button_toggled_cb),
+						   window);
+	}
 }
 
 gboolean