Updating branch refs/heads/master to ca9420bdfcce62702b6e30afd1f0e1f38f556f6e (commit) from b947e5d662d64dc73fc3ad0c031cb0d312ad627a (commit)
commit ca9420bdfcce62702b6e30afd1f0e1f38f556f6e Author: Christian Dywan <christ...@twotoasts.de> Date: Thu Jan 28 22:35:21 2010 +0100 Always hide findbar on hotkey if visible, or when it loses focus midori/midori-browser.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 27f9b2e..0973ebe 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -202,6 +202,9 @@ midori_search_action_get_icon (KatzeItem* item, GtkWidget* widget, const gchar** icon_name); +static void +_midori_browser_find_done (MidoriBrowser* browser); + static GtkAction* _action_by_name (MidoriBrowser* browser, const gchar* name) @@ -2537,7 +2540,9 @@ static void _action_find_activate (GtkAction* action, MidoriBrowser* browser) { - if (!GTK_WIDGET_VISIBLE (browser->find)) + if (GTK_WIDGET_VISIBLE (browser->find)) + _midori_browser_find_done (browser); + else { GtkWidget* view; const gchar* text; @@ -2613,8 +2618,7 @@ midori_browser_find_text_focus_out_event_cb (GtkWidget* entry, GdkEventFocus* event, MidoriBrowser* browser) { - if (browser->find_typing) - _midori_browser_find_done (browser); + _midori_browser_find_done (browser); return FALSE; } _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits