Activating Search if hidden should spawn the search page
This commit is contained in:
parent
a245be912f
commit
566e8252c2
1 changed files with 18 additions and 8 deletions
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue