AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtk-demo: Properly clean up timeouts in search entry demo

Browse Source
This commit is contained in:
Matthias Clasen 2015-07-21 21:12:36 -04:00
parent 3243ae6e08
commit 0d7a9dc4b8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
demos/gtk-demo/search_entry.c
View File

@ -45,8 +45,7 @@ finish_search (GtkButton *button)
show_find_button (); show_find_button ();
g_source_remove (search_progress_id); g_source_remove (search_progress_id);
search_progress_id = 0; search_progress_id = 0;
return G_SOURCE_REMOVE;
return FALSE;
} }
static gboolean static gboolean
@ -55,7 +54,7 @@ start_search_feedback (gpointer data)
search_progress_id = g_timeout_add_full (G_PRIORITY_DEFAULT, 100, search_progress_id = g_timeout_add_full (G_PRIORITY_DEFAULT, 100,
(GSourceFunc)search_progress, data, (GSourceFunc)search_progress, data,
(GDestroyNotify)search_progress_done); (GDestroyNotify)search_progress_done);
return FALSE; return G_SOURCE_REMOVE;
} }
static void static void
@ -170,10 +169,16 @@ static void
search_entry_destroyed (GtkWidget *widget) search_entry_destroyed (GtkWidget *widget)
{ {
if (finish_search_id != 0) if (finish_search_id != 0)
g_source_remove (finish_search_id); {
g_source_remove (finish_search_id);
finish_search_id = 0;
}
if (search_progress_id != 0) if (search_progress_id != 0)
g_source_remove (search_progress_id); {
g_source_remove (search_progress_id);
search_progress_id = 0;
}
window = NULL; window = NULL;
} }