X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-dimming-manager.c;h=7aa58478052d862a59086381adaafdfff7735f00;hp=3f33a2c80d11a3bbde15c1961ee1f11d68b74d7d;hb=06546fe50ce8a03df5fe73027873467aa21e6244;hpb=ee9a9871f25d1cbb863c76b57b5acadea4035695 diff --git a/src/modest-ui-dimming-manager.c b/src/modest-ui-dimming-manager.c index 3f33a2c..7aa5847 100644 --- a/src/modest-ui-dimming-manager.c +++ b/src/modest-ui-dimming-manager.c @@ -34,9 +34,12 @@ 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); +#define WIDGET_DIMMING_MODE "widget-dimming-mode" + typedef struct _ModestUIDimmingManagerPrivate ModestUIDimmingManagerPrivate; struct _ModestUIDimmingManagerPrivate { @@ -83,6 +86,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 +109,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 +127,57 @@ 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 +dispose_objects (gpointer key, + gpointer value, + gpointer user_data) +{ + if (G_IS_OBJECT (value)) + g_object_run_dispose (value); +} + +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); + } + + if (priv->groups_map) { + g_hash_table_foreach (priv->groups_map, dispose_objects, NULL); + g_hash_table_unref (priv->groups_map); + priv->groups_map = NULL; + } + + 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)); @@ -173,6 +225,7 @@ typedef struct ModestDimmingRulesGroup *group; ModestUIDimmingManager *manager; gchar *name; + gboolean delete; } DelayedDimmingRules; static gboolean @@ -182,18 +235,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; } @@ -205,8 +261,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); } @@ -218,7 +283,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); @@ -233,11 +298,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");); @@ -249,7 +318,24 @@ 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)); } +void +modest_ui_dimming_manager_set_widget_dimming_mode (GtkWidget *widget, + ModestUIDimmingMode mode) +{ + g_return_if_fail (GTK_IS_WIDGET (widget)); + + g_object_set_data (G_OBJECT (widget), WIDGET_DIMMING_MODE, GINT_TO_POINTER (mode)); +} + +ModestUIDimmingMode +modest_ui_dimming_manager_get_widget_dimming_mode (GtkWidget *widget) +{ + g_return_val_if_fail (GTK_IS_WIDGET (widget), MODEST_UI_DIMMING_MODE_DIM); + + return (ModestUIDimmingMode) GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), WIDGET_DIMMING_MODE)); +} +