From 566e8252c25fd14f1af94abd3fa5a57492e74b7e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 30 Apr 2009 00:43:47 +0200 Subject: [PATCH] Activating Search if hidden should spawn the search page --- midori/midori-browser.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 041643a5..50613fd0 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -2650,14 +2650,6 @@ _action_location_secondary_icon_released (GtkAction* action, } } -static void -_action_search_activate (GtkAction* action, - MidoriBrowser* browser) -{ - if (!GTK_WIDGET_VISIBLE (browser->navigationbar)) - gtk_widget_show (browser->navigationbar); -} - static void _action_search_submit (GtkAction* action, const gchar* keywords, @@ -2686,6 +2678,24 @@ _action_search_submit (GtkAction* action, g_free (search); } +static void +_action_search_activate (GtkAction* action, + MidoriBrowser* browser) +{ + GSList* proxies = gtk_action_get_proxies (action); + guint i = 0; + GtkWidget* proxy; + while (((proxy = g_slist_nth_data (proxies, i++)))) + if (GTK_IS_TOOL_ITEM (proxy)) + { + if (!GTK_WIDGET_VISIBLE (browser->navigationbar)) + gtk_widget_show (browser->navigationbar); + return; + } + _action_search_submit (action, "", FALSE, browser); + gtk_widget_grab_focus (midori_browser_get_current_tab (browser)); +} + static void _action_search_notify_current_item (GtkAction* action, GParamSpec* pspec, -- 2.39.5