X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-dimming-manager.c;h=0beef151f6751976c53d7b1f036ab205ef1929e5;hp=36b90df0ef09ab2b5466a7ff6d90d24968f30f25;hb=a588a7c8d674282d264542e1e989577b1df787e0;hpb=293935db5773b0ce78e3f2a244130ca777408933 diff --git a/src/modest-ui-dimming-manager.c b/src/modest-ui-dimming-manager.c index 36b90df..0beef15 100644 --- a/src/modest-ui-dimming-manager.c +++ b/src/modest-ui-dimming-manager.c @@ -202,13 +202,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; } @@ -222,6 +222,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); } @@ -248,9 +249,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););