X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodest-ui-dimming-manager.c;h=d8207b013bc25369f8b199de0392c7e726401a1d;hb=a6b529412dd433403cda93437840c731e290122b;hp=0beef151f6751976c53d7b1f036ab205ef1929e5;hpb=b328c7be77213502ac75ba60f1bd8f454b55ab18;p=modest

diff --git a/src/modest-ui-dimming-manager.c b/src/modest-ui-dimming-manager.c
index 0beef15..d8207b0 100644
--- a/src/modest-ui-dimming-manager.c
+++ b/src/modest-ui-dimming-manager.c
@@ -34,6 +34,7 @@
 static void modest_ui_dimming_manager_class_init (ModestUIDimmingManagerClass *klass);
 static void modest_ui_dimming_manager_init       (ModestUIDimmingManager *obj);
 static void modest_ui_dimming_manager_finalize   (GObject *obj);
+static void modest_ui_dimming_manager_dispose    (GObject *obj);
 
 static void _process_all_rules (gpointer key, gpointer value, gpointer user_data);
 
@@ -83,6 +84,7 @@ modest_ui_dimming_manager_class_init (ModestUIDimmingManagerClass *klass)
 
 	parent_class            = g_type_class_peek_parent (klass);
 	gobject_class->finalize = modest_ui_dimming_manager_finalize;
+	gobject_class->dispose  = modest_ui_dimming_manager_dispose;
 
 	g_type_class_add_private (gobject_class, sizeof(ModestUIDimmingManagerPrivate));
 }
@@ -135,6 +137,24 @@ modest_ui_dimming_manager_finalize (GObject *obj)
 	G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
+static void
+modest_ui_dimming_manager_dispose (GObject *obj)
+{
+	ModestUIDimmingManagerPrivate *priv;
+
+	priv = MODEST_UI_DIMMING_MANAGER_GET_PRIVATE(obj);
+
+	if (priv->delayed_calls != NULL) {
+		/* Remove all pending calls */
+		g_hash_table_foreach (priv->delayed_calls,
+				      remove_all_timeouts,
+				      NULL);
+		g_hash_table_remove_all (priv->delayed_calls);
+	}
+
+	G_OBJECT_CLASS(parent_class)->dispose (obj);
+}
+
 
 ModestUIDimmingManager*
 modest_ui_dimming_manager_new()
@@ -221,6 +241,7 @@ process_dimming_rules_delayed_destroyer (gpointer data)
 
 	priv = MODEST_UI_DIMMING_MANAGER_GET_PRIVATE(helper->manager);
 	g_hash_table_remove (priv->delayed_calls, helper->name);
+	priv->delayed_calls = NULL;
 	g_free (helper->name);
 	g_object_unref (helper->manager);
 	g_slice_free (DelayedDimmingRules, helper);