ephy-window: remove the tabs menu

It is not present in the new design. The Alt+<num> accelerators are
dying with it, but it will be pretty easy to bring them back if
needed.

4 files changed, 7 insertions, 615 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 49463d6fa..97418adb0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,6 @@ NOINST_H_FILES = \
 	ephy-navigation-history-action.h	\
 	ephy-navigation-up-action.h		\
 	ephy-password-info.h			\
-	ephy-tabs-menu.h			\
 	ephy-toolbars-model.h			\
 	ephy-toolbar.h				\
 	languages.h				\
@@ -73,7 +72,6 @@ libephymain_la_SOURCES = \
 	ephy-password-info.c	        	\
 	ephy-session.c				\
 	ephy-shell.c				\
-	ephy-tabs-menu.c			\
 	ephy-toolbars-model.c			\
 	ephy-toolbar.c				\
 	ephy-window.c				\
diff --git a/src/ephy-tabs-menu.c b/src/ephy-tabs-menu.c
deleted file mode 100644
index 4e5f8ee54..000000000
--- a/src/ephy-tabs-menu.c
+++ /dev/null
@@ -1,486 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright © 2003  David Bordoley
- *  Copyright © 2003-2004 Christian Persch
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-
-#include "ephy-tabs-menu.h"
-#include "ephy-notebook.h"
-#include "ephy-shell.h"
-#include "ephy-debug.h"
-#include "ephy-embed-container.h"
-#include "ephy-embed-utils.h"
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define LABEL_WIDTH_CHARS 32
-#define ACTION_VERB_FORMAT_PREFIX       "JmpTab"
-#define ACTION_VERB_FORMAT_PREFIX_LEN   (6) /* strlen (ACTION_VERB_FORMAT_PREFIX) */
-#define ACTION_VERB_FORMAT		ACTION_VERB_FORMAT_PREFIX "%x"
-#define ACTION_VERB_FORMAT_LENGTH	strlen (ACTION_VERB_FORMAT) + 14 + 1
-#define ACTION_VERB_FORMAT_BASE         (16) /* %x is hex */
-#define ACCEL_PATH_FORMAT		"<Actions>/TabsActions/%s"
-#define ACCEL_PATH_FORMAT_LENGTH	strlen (ACCEL_PATH_FORMAT) -2 + ACTION_VERB_FORMAT_LENGTH
-#define DATA_KEY			"EphyTabsMenu::Action"
-
-#define EPHY_TABS_MENU_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_TABS_MENU, EphyTabsMenuPrivate))
-
-struct _EphyTabsMenuPrivate
-{
-	EphyWindow *window;
-	GtkActionGroup *action_group;
-	GtkAction *anchor_action;
-	guint ui_id;
-};
-
-enum
-{
-	PROP_0,
-	PROP_WINDOW
-};
-
-static void	ephy_tabs_menu_class_init	(EphyTabsMenuClass *klass);
-static void	ephy_tabs_menu_init	  	(EphyTabsMenu *menu);
-static void	ephy_tabs_menu_update		(EphyTabsMenu *menu);
-
-/* FIXME: this can be severely optimised */
-static GByteArray *tabs_id_array = NULL;
-static guint n_tabs = 0;
-
-G_DEFINE_TYPE (EphyTabsMenu, ephy_tabs_menu, G_TYPE_OBJECT)
-
-/* We need to assign unique IDs to tabs, otherwise accels get confused in the
- * tabs menu (bug #339548). We could use a serial #, but the ID is used in the
- * action name which is stored in a GQuark and so we should allocate them
- * efficiently.
- */
-static guint
-allocate_tab_id (void)
-{
-        int bit;
-        guint b, len;
-        guint8 *data;
-        guint8 byte, mask;
-
-        if (n_tabs++ == 0)
-        {
-                g_assert (tabs_id_array == NULL);
-                tabs_id_array = g_byte_array_sized_new (16);
-        }
-
-        /* Find a free ID */
-        len = tabs_id_array->len;
-        data = tabs_id_array->data;
-        for (b = 0; b < len; ++b)
-        {
-                if (data[b] != 0xff)
-                        break;
-        }
-
-        /* Need to append a new byte */
-        if (b == len)
-        {
-                guint8 bytes[] = { 0 };
-                g_byte_array_append (tabs_id_array, bytes, G_N_ELEMENTS (bytes));
-                g_assert (tabs_id_array->len > b);
-        }
-
-        data = tabs_id_array->data + b;
-        byte = 0xff ^ *data;
-        /* Now find the first free bit */
-        bit = g_bit_nth_lsf (byte, -1);
-        mask = 1 << bit;
-        g_assert (bit >= 0 && bit <= 7);
-        g_assert ((*data & mask) == 0);
-        /* And mark it as allocated */
-        *data |= mask;
-
-        return b * 8 + bit;
-}
-
-static void
-free_tab_id (GtkAction *action)
-{
-        const char *name;
-        guint id;
-        guint8 *data;
-        guint b, bit;
-
-        name = gtk_action_get_name (action);
-        id = g_ascii_strtoull (name + ACTION_VERB_FORMAT_PREFIX_LEN, NULL,
-                               ACTION_VERB_FORMAT_BASE);
-        g_assert (id >= 0 && id < tabs_id_array->len * 8);
-
-        b = id >> 3;
-        bit = id & 0x7;
-        data = tabs_id_array->data + b;
-        *data &= ~(1 << bit);
-
-        g_assert (n_tabs > 0);
-        if (--n_tabs == 0)
-        {
-                g_assert (tabs_id_array != NULL);
-                g_byte_array_free (tabs_id_array, TRUE);
-                tabs_id_array = NULL;
-        }
-}
-
-static void
-tab_action_activate_cb (GtkAction *action,
-			EphyTabsMenu *menu)
-{
-	EphyTabsMenuPrivate *priv = menu->priv;
-	EphyEmbed *embed;
-
-	embed = g_object_get_data (G_OBJECT (action), DATA_KEY);
-	g_return_if_fail (embed != NULL);
-
-	LOG ("tab_action_activate_cb embed=%p", embed);
-
-	if (ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (priv->window)) != embed)
-	{
-                ephy_embed_container_set_active_child (EPHY_EMBED_CONTAINER (priv->window), embed);
-	}
-}
-
-static void
-sync_tab_title (EphyWebView *view,
-		GParamSpec *pspec,
-		GtkAction *action)
-{
-	const char *title;
-
-	title = ephy_web_view_get_title_composite (view);
-
-	g_object_set (action, "label", title, NULL);
-}
-
-static void
-sync_tab_icon (EphyWebView *view,
-	       GParamSpec *pspec,
-	       GtkWidget *proxy)
-{
-	if (GTK_IS_MENU_ITEM (proxy))
-	{
-		GdkPixbuf *pixbuf;
-		GtkWidget *image;
-
-		pixbuf = ephy_web_view_get_icon (view);
-		image = gtk_image_new_from_pixbuf (pixbuf);
-		gtk_widget_show (image);
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), image);
-		gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (proxy), TRUE);
-	}
-}
-
-static void
-notebook_page_added_cb (EphyNotebook *notebook,
-			EphyEmbed *embed,
-			guint position,
-			EphyTabsMenu *menu)
-{
-	EphyTabsMenuPrivate *priv = menu->priv;
-	GtkAction *action;
-	char verb[ACTION_VERB_FORMAT_LENGTH];
-
-	LOG ("tab_added_cb embed=%p", embed);
-
-	g_snprintf (verb, sizeof (verb), ACTION_VERB_FORMAT, allocate_tab_id ());
-
-	action = gtk_action_new (verb, NULL, _("Switch to this tab"), NULL);
-
-	sync_tab_title (ephy_embed_get_web_view (embed), NULL, action);
-	/* make sure the action is alive when handling the signal, see bug #169833 */
-	g_signal_connect_object (ephy_embed_get_web_view (embed), "notify::embed-title",
-				 G_CALLBACK (sync_tab_title), action, 0);
-
-	gtk_action_group_add_action_with_accel (priv->action_group, action, NULL);
-
-	g_object_set_data (G_OBJECT (embed), DATA_KEY, action);
-	g_object_set_data (G_OBJECT (action), DATA_KEY, embed);
-
-	g_signal_connect (action, "activate",
-			  G_CALLBACK (tab_action_activate_cb), menu);
-
-	g_object_unref (action);
-
-	ephy_tabs_menu_update (menu);
-}
-
-static void
-notebook_page_removed_cb (EphyNotebook *notebook,
-			  EphyEmbed *embed,
-			  guint position,
-			  EphyTabsMenu *menu)
-{
-	EphyTabsMenuPrivate *priv = menu->priv;
-	GtkAction *action;
-													     
-	LOG ("tab_removed_cb embed=%p", embed);
-
-	action = g_object_get_data (G_OBJECT (embed), DATA_KEY);
-	g_return_if_fail (action != NULL);
-
-        free_tab_id (action);
-
-	g_signal_handlers_disconnect_by_func
-		(ephy_embed_get_web_view (embed), G_CALLBACK (sync_tab_title), action);
-
-	g_signal_handlers_disconnect_by_func
-		(action, G_CALLBACK (tab_action_activate_cb), menu);
-
-	g_object_set_data (G_OBJECT (embed), DATA_KEY, NULL);
- 	gtk_action_group_remove_action (priv->action_group, action);
-
-	ephy_tabs_menu_update (menu);
-}
-
-static void
-notebook_page_reordered_cb (EphyNotebook *notebook,
-			    EphyEmbed *embed,
-			    guint position,
-			    EphyTabsMenu *menu)
-{
-	LOG ("tabs_reordered_cb");
- 
-	ephy_tabs_menu_update (menu);
-}
-
-static void
-connect_proxy_cb (GtkActionGroup *action_group,
-		  GtkAction *action,
-		  GtkWidget *proxy,
-		  gpointer dummy)
-{
-	if (GTK_IS_MENU_ITEM (proxy))
-	{
-		GtkLabel *label;
-		EphyEmbed *embed;
-		EphyWebView *view;
-
-		label = GTK_LABEL (gtk_bin_get_child (GTK_BIN (proxy)));
-
-		gtk_label_set_use_underline (label, FALSE);
-		gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
-		gtk_label_set_max_width_chars (label, LABEL_WIDTH_CHARS);
-
-		embed = g_object_get_data (G_OBJECT (action), DATA_KEY);
-		view = ephy_embed_get_web_view (embed);
-
-		sync_tab_icon (view, NULL, proxy);
-		g_signal_connect_object (view, "notify::icon",
-					 G_CALLBACK (sync_tab_icon), proxy, 0);
-	}
-}
-
-static void
-ephy_tabs_menu_set_window (EphyTabsMenu *menu,
-			   EphyWindow *window)
-{
-	EphyTabsMenuPrivate *priv = menu->priv;
-	GtkWidget *notebook;
-	GtkUIManager *manager;
-
-	priv->window = window;
-
-	manager = GTK_UI_MANAGER (ephy_window_get_ui_manager (window));
-	priv->action_group = gtk_action_group_new ("TabsActions");
-	gtk_ui_manager_insert_action_group (manager, priv->action_group, -1);
-	g_object_unref (priv->action_group);
-
-	priv->anchor_action = g_object_new (GTK_TYPE_RADIO_ACTION,
-					    "name", "TabsMenuAnchorAction",
-					    NULL);
-	gtk_action_group_add_action (priv->action_group, priv->anchor_action);
-	g_object_unref (priv->anchor_action);
-
-	g_signal_connect (priv->action_group, "connect-proxy",
-			  G_CALLBACK (connect_proxy_cb), NULL);
-
-	notebook = ephy_window_get_notebook (window);
-	g_signal_connect_object (notebook, "page-added",
-				 G_CALLBACK (notebook_page_added_cb), menu, 0);
-	g_signal_connect_object (notebook, "page-removed",
-				 G_CALLBACK (notebook_page_removed_cb), menu, 0);
-	g_signal_connect_object (notebook, "page-reordered",
-				 G_CALLBACK (notebook_page_reordered_cb), menu, 0);
-}
-
-static void
-ephy_tabs_menu_set_property (GObject *object,
-			     guint prop_id,
-			     const GValue *value,
-			     GParamSpec *pspec)
-{
-	EphyTabsMenu *menu = EPHY_TABS_MENU (object);
-
-	switch (prop_id)
-	{
-		case PROP_WINDOW:
-			ephy_tabs_menu_set_window (menu, g_value_get_object (value));
-			break;
-	}
-}
-
-static void
-ephy_tabs_menu_get_property (GObject *object,
-			     guint prop_id,
-			     GValue *value,
-			     GParamSpec *pspec)
-{
-	/* no readable properties */
-	g_return_if_reached ();
-}
-
-static void
-ephy_tabs_menu_class_init (EphyTabsMenuClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->set_property = ephy_tabs_menu_set_property;
-	object_class->get_property = ephy_tabs_menu_get_property;
-
-	g_object_class_install_property (object_class,
-					 PROP_WINDOW,
-					 g_param_spec_object ("window", NULL, NULL,
-							      EPHY_TYPE_WINDOW,
-							      G_PARAM_WRITABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB |
-							      G_PARAM_CONSTRUCT_ONLY));
-
-	g_type_class_add_private (object_class, sizeof (EphyTabsMenuPrivate));
-
-	/* We don't want to save accels, so skip them */
-	gtk_accel_map_add_filter ("<Actions>/TabsActions/JmpTab*");
-}
-
-static void
-ephy_tabs_menu_init (EphyTabsMenu *menu)
-{
-	menu->priv = EPHY_TABS_MENU_GET_PRIVATE (menu);
-}
-
-static void
-ephy_tabs_menu_clean (EphyTabsMenu *menu)
-{
-	EphyTabsMenuPrivate *p = menu->priv;
-	GtkUIManager *manager = GTK_UI_MANAGER (ephy_window_get_ui_manager (p->window));
-
-	if (p->ui_id != 0)
-	{
-		gtk_ui_manager_remove_ui (manager, p->ui_id);
-		gtk_ui_manager_ensure_update (manager);
-		p->ui_id = 0;
-	}
-}
-
-EphyTabsMenu *
-ephy_tabs_menu_new (EphyWindow *window)
-{
-	return EPHY_TABS_MENU (g_object_new (EPHY_TYPE_TABS_MENU,
-					     "window", window,
-					     NULL));
-}
-
-static void
-tab_set_action_accelerator (GtkActionGroup *action_group,
-			    GtkAction *action,
-			    guint tab_number)
-{
-	const char *verb;
-	char accel_path[ACCEL_PATH_FORMAT_LENGTH];
-	char accel[7];
-	gint accel_number;
-	guint accel_key;
-	GdkModifierType accel_mods;
-
-	verb = gtk_action_get_name (action);
-
-	/* set the accel path for the menu item */
-	g_snprintf (accel_path, sizeof (accel_path),
-		    ACCEL_PATH_FORMAT, verb);
-	gtk_action_set_accel_path (action, accel_path);
-
-	/* Only the first ten tabs get accelerators starting from 1 through 0 */
-	if (tab_number < 10)
-	{
-		accel_key = 0;
-		accel_number = (tab_number + 1) % 10;
-
-		g_snprintf (accel, sizeof (accel), "<alt>%d", accel_number);
-
-		gtk_accelerator_parse (accel, &accel_key, &accel_mods);
-
-		if (accel_key != 0)
-		{
-			gtk_accel_map_change_entry (accel_path, accel_key,
-						    accel_mods, TRUE);
-		}
-	}
-	else
-	{
-		gtk_accel_map_change_entry (accel_path, 0, 0, TRUE);
-	}
-}
-
-static void
-ephy_tabs_menu_update (EphyTabsMenu *menu)
-{
-	EphyTabsMenuPrivate *p = menu->priv;
-	GtkUIManager *manager;
-	GtkAction *action;
-	GList *tabs = NULL, *l;
-	guint i = 0;
-	const char *verb;
-
-	LOG ("Rebuilding open tabs menu");
-
-	START_PROFILER ("Rebuilding tabs menu")
-
-	ephy_tabs_menu_clean (menu);
-
-	tabs = ephy_embed_container_get_children (EPHY_EMBED_CONTAINER (p->window));
-
-	if (tabs == NULL) return;
-
-	manager =  GTK_UI_MANAGER (ephy_window_get_ui_manager (p->window));
-	p->ui_id = gtk_ui_manager_new_merge_id (manager);
-
-	for (l = tabs; l != NULL; l = l->next)
-	{
-		action = g_object_get_data (G_OBJECT (l->data), DATA_KEY);
-		g_return_if_fail (action != NULL);
-  
-		verb = gtk_action_get_name (action);
-
-		tab_set_action_accelerator (p->action_group, action, i++);
-
-		gtk_ui_manager_add_ui (manager, p->ui_id,
-				       "/menubar/TabsMenu/TabsOpen",
-				       verb, verb,
-				       GTK_UI_MANAGER_MENUITEM, FALSE);
-	}
-
-	g_list_free (tabs);
-
-	STOP_PROFILER ("Rebuilding tabs menu")
-}
diff --git a/src/ephy-tabs-menu.h b/src/ephy-tabs-menu.h
deleted file mode 100644
index bbff31464..000000000
--- a/src/ephy-tabs-menu.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright © 2003 David Bordoley
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
-#ifndef EPHY_TABS_MENU_H
-#define EPHY_TABS_MENU_H
-
-#include "ephy-window.h"
-
-G_BEGIN_DECLS
-
-#define EPHY_TYPE_TABS_MENU		(ephy_tabs_menu_get_type ())
-#define EPHY_TABS_MENU(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_TABS_MENU, EphyTabsMenu))
-#define EPHY_TABS_MENU_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_TABS_MENU, EphyTabsMenuClass))
-#define EPHY_IS_TABS_MENU(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_TABS_MENU))
-#define EPHY_IS_TABS_MENU_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_TABS_MENU))
-#define EPHY_TABS_MENU_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_TABS_MENU, EphyTabsMenuClass))
-
-typedef struct _EphyTabsMenu EphyTabsMenu;
-typedef struct _EphyTabsMenuClass EphyTabsMenuClass;
-typedef struct _EphyTabsMenuPrivate EphyTabsMenuPrivate;
-
-struct _EphyTabsMenuClass
-{
-	GObjectClass parent_class;
-};
-
-struct _EphyTabsMenu
-{
-	GObject parent_object;
-
-	/*< private >*/
-	EphyTabsMenuPrivate *priv;
-};
-
-GType		ephy_tabs_menu_get_type		(void);
-
-EphyTabsMenu   *ephy_tabs_menu_new		(EphyWindow *window);
-
-G_END_DECLS
-
-#endif
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 3dcf58f47..81866f029 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -49,7 +49,6 @@
 #include "ephy-shell.h"
 #include "ephy-state.h"
 #include "ephy-stock-icons.h"
