Make "Customise toolbars" insensitive when toolbars are hidden. Patch by

2007-07-26  Diego Escalante Urrelo  <diegoe@gnome.org>

	* src/ephy-window.c:

	Make "Customise toolbars" insensitive when toolbars are hidden. Patch
	by René Stadler. Fixes bug #164227.


svn path=/trunk/; revision=7205

2 files changed, 16 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a80af31f1..d64feac37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-26  Diego Escalante Urrelo  <diegoe@gnome.org>
+
+	* src/ephy-window.c:
+
+	Make "Customise toolbars" insensitive when toolbars are hidden. Patch
+	by René Stadler. Fixes bug #164227.
+
 2007-07-26  Reinout van Schouwen <reinouts@gnome.org>
 	
 	* embed/mozilla/EphyAboutModule.cpp:
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 685a1f2ff..c18d4fec1 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -653,6 +653,7 @@ sync_chromes_visibility (EphyWindow *window)
 {
 	EphyWindowPrivate *priv = window->priv;
 	GtkWidget *menubar;
+	GtkAction *action;
 	gboolean show_statusbar, show_menubar, show_toolbar, show_tabsbar;
 
 	if (priv->closing) return;
@@ -670,9 +671,17 @@ sync_chromes_visibility (EphyWindow *window)
 
 	ephy_notebook_set_show_tabs (EPHY_NOTEBOOK (priv->notebook), show_tabsbar);
 
+	action = gtk_action_group_get_action (priv->action_group, "ViewToolbarEditor");
+
 	if (priv->fullscreen_popup != NULL)
 	{
 		g_object_set (priv->fullscreen_popup, "visible", !show_toolbar, NULL);
+
+		ephy_action_change_sensitivity_flags (action, SENS_FLAG_CHROME, TRUE);
+	}
+	else
+	{
+		ephy_action_change_sensitivity_flags (action, SENS_FLAG_CHROME, !show_toolbar);
 	}
 }
 
@@ -2842,9 +2851,6 @@ ephy_window_state_event (GtkWidget *widget,
 		gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), fullscreen);
 		g_signal_handlers_unblock_by_func
 			(action, G_CALLBACK (window_cmd_view_fullscreen), window);
-
-		action = gtk_action_group_get_action (action_group, "ViewToolbarEditor");
-		ephy_action_change_sensitivity_flags (action, SENS_FLAG_CHROME, fullscreen);
 	}
 
 	return FALSE;