[evince] findbar: Add close button to the find bar

[Carlos Garcia Campos <carlosgc src gnome org>]

commit 5154b7ab6012e6a8cc7eb732172ea1e2c4f1ec89
Author: Carlos Garcia Campos <carlosgc gnome org>
Date:   Sat Feb 22 10:04:25 2014 +0100

    findbar: Add close button to the find bar
    
    It makes more obvious how to close the find bar, specially when it has
    been launched by a keyboard shortcut instead of using the toggle button
    in the toolbar.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=723789

 shell/eggfindbar.c |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)
---
diff --git a/shell/eggfindbar.c b/shell/eggfindbar.c
index 1e51314..daaec5c 100644
--- a/shell/eggfindbar.c
+++ b/shell/eggfindbar.c
@@ -239,6 +239,13 @@ previous_clicked_callback (GtkButton *button,
 }
 
 static void
+close_button_clicked_callback (GtkButton *button,
+                               EggFindBar *find_bar)
+{
+  g_signal_emit (find_bar, find_bar_signals[CLOSE], 0);
+}
+
+static void
 case_sensitive_toggled_callback (GtkCheckMenuItem *menu_item,
                                  void             *data)
 {
@@ -358,6 +365,7 @@ egg_find_bar_init (EggFindBar *find_bar)
 {
   EggFindBarPrivate *priv;
   GtkWidget *box;
+  GtkWidget *close_button;
   GtkToolItem *item;
   GtkStyleContext *style_context;
 
@@ -432,6 +440,26 @@ egg_find_bar_init (EggFindBar *find_bar)
   gtk_widget_show (priv->status_label);
   gtk_container_add (GTK_CONTAINER (find_bar), GTK_WIDGET (priv->status_item));
 
+  /* Separator */
+  item = gtk_tool_item_new ();
+  gtk_tool_item_set_expand (GTK_TOOL_ITEM (item), TRUE);
+  gtk_container_add (GTK_CONTAINER (find_bar), GTK_WIDGET (item));
+  gtk_widget_show (GTK_WIDGET (item));
+
+  /* Close button */
+  close_button = gtk_button_new ();
+  style_context = gtk_widget_get_style_context (close_button);
+  gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_RAISED);
+  gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE);
+  gtk_button_set_image (GTK_BUTTON (close_button),
+                        gtk_image_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_MENU));
+  gtk_widget_set_can_focus (close_button, FALSE);
+  item = gtk_tool_item_new ();
+  gtk_container_add (GTK_CONTAINER (item), close_button);
+  gtk_widget_show (close_button);
+  gtk_container_add (GTK_CONTAINER (find_bar), GTK_WIDGET (item));
+  gtk_widget_show (GTK_WIDGET (item));
+
   g_signal_connect (priv->find_entry, "changed",
                     G_CALLBACK (entry_changed_callback),
                     find_bar);
@@ -450,6 +478,9 @@ egg_find_bar_init (EggFindBar *find_bar)
   g_signal_connect (priv->previous_button, "clicked",
                     G_CALLBACK (previous_clicked_callback),
                     find_bar);
+  g_signal_connect (close_button, "clicked",
+                    G_CALLBACK (close_button_clicked_callback),
+                    find_bar);
 }
 
 static void