-#include "ephy-tabs-menu.h"
 #include "ephy-toolbar.h"
 #include "ephy-type-builtins.h"
 #include "ephy-web-view.h"
@@ -110,7 +109,6 @@ static const GtkActionEntry ephy_menu_entries [] = {
 	{ "Bookmarks", NULL, N_("_Bookmarks") },
 	{ "Go", NULL, N_("_Go") },
 	{ "Tools", NULL, N_("T_ools") },
-	{ "Tabs", NULL, N_("_Tabs") },
 	{ "Help", NULL, N_("_Help") },
 	{ "Toolbar", NULL, N_("_Toolbars") },
 	{ "PopupAction", NULL, "" },
@@ -376,6 +374,13 @@ static const struct
 	{ GDK_KEY_s,		GDK_CONTROL_MASK,	"FileSaveAs",		 FALSE },
 	{ GDK_KEY_R,		GDK_CONTROL_MASK |
 				GDK_SHIFT_MASK,		"ViewReload",		 FALSE },
+	/* Tab navigation */
+	{ GDK_KEY_Page_Up,      GDK_CONTROL_MASK,       "TabsNext",              FALSE },
+	{ GDK_KEY_Page_Down,    GDK_CONTROL_MASK,       "TabsPrevious",          FALSE },
+	{ GDK_KEY_Page_Up,      GDK_CONTROL_MASK |
+	                        GDK_SHIFT_MASK,       "TabsMoveRight",           FALSE },
+	{ GDK_KEY_Page_Down,    GDK_CONTROL_MASK |
+	                        GDK_SHIFT_MASK,       "TabsMoveLeft",            FALSE },
 	/* Support all the MSIE tricks as well ;) */
 	{ GDK_KEY_F5,		0,			"ViewReload",		 FALSE },
 	{ GDK_KEY_F5,		GDK_CONTROL_MASK,	"ViewReload",		 FALSE },
@@ -444,7 +449,6 @@ struct _EphyWindowPrivate
 	GtkActionGroup *action_group;
 	GtkActionGroup *popups_action_group;
 	EphyEncodingMenu *enc_menu;
-	EphyTabsMenu *tabs_menu;
 	GtkNotebook *notebook;
 	EphyEmbed *active_embed;
 	EphyFindToolbar *find_toolbar;
@@ -2893,44 +2897,6 @@ ephy_window_set_active_tab (EphyWindow *window, EphyEmbed *new_embed)
 	}
 }
 
