}
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;
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);
}
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;
}
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);
}
/* 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););