X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-dimming-manager.c;h=be768979db005e810b8f1f83cce7877317eb7c27;hb=34abbc5f611d07a4a52479f887fc452a30deaf59;hp=3f33a2c80d11a3bbde15c1961ee1f11d68b74d7d;hpb=ee9a9871f25d1cbb863c76b57b5acadea4035695;p=modest

diff --git a/src/modest-ui-dimming-manager.c b/src/modest-ui-dimming-manager.c
index 3f33a2c..be76897 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));
 }
@@ -105,6 +107,15 @@ modest_ui_dimming_manager_init (ModestUIDimmingManager *obj)
 }
 
 static void
+remove_all_timeouts (gpointer key, 
+		     gpointer value, 
+		     gpointer user_data)
+{
+	if (GPOINTER_TO_INT (value) > 0)
+		g_source_remove (GPOINTER_TO_INT (value));
+}
+
+static void
 modest_ui_dimming_manager_finalize (GObject *obj)
 {
 	ModestUIDimmingManagerPrivate *priv;
@@ -114,18 +125,42 @@ modest_ui_dimming_manager_finalize (GObject *obj)
 	if (priv->groups_map != NULL)
 		g_hash_table_unref (priv->groups_map);
 
-	if (priv->delayed_calls != NULL)
+	if (priv->delayed_calls != NULL) {
+		/* Remove all pending calls */
+		g_hash_table_foreach (priv->delayed_calls,
+				      remove_all_timeouts,
+				      NULL);
+
 		g_hash_table_unref (priv->delayed_calls);
+	}
 
 	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()
 {
 	ModestUIDimmingManager *obj;
-		
+
 	obj = MODEST_UI_DIMMING_MANAGER(g_object_new(MODEST_TYPE_UI_DIMMING_MANAGER, NULL));
 
 
@@ -187,13 +222,13 @@ process_dimming_rules_delayed (gpointer data)
 	priv = MODEST_UI_DIMMING_MANAGER_GET_PRIVATE(helper->manager);
 	timeout_handler = g_hash_table_lookup (priv->delayed_calls, helper->name);
 
-	MODEST_DEBUG_BLOCK(g_print ("---------------------HIT %d\n", GPOINTER_TO_INT (timeout_handler)););
-
 	if (GPOINTER_TO_INT (timeout_handler) > 0) {
 		g_source_remove (GPOINTER_TO_INT (timeout_handler));
 	}
 
+	gdk_threads_enter ();
 	modest_dimming_rules_group_execute (helper->group);
+	gdk_threads_leave ();
 
 	return FALSE;
 }
@@ -207,6 +242,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);
 	g_free (helper->name);
+	g_object_unref (helper->manager);
 	g_slice_free (DelayedDimmingRules, helper);
 }
 
@@ -233,9 +269,9 @@ modest_ui_dimming_manager_process_dimming_rules_group (ModestUIDimmingManager *s
 		/* Create the helper and start the timeout */
 		helper = g_slice_new (DelayedDimmingRules);
 		helper->group = group;
-		helper->manager = self;
+		helper->manager = g_object_ref (self);
 		helper->name = g_strdup (group_name);
-		new_handler = g_timeout_add_full (G_PRIORITY_DEFAULT, 500, process_dimming_rules_delayed, 
+		new_handler = g_timeout_add_full (G_PRIORITY_DEFAULT, 100, process_dimming_rules_delayed, 
 						  helper, process_dimming_rules_delayed_destroyer);
 		g_hash_table_insert (priv->delayed_calls, g_strdup (group_name), GINT_TO_POINTER (new_handler));
 		MODEST_DEBUG_BLOCK(g_print ("---------------------Adding %d\n", new_handler););