-static void
-update_tabs_menu_sensitivity (EphyWindow *window)
-{
-	EphyWindowPrivate *priv = window->priv;
-	GtkActionGroup *action_group;
-	GtkAction *action;
-	GtkNotebook *notebook;
-	gboolean wrap_around;
-	int page, n_pages;
-	gboolean not_first, not_last;
-
-	notebook = GTK_NOTEBOOK (priv->notebook);
-	action_group = priv->action_group;
-	n_pages = gtk_notebook_get_n_pages (notebook);
-	page = gtk_notebook_get_current_page (notebook);
-	not_first = page > 0;
-	not_last = page + 1 < n_pages;
-
-	g_object_get (gtk_widget_get_settings (GTK_WIDGET (notebook)),
-		      "gtk-keynav-wrap-around", &wrap_around,
-		      NULL);
-
-	if (!wrap_around)
-	{
-		action = gtk_action_group_get_action (action_group, "TabsPrevious");
-		gtk_action_set_sensitive (action, not_first);
-		action = gtk_action_group_get_action (action_group, "TabsNext");
-		gtk_action_set_sensitive (action, not_last);
-	}
-
-	action = gtk_action_group_get_action (action_group, "TabsMoveLeft");
-	gtk_action_set_sensitive (action, not_first);
-	action = gtk_action_group_get_action (action_group, "TabsMoveRight");
-	gtk_action_set_sensitive (action, not_last);
-	action = gtk_action_group_get_action (action_group, "TabsDetach");
-	ephy_action_change_sensitivity_flags (action, SENS_FLAG_CHROME, n_pages <= 1);
-}
-
 static gboolean
 embed_modal_alert_cb (EphyEmbed *embed,
 		      EphyWindow *window)
