[gnome-control-center] shell: Use GtkSearchEntry

[Bastien Nocera <hadess src gnome org>]

commit 42c65b5c5fee5830b31fd30370c1b8209ba71eca
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Jun 11 15:42:55 2012 +0100

    shell: Use GtkSearchEntry
    
    And require GTK+ 3.3.5 for it.

 configure.ac                 |    2 +-
 shell/gnome-control-center.c |   19 -------------------
 shell/shell.ui               |    2 +-
 3 files changed, 2 insertions(+), 21 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 91f4b20..2e474f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ dnl Check that we meet the  dependencies
 dnl ==============================================
 
 GLIB_REQUIRED_VERSION=2.31.0
-GTK_REQUIRED_VERSION=3.3.5
+GTK_REQUIRED_VERSION=3.5.5
 DESKTOP_SCHEMAS_REQUIRED_VERSION=3.0.2
 PA_REQUIRED_VERSION=0.9.16
 CANBERRA_REQUIRED_VERSION=0.13
diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c
index e5a5254..3342bcd 100644
--- a/shell/gnome-control-center.c
+++ b/shell/gnome-control-center.c
@@ -521,11 +521,6 @@ search_entry_changed_cb (GtkEntry           *entry,
   if (!g_strcmp0 (priv->filter_string, ""))
     {
       shell_show_overview_page (center);
-      g_object_set (G_OBJECT (entry),
-                    "secondary-icon-name", "edit-find-symbolic",
-                    "secondary-icon-activatable", FALSE,
-                    "secondary-icon-sensitive", FALSE,
-                    NULL);
     }
   else
     {
@@ -533,11 +528,6 @@ search_entry_changed_cb (GtkEntry           *entry,
       cc_notebook_select_page (CC_NOTEBOOK (priv->notebook),
 			       priv->search_scrolled,
 			       FALSE);
-      g_object_set (G_OBJECT (entry),
-                          "secondary-icon-name", "edit-clear-symbolic",
-                          "secondary-icon-activatable", TRUE,
-                          "secondary-icon-sensitive", TRUE,
-                          NULL);
     }
 }
 
@@ -570,12 +560,6 @@ search_entry_key_press_event_cb (GtkEntry    *entry,
 }
 
 static void
-search_entry_clear_cb (GtkEntry *entry)
-{
-  gtk_entry_set_text (entry, "");
-}
-
-static void
 reparent_notebook_page (GnomeControlCenterPrivate *priv,
 			GtkWidget                 *widget)
 {
@@ -686,9 +670,6 @@ setup_search (GnomeControlCenter *shell)
   g_signal_connect (widget, "key-press-event",
                     G_CALLBACK (search_entry_key_press_event_cb), priv);
 
-  g_signal_connect (widget, "icon-release", G_CALLBACK (search_entry_clear_cb),
-                    priv);
-
   gtk_widget_show (priv->search_view);
 }
 
diff --git a/shell/shell.ui b/shell/shell.ui
index c606cc6..aa75bc4 100644
--- a/shell/shell.ui
+++ b/shell/shell.ui
@@ -73,7 +73,7 @@
                                 <property name="visible">True</property>
                                 <property name="orientation">horizontal</property>
                                 <child>
-                                  <object class="GtkEntry" id="search-entry">
+                                  <object class="GtkSearchEntry" id="search-entry">
                                     <property name="width_request">210</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>