Don't show the Leave Fullscreen button in lockdown fullscreen mode. Switch

2005-01-26  Christian Persch  <chpe@cvs.gnome.org>

	* src/ephy-fullscreen-popup.c:
	(ephy_fullscreen_popup_update_visibility),
	(ephy_fullscreen_popup_set_show_leave),
	(ephy_fullscreen_popup_init):
	* src/ephy-fullscreen-popup.h:
	* src/ephy-toolbar.c: (ephy_toolbar_update_fixed_visibility),
	(ephy_toolbar_set_show_leave_fullscreen):
	* src/ephy-toolbar.h:
	* src/ephy-window.c: (ephy_window_fullscreen),
	(ephy_window_unfullscreen):

	Don't show the Leave Fullscreen button in lockdown fullscreen mode.
	Switch to fullscreen toolbar also in lockdown fullscreen mode.
	Fixes bug #165256.

1 files changed, 9 insertions, 7 deletions

diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c
index 8ece4642a..a92b22a68 100755
--- a/src/ephy-toolbar.c
+++ b/src/ephy-toolbar.c
@@ -75,7 +75,7 @@ struct _EphyToolbarPrivate
 	gulong set_focus_handler;
 	gboolean show_lock;
 	gboolean lock_visible;
-	gboolean fullscreen;
+	gboolean leave_fullscreen_visible;
 	gboolean spinning;
 };
 
@@ -119,10 +119,12 @@ static void
 ephy_toolbar_update_fixed_visibility (EphyToolbar *toolbar)
 {
 	EphyToolbarPrivate *priv = toolbar->priv;
+	gboolean show;
 
-	g_object_set (priv->sep_item, "visible", priv->fullscreen, NULL);
-	g_object_set (priv->exit_button, "visible", priv->fullscreen,
-					 "sensitive", priv->fullscreen, NULL);
+	show = priv->leave_fullscreen_visible;
+	g_object_set (priv->sep_item, "visible", show, NULL);
+	g_object_set (priv->exit_button, "visible", show,
+					 "sensitive", show, NULL);
 }
 
 static void
@@ -412,12 +414,12 @@ ephy_toolbar_set_favicon (EphyToolbar *toolbar,
 }
 
 void
-ephy_toolbar_set_fullscreen_mode (EphyToolbar *toolbar,
-				  gboolean fullscreen)
+ephy_toolbar_set_show_leave_fullscreen (EphyToolbar *toolbar,
+					gboolean show)
 {
 	EphyToolbarPrivate *priv = toolbar->priv;
 
-	priv->fullscreen = fullscreen;
+	priv->leave_fullscreen_visible = show;
 
 	ephy_toolbar_update_fixed_visibility (toolbar);
 }