filechooserbutton: Give proper names to the SELECT_FOLDER tests with cancelled dialog

[~andy/gtk] / gtk / gtksearchentry.c

diff --git a/gtk/gtksearchentry.c b/gtk/gtksearchentry.c
index f8f54982cdca26b666812eceed8296ef4c2402b2..b28406a5b4da39de0a1b8ea052ef86c829a8fd1f 100644 (file)
--- a/gtk/gtksearchentry.c
+++ b/gtk/gtksearchentry.c
@@ -74,12 +74,15 @@ search_entry_changed_cb (GtkEntry *entry,
 
   if (str == NULL || *str == '\0')
     {
-      icon_name = "edit-find-symbolic";
+      icon_name = NULL;
       active = FALSE;
     }
   else
     {
-      icon_name = "edit-clear-symbolic";
+      if (gtk_widget_get_direction (GTK_WIDGET (entry)) == GTK_TEXT_DIR_RTL)
+        icon_name = "edit-clear-rtl-symbolic";
+      else
+        icon_name = "edit-clear-symbolic";
       active = TRUE;
     }
 
@@ -98,6 +101,12 @@ gtk_search_entry_init (GtkSearchEntry *entry)
   g_signal_connect (entry, "icon-release",
                     G_CALLBACK (search_entry_clear_cb), NULL);
 
+  g_object_set (entry,
+                "primary-icon-name", "edit-find-symbolic",
+                "primary-icon-activatable", FALSE,
+                "primary-icon-sensitive", FALSE,
+                NULL);
+
   search_entry_changed_cb (GTK_ENTRY (entry), NULL);
 }