diff options
Diffstat (limited to 'src/ephy-location-action.c')
| -rw-r--r-- | src/ephy-location-action.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c index 06171aaa5..dd2de1431 100644 --- a/src/ephy-location-action.c +++ b/src/ephy-location-action.c @@ -223,6 +223,16 @@ 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) { @@ -258,6 +268,15 @@ connect_proxy (GtkAction *action, GtkWidget *proxy) G_CALLBACK (user_changed_cb), action, 0); } + /* 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); } @@ -328,7 +347,7 @@ ephy_location_action_activate (GtkAction *action) /* Note: this makes sense only for a single proxy */ proxies = gtk_action_get_proxies (action); - if (proxies) + if (proxies && EPHY_IS_LOCATION_ENTRY (proxies->data)) { ephy_location_entry_activate (EPHY_LOCATION_ENTRY (proxies->data)); } |