[gtk+/gtk-2.90] Remove the dir_thaw_source while disposing the model
- From: Christian Dywan <cdywan src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2.90] Remove the dir_thaw_source while disposing the model
- Date: Fri, 16 Oct 2009 14:00:51 +0000 (UTC)
commit 88221659fd1e040314434e2c88b32b1e2448c054
Author: Federico Mena Quintero <federico novell com>
Date: Mon Aug 31 15:53:45 2009 -0500
Remove the dir_thaw_source while disposing the model
Otherwise that timeout may trigger after the model has died.
Signed-off-by: Federico Mena Quintero <federico novell com>
gtk/gtkfilesystemmodel.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
index 07f3685..00a531b 100644
--- a/gtk/gtkfilesystemmodel.c
+++ b/gtk/gtkfilesystemmodel.c
@@ -830,6 +830,12 @@ gtk_file_system_model_dispose (GObject *object)
{
GtkFileSystemModel *model = GTK_FILE_SYSTEM_MODEL (object);
+ if (model->dir_thaw_source)
+ {
+ g_source_remove (model->dir_thaw_source);
+ model->dir_thaw_source = 0;
+ }
+
g_cancellable_cancel (model->cancellable);
if (model->dir_monitor)
g_file_monitor_cancel (model->dir_monitor);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]