diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2007-05-18 15:56:05 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@src.gnome.org> | 2007-05-18 15:56:05 +0000 |
| commit | 52119349f683a1697d631bfd10777fcfc0075560 (patch) | |
| tree | 51406899eec70299da6a7e42025a34d8c541d865 /gtk/gtkrecentchooserdefault.c | |
| parent | 963067da7876ede0ddbaa91db48e3443b24e94ed (diff) | |
| download | gtk+-52119349f683a1697d631bfd10777fcfc0075560.tar.gz | |
Reset the state on dispose.
2007-05-18 Emmanuele Bassi <ebassi@gnome.org>
* gtk/gtkrecentchooserdefault.c:
(gtk_recent_chooser_default_dispose): Reset the state on dispose.
(cleanup_after_load): load_id != 0 && load_state == LOAD_EMPTY
is a valid state, if the main loop never had the chance to
properly spin at least once. (#438671)
svn path=/trunk/; revision=17866
Diffstat (limited to 'gtk/gtkrecentchooserdefault.c')
| -rw-r--r-- | gtk/gtkrecentchooserdefault.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c index 3cd4d6a4d7..cf7254b87d 100644 --- a/gtk/gtkrecentchooserdefault.c +++ b/gtk/gtkrecentchooserdefault.c @@ -590,6 +590,7 @@ gtk_recent_chooser_default_dispose (GObject *object) if (impl->load_id) { g_source_remove (impl->load_id); + impl->load_state = LOAD_EMPTY; impl->load_id = 0; } @@ -839,7 +840,8 @@ cleanup_after_load (gpointer user_data) if (impl->load_id != 0) { - g_assert ((impl->load_state == LOAD_PRELOAD) || + g_assert ((impl->load_state == LOAD_EMPTY) || + (impl->load_state == LOAD_PRELOAD) || (impl->load_state == LOAD_LOADING) || (impl->load_state == LOAD_FINISHED)); |