Do ignore empty recipients when checking names

[modest] / src / modest-ui-dimming-manager.c

diff --git a/src/modest-ui-dimming-manager.c b/src/modest-ui-dimming-manager.c
index be76897..7aa5847 100644 (file)
--- a/src/modest-ui-dimming-manager.c
+++ b/src/modest-ui-dimming-manager.c
@@ -38,6 +38,8 @@ 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 {
@@ -138,13 +140,22 @@ modest_ui_dimming_manager_finalize (GObject *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) {
+       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,
@@ -152,6 +163,12 @@ modest_ui_dimming_manager_dispose (GObject *obj)
                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);
 }
 
@@ -208,6 +225,7 @@ typedef struct
        ModestDimmingRulesGroup *group;
        ModestUIDimmingManager *manager;
        gchar *name;
+       gboolean delete;
 } DelayedDimmingRules;
 
 static gboolean
@@ -217,6 +235,9 @@ 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);
@@ -240,7 +261,15 @@ 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);
@@ -254,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);
@@ -271,9 +300,13 @@ modest_ui_dimming_manager_process_dimming_rules_group (ModestUIDimmingManager *s
                helper->group = group;
                helper->manager = g_object_ref (self);
                helper->name = g_strdup (group_name);
-               new_handler = g_timeout_add_full (G_PRIORITY_DEFAULT, 100, 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"););
@@ -285,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));
+}
+