gtk+ r22132 - in trunk: . demos/gtk-demo

[matthiasc svn gnome org]

Author: matthiasc
Date: Sun Jan 18 15:50:29 2009
New Revision: 22132
URL: http://svn.gnome.org/viewvc/gtk+?rev=22132&view=rev

Log:
       * demos/gtk-demo/search_entry.c: End the search if the window
        is closed.

        * demos/gtk-demo/search_entry.c:
        * demos/gtk-demo/entry_completion.c: Group the entry examples
        under "Entry".



Modified:
   trunk/ChangeLog
   trunk/demos/gtk-demo/entry_completion.c
   trunk/demos/gtk-demo/search_entry.c

Modified: trunk/demos/gtk-demo/entry_completion.c
==============================================================================
--- trunk/demos/gtk-demo/entry_completion.c	(original)
+++ trunk/demos/gtk-demo/entry_completion.c	Sun Jan 18 15:50:29 2009
@@ -1,4 +1,4 @@
-/* Entry Completion
+/* Entry/Entry Completion
  *
  * GtkEntryCompletion provides a mechanism for adding support for
  * completion in GtkEntry.

Modified: trunk/demos/gtk-demo/search_entry.c
==============================================================================
--- trunk/demos/gtk-demo/search_entry.c	(original)
+++ trunk/demos/gtk-demo/search_entry.c	Sun Jan 18 15:50:29 2009
@@ -1,4 +1,4 @@
-/* Search Entry 
+/* Entry/Search Entry 
  *
  * GtkEntry allows to display icons and progress information. 
  * This demo shows how to use these features in a search entry.
@@ -152,6 +152,19 @@
                                    "Search by file name\n"
                                    "Click here to change the search type");
 } 
+
+static void
+search_entry_destroyed (GtkWidget  *widget)
+{
+  if (finish_search_id != 0)
+    g_source_remove (finish_search_id);
+
+  if (search_progress_id != 0)
+    g_source_remove (search_progress_id);
+
+  window = NULL;
+}
+
                 
 GtkWidget *
 do_search_entry (GtkWidget *do_widget)
@@ -178,7 +191,7 @@
       g_signal_connect (window, "response",
                         G_CALLBACK (gtk_widget_destroy), NULL);
       g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+                        G_CALLBACK (search_entry_destroyed), &window);
 
       vbox = gtk_vbox_new (FALSE, 5);
       gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);