[epiphany/wip/mcatanzaro/fedora-needs-upstreamed: 20/20] ephy-find-toolbar: Toggle the search bar with Ctrl+F

[Michael Catanzaro <mcatanzaro src gnome org>]

commit fb2e71ed2dab7405265d5b672767c3f801c16912
Author: Yosef Or Boczko <yoseforb src gnome org>
Date:   Wed Aug 6 18:09:41 2014 +0300

    ephy-find-toolbar: Toggle the search bar with Ctrl+F
    
    If the search bar are shown and the entry are focus,
    Ctrl+F will hide the search bar. If the search bar
    are shown but not focused, the entry will get focus.
    Otherwise Ctrl+F will show the search bar and than
    focus the search entry.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=734316

 embed/ephy-find-toolbar.c |   19 +++++++++++++++++++
 embed/ephy-find-toolbar.h |    2 ++
 src/window-commands.c     |    2 +-
 3 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/embed/ephy-find-toolbar.c b/embed/ephy-find-toolbar.c
index 20553e8..9b02897 100644
--- a/embed/ephy-find-toolbar.c
+++ b/embed/ephy-find-toolbar.c
@@ -713,3 +713,22 @@ ephy_find_toolbar_request_close (EphyFindToolbar *toolbar)
                g_signal_emit (toolbar, signals[CLOSE], 0);
        }
 }
+
+void
+ephy_find_toolbar_toggle_mode (EphyFindToolbar *toolbar)
+{
+       EphyFindToolbarPrivate *priv;
+
+       g_return_if_fail (EPHY_IS_FIND_TOOLBAR (toolbar));
+
+       priv = toolbar->priv;
+
+       if (gtk_widget_is_focus (priv->entry))
+       {
+               ephy_find_toolbar_close (toolbar);
+       }
+       else
+       {
+               ephy_find_toolbar_open (toolbar, FALSE, FALSE);
+       }
+}
diff --git a/embed/ephy-find-toolbar.h b/embed/ephy-find-toolbar.h
index 62113e7..eee4f1f 100644
--- a/embed/ephy-find-toolbar.h
+++ b/embed/ephy-find-toolbar.h
@@ -78,6 +78,8 @@ void           ephy_find_toolbar_close         (EphyFindToolbar *toolbar);
 
 void            ephy_find_toolbar_request_close (EphyFindToolbar *toolbar);
 
+void            ephy_find_toolbar_toggle_mode   (EphyFindToolbar *toolbar);
+
 G_END_DECLS
 
 #endif /* EPHY_FIND_TOOLBAR_H */
diff --git a/src/window-commands.c b/src/window-commands.c
index 43c6a4e..7950f90 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -1091,7 +1091,7 @@ window_cmd_edit_find (GtkAction *action,
        EphyFindToolbar *toolbar;
        
        toolbar = EPHY_FIND_TOOLBAR (ephy_window_get_current_find_toolbar (window));
-       ephy_find_toolbar_open (toolbar, FALSE, FALSE);
+       ephy_find_toolbar_toggle_mode (toolbar);
 }
 
 void