X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-dimming-manager.c;h=f7e82d1461b154796226b848b401a717b761c637;hp=36b90df0ef09ab2b5466a7ff6d90d24968f30f25;hb=eaa47d5033f37d2210cb277919b8239d13dc000d;hpb=293935db5773b0ce78e3f2a244130ca777408933

diff --git a/src/modest-ui-dimming-manager.c b/src/modest-ui-dimming-manager.c
index 36b90df..f7e82d1 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,12 +137,30 @@ 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 && (g_hash_table_size (priv->delayed_calls) > 0)) {
+		/* 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));
 
 
@@ -188,6 +208,7 @@ typedef struct
 	ModestDimmingRulesGroup *group;
 	ModestUIDimmingManager *manager;
 	gchar *name;
+	gboolean delete;
 } DelayedDimmingRules;
 
 static gboolean
@@ -197,18 +218,21 @@ process_dimming_rules_delayed (gpointer data)
 	gpointer timeout_handler;
 	ModestUIDimmingManagerPrivate *priv;
 
+	/* Let the destroyer remove it from the hash table */
+	helper->delete = TRUE;
+
 	/* We remove the timeout here because the execute action could
 	   take too much time, and so this will be called again */
 	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;
 }
@@ -220,8 +244,17 @@ process_dimming_rules_delayed_destroyer (gpointer data)
 	ModestUIDimmingManagerPrivate *priv;
 
 	priv = MODEST_UI_DIMMING_MANAGER_GET_PRIVATE(helper->manager);
-	g_hash_table_remove (priv->delayed_calls, helper->name);
+
+	/* We can only destroy it if we had really executed it. If the
+	   source is removed because the manager is finalized then we
+	   cannot remove it because it removes the sources in a
+	   foreach, that does not allow you to modify the hash table
+	   in the mean time */
+	if (helper->delete)
+		g_hash_table_remove (priv->delayed_calls, helper->name);
+
 	g_free (helper->name);
+	g_object_unref (helper->manager);
 	g_slice_free (DelayedDimmingRules, helper);
 }
 
@@ -233,7 +266,7 @@ modest_ui_dimming_manager_process_dimming_rules_group (ModestUIDimmingManager *s
 	ModestUIDimmingManagerPrivate *priv;
 	guint *handler, new_handler;
 	DelayedDimmingRules *helper;
-	
+
 	g_return_if_fail (group_name != NULL);
 
 	priv = MODEST_UI_DIMMING_MANAGER_GET_PRIVATE(self);
@@ -248,11 +281,15 @@ 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, 
+		helper->delete = FALSE;
+		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));
+		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););
 	} else {
 		MODEST_DEBUG_BLOCK(g_print ("---------------------Ignoring\n"););
@@ -264,7 +301,7 @@ static void
 _process_all_rules (gpointer key, gpointer value, gpointer user_data)
 {
 	g_return_if_fail (MODEST_IS_DIMMING_RULES_GROUP (value));
-	
+
 	modest_dimming_rules_group_execute (MODEST_DIMMING_RULES_GROUP (value));
 }