Silence compiler warnings

[~andy/gtk] / demos / gtk-demo / search_entry.c

diff --git a/demos/gtk-demo/search_entry.c b/demos/gtk-demo/search_entry.c
index 56cfc1b51632b9fc1466a52e89cd2cbf97b85493..03b728879c43772329733e99deeb5fc05653f4c7 100644 (file)
--- a/demos/gtk-demo/search_entry.c
+++ b/demos/gtk-demo/search_entry.c
@@ -29,8 +29,7 @@ static gboolean
 search_progress (gpointer data)
 {
   gtk_entry_progress_pulse (GTK_ENTRY (data));
-
-  return TRUE;
+  return G_SOURCE_CONTINUE;
 }
 
 static void
@@ -93,6 +92,7 @@ search_by_name (GtkWidget *item,
                                    GTK_ENTRY_ICON_PRIMARY,
                                    "Search by name\n"
                                    "Click here to change the search type");
+  gtk_entry_set_placeholder_text (entry, "name");
 }
 
 static void
@@ -106,6 +106,7 @@ search_by_description (GtkWidget *item,
                                    GTK_ENTRY_ICON_PRIMARY,
                                    "Search by description\n"
                                    "Click here to change the search type");
+  gtk_entry_set_placeholder_text (entry, "description");
 }
 
 static void
@@ -119,6 +120,7 @@ search_by_file (GtkWidget *item,
                                    GTK_ENTRY_ICON_PRIMARY,
                                    "Search by file name\n"
                                    "Click here to change the search type");
+  gtk_entry_set_placeholder_text (entry, "file name");
 }
 
 GtkWidget *
@@ -246,6 +248,7 @@ do_search_entry (GtkWidget *do_widget)
   GtkWidget *hbox;
   GtkWidget *label;
   GtkWidget *entry;
+  GtkWidget *button;
   GtkWidget *find_button;
   GtkWidget *cancel_button;
 
@@ -266,7 +269,7 @@ do_search_entry (GtkWidget *do_widget)
 
       content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
@@ -274,7 +277,7 @@ do_search_entry (GtkWidget *do_widget)
       gtk_label_set_markup (GTK_LABEL (label), "Search entry demo");
       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
-      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 10);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
 
@@ -323,6 +326,10 @@ do_search_entry (GtkWidget *do_widget)
       /* add accessible alternatives for icon functionality */
       g_signal_connect (entry, "populate-popup",
                         G_CALLBACK (entry_populate_popup), NULL);
+
+      /* Give the focus to the close button */
+      button = gtk_dialog_get_widget_for_response (GTK_DIALOG (window), GTK_RESPONSE_NONE);
+      gtk_widget_grab_focus (button);
     }
 
   if (!gtk_widget_get_visible (window))