From 7e8b3175b44e3cfd5444e9616567821d5835d909 Mon Sep 17 00:00:00 2001
From: Xan Lopez <xan@igalia.com>
Date: Tue, 20 Dec 2011 15:29:12 +0100
Subject: Remove the "Hide menubar" option

The menubar will be gone for 3.4, so this will be useless.
---
 src/ephy-window.c | 21 ---------------------
 1 file changed, 21 deletions(-)

(limited to 'src')

diff --git a/src/ephy-window.c b/src/ephy-window.c
index 9aa3f3c1a..a91520777 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -91,8 +91,6 @@ static void notebook_switch_page_cb		(GtkNotebook *notebook,
 						 EphyWindow *window);
 static void ephy_window_view_toolbar_cb         (GtkAction *action,
 						 EphyWindow *window);
-static void ephy_window_view_menubar_cb         (GtkAction *action,
-						 EphyWindow *window);
 static void ephy_window_view_popup_windows_cb	(GtkAction *action,
 						 EphyWindow *window);
 static void sync_tab_load_status		(EphyWebView *view,
@@ -277,8 +275,6 @@ static const GtkToggleActionEntry ephy_menu_toggle_entries [] =
 	  N_("Show the active downloads for this window"),
 	  NULL, FALSE },
 
-	{ "ViewMenuBar", NULL, N_("Men_ubar"), NULL,
-	  NULL, G_CALLBACK (ephy_window_view_menubar_cb), TRUE },
 	{ "ViewFullscreen", GTK_STOCK_FULLSCREEN, N_("_Fullscreen"), "F11",
 	  N_("Browse at full screen"),
 	  G_CALLBACK (window_cmd_view_fullscreen), FALSE },
@@ -1544,14 +1540,6 @@ update_chromes_actions (EphyWindow *window)
 	g_signal_handlers_unblock_by_func (G_OBJECT (action),
 		 			   G_CALLBACK (ephy_window_view_toolbar_cb),
 		 			   window);
-	action = gtk_action_group_get_action (action_group, "ViewMenuBar");
-	g_signal_handlers_block_by_func (G_OBJECT (action),
-		 			 G_CALLBACK (ephy_window_view_menubar_cb),
-		 			 window);
-	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), show_menubar);
-	g_signal_handlers_unblock_by_func (G_OBJECT (action),
-		 			   G_CALLBACK (ephy_window_view_menubar_cb),
-		 			   window);
 }
 
 static void
@@ -3796,7 +3784,6 @@ setup_toolbar (EphyWindow *window)
 static const char* disabled_actions_for_app_mode[] = { "FileOpen",
                                                        "FileSaveAs",
                                                        "FileSaveAsApplication",
-                                                       "ViewMenuBar",
                                                        "ViewEncoding",
                                                        "FileBookmarkPage",
                                                        "GoBookmarks" };
@@ -4433,14 +4420,6 @@ ephy_window_view_toolbar_cb (GtkAction *action,
 				      EPHY_WEB_VIEW_CHROME_TOOLBAR, TRUE);
 }
 
-static void
-ephy_window_view_menubar_cb (GtkAction *action,
-			     EphyWindow *window)
-{
-	sync_chrome_with_view_toggle (action, window,
-				      EPHY_WEB_VIEW_CHROME_MENUBAR, FALSE);
-}
-
 static void
 ephy_window_view_popup_windows_cb (GtkAction *action,
 				   EphyWindow *window)
-- 
cgit v1.2.3