From 2606279995f614634062e0aeb9833c482db5d083 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 13 Sep 2004 10:24:56 +0000 Subject: Merging pre-gnome-2-10 branch to HEAD. 2004-09-13 Christian Persch Merging pre-gnome-2-10 branch to HEAD. Splitting ChangeLog. --- src/ephy-location-action.c | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'src/ephy-location-action.c') diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c index 6e524c9a3..ef7c31eb8 100644 --- a/src/ephy-location-action.c +++ b/src/ephy-location-action.c @@ -226,16 +226,6 @@ add_completion_actions (GtkAction *action, GtkWidget *proxy) G_CALLBACK (action_activated_cb), la); } -static gboolean -create_menu_proxy_cb (GtkToolItem *tool_item, - GtkAction *action) -{ - gtk_tool_item_set_proxy_menu_item - (tool_item, "ephy-location-action-menu-item", NULL); - - return TRUE; -} - static void connect_proxy (GtkAction *action, GtkWidget *proxy) { @@ -271,17 +261,6 @@ connect_proxy (GtkAction *action, GtkWidget *proxy) G_CALLBACK (user_changed_cb), action, 0); } - /* FIXME: when porting to gtk+ 2.6, use "visible-overflown" - * property on GtkAction instead. - * we need to connect to this before chaining up, since gtkaction's - * connect_proxy connects a routine there which uses create_menu_item - * method to generate a menu proxy (and create_menu_item CANNOT return - * NULL. See bug #133446. - */ - g_signal_connect_object (proxy, "create_menu_proxy", - G_CALLBACK (create_menu_proxy_cb), - action, 0); - (* GTK_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy); } -- cgit v1.2.3