@@ -3107,8 +3073,6 @@ notebook_page_added_cb (EphyNotebook *notebook,
 
 	priv->num_tabs++;
 
-	update_tabs_menu_sensitivity (window);
-
 #if 0
 	g_signal_connect_object (embed, "open-link",
 				 G_CALLBACK (ephy_link_open), window,
@@ -3159,11 +3123,6 @@ notebook_page_removed_cb (EphyNotebook *notebook,
 
 	priv->num_tabs--;
 
-	if (priv->num_tabs > 0)
-	{
-		update_tabs_menu_sensitivity (window);
-	}
-
 	g_signal_handlers_disconnect_by_func
 		(ephy_embed_get_web_view (embed), G_CALLBACK (embed_modal_alert_cb), window);
 	g_signal_handlers_disconnect_by_func
@@ -3171,15 +3130,6 @@ notebook_page_removed_cb (EphyNotebook *notebook,
 }
 
 static void
-notebook_page_reordered_cb (EphyNotebook *notebook,
-			    EphyEmbed *embed,
-			    guint position,
-			    EphyWindow *window)
-{
-	update_tabs_menu_sensitivity (window);
-}
-
-static void
 notebook_page_close_request_cb (EphyNotebook *notebook,
 				EphyEmbed *embed,
 				EphyWindow *window)
@@ -3248,8 +3198,6 @@ setup_notebook (EphyWindow *window)
 			  G_CALLBACK (notebook_page_added_cb), window);
 	g_signal_connect (notebook, "page-removed",
 			  G_CALLBACK (notebook_page_removed_cb), window);
-	g_signal_connect (notebook, "page-reordered",
-			  G_CALLBACK (notebook_page_reordered_cb), window);
 	g_signal_connect (notebook, "tab-close-request",
 			  G_CALLBACK (notebook_page_close_request_cb), window);
 
@@ -3424,9 +3372,6 @@ ephy_window_dispose (GObject *object)
 		g_object_unref (priv->enc_menu);
 		priv->enc_menu = NULL;
 
-		g_object_unref (priv->tabs_menu);
-		priv->tabs_menu = NULL;
-
 		priv->action_group = NULL;
 		priv->popups_action_group = NULL;
 
@@ -3775,7 +3720,6 @@ ephy_window_constructor (GType type,
 	g_object_unref (css_file);
 
 	/* Initialize the menus */
-	priv->tabs_menu = ephy_tabs_menu_new (window);
 	priv->enc_menu = ephy_encoding_menu_new (window);
 
 	/* Add the toolbars to the window */
@@ -4178,9 +4122,6 @@ notebook_switch_page_cb (GtkNotebook *notebook,
 	ephy_window_set_active_tab (window, embed);
 
 	ephy_find_toolbar_set_embed (priv->find_toolbar, embed);
-
-	/* update window controls */
-	update_tabs_menu_sensitivity (window);
 }
 
 /**