From fd7171298dfddd66f833f1a318e6e63e9306cf08 Mon Sep 17 00:00:00 2001 From: "Daniel P. Fore" Date: Thu, 28 Jun 2012 23:16:57 +0200 Subject: [PATCH] Remove 'Customize Toolbar' from app/ tools menu Fixes: https://bugs.launchpad.net/midori/+bug/699933 --- extensions/toolbar-editor.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/extensions/toolbar-editor.c b/extensions/toolbar-editor.c index 79a567fa..5907a881 100644 --- a/extensions/toolbar-editor.c +++ b/extensions/toolbar-editor.c @@ -46,8 +46,6 @@ static const GtkTargetEntry tb_editor_dnd_targets[] = }; static const gint tb_editor_dnd_targets_len = G_N_ELEMENTS(tb_editor_dnd_targets); -static void tb_editor_browser_populate_tool_menu_cb(MidoriBrowser *browser, GtkWidget *menu, MidoriExtension *ext); - static void tb_editor_browser_populate_toolbar_menu_cb(MidoriBrowser *browser, GtkWidget *menu, MidoriExtension *ext); @@ -58,7 +56,6 @@ static void tb_editor_deactivate_cb(MidoriExtension *extension, MidoriBrowser *b { MidoriApp *app = midori_extension_get_app(extension); - g_signal_handlers_disconnect_by_func(browser, tb_editor_browser_populate_tool_menu_cb, extension); g_signal_handlers_disconnect_by_func(browser, tb_editor_browser_populate_toolbar_menu_cb, extension); g_signal_handlers_disconnect_by_func(extension, tb_editor_deactivate_cb, browser); g_signal_handlers_disconnect_by_func(app, tb_editor_app_add_browser_cb, extension); @@ -574,17 +571,6 @@ static void tb_editor_menu_configure_toolbar_activate_cb(GtkWidget *menuitem, Mi g_free(tbw); } -static void tb_editor_browser_populate_tool_menu_cb(MidoriBrowser *browser, GtkWidget *menu, MidoriExtension *ext) -{ - GtkWidget *menuitem; - - menuitem = gtk_menu_item_new_with_mnemonic (_("Customize _Toolbar...")); - g_signal_connect (menuitem, "activate", - G_CALLBACK (tb_editor_menu_configure_toolbar_activate_cb), browser); - gtk_widget_show (menuitem); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); -} - static void tb_editor_browser_populate_toolbar_menu_cb(MidoriBrowser *browser, GtkWidget *menu, MidoriExtension *ext) { @@ -603,7 +589,6 @@ static void tb_editor_browser_populate_toolbar_menu_cb(MidoriBrowser *browser, G static void tb_editor_app_add_browser_cb(MidoriApp *app, MidoriBrowser *browser, MidoriExtension *ext) { - g_signal_connect(browser, "populate-tool-menu", G_CALLBACK(tb_editor_browser_populate_tool_menu_cb), ext); g_signal_connect(browser, "populate-toolbar-menu", G_CALLBACK(tb_editor_browser_populate_toolbar_menu_cb), ext); g_signal_connect(ext, "deactivate", G_CALLBACK(tb_editor_deactivate_cb), browser); }