static void modest_dimming_rules_group_class_init (ModestDimmingRulesGroupClass *klass);
static void modest_dimming_rules_group_init (ModestDimmingRulesGroup *obj);
static void modest_dimming_rules_group_finalize (GObject *obj);
+static void modest_dimming_rules_group_dispose (GObject *obj);
+#ifndef MODEST_TOOLKIT_GTK
static void _insensitive_press_callback (GtkWidget *widget, gpointer user_data);
+#endif
+static void on_window_destroy (gpointer data,
+ GObject *object);
+
+static void _add_rule (ModestDimmingRulesGroup *self,
+ ModestDimmingRule *rule,
+ ModestWindow *window);
typedef struct _ModestDimmingRulesGroupPrivate ModestDimmingRulesGroupPrivate;
struct _ModestDimmingRulesGroupPrivate {
gchar *name;
gboolean notifications_enabled;
GHashTable *rules_map;
+ GSList *widget_rules;
+ gboolean window_weak_ref;
};
static GObjectClass *parent_class = NULL;
static void _execute_dimming_rule (gpointer key, gpointer value, gpointer user_data);
-static void _insensitive_press_callback (GtkWidget *widget, gpointer user_data);
-
-
+static void _execute_widget_dimming_rule (gpointer data, gpointer user_data);
GType
modest_dimming_rules_group_get_type (void)
parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = modest_dimming_rules_group_finalize;
+ gobject_class->dispose = modest_dimming_rules_group_dispose;
g_type_class_add_private (gobject_class, sizeof(ModestDimmingRulesGroupPrivate));
}
(GEqualFunc) g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) g_object_unref);
+ priv->widget_rules = NULL;
+ priv->window_weak_ref = FALSE;
}
static void
priv = MODEST_DIMMING_RULES_GROUP_GET_PRIVATE(obj);
- if (priv->name != NULL)
- g_free(priv->name);
+ if (priv->window && priv->window_weak_ref) {
+ g_object_weak_unref (G_OBJECT (priv->window), on_window_destroy, obj);
+ priv->window_weak_ref = FALSE;
+ }
+
+ G_OBJECT_CLASS(parent_class)->finalize (obj);
+}
+
+static void
+modest_dimming_rules_group_dispose (GObject *obj)
+{
+ ModestDimmingRulesGroupPrivate *priv;
+
+ priv = MODEST_DIMMING_RULES_GROUP_GET_PRIVATE(obj);
- if (priv->rules_map != NULL)
+ if (priv->rules_map != NULL) {
g_hash_table_destroy (priv->rules_map);
+ priv->rules_map = NULL;
+ }
- G_OBJECT_CLASS(parent_class)->finalize (obj);
+ if (priv->widget_rules != NULL) {
+ g_slist_foreach (priv->widget_rules, (GFunc) g_object_unref, NULL);
+ priv->widget_rules = NULL;
+ }
+
+ G_OBJECT_CLASS(parent_class)->dispose (obj);
}
return g_strdup (priv->name);
}
+static void
+_add_rule (ModestDimmingRulesGroup *self,
+ ModestDimmingRule *rule,
+ ModestWindow *window)
+{
+ ModestDimmingRulesGroupPrivate *priv;
+ GtkWidget *widget = NULL;
+ const gchar *action_path = NULL;
+
+ g_return_if_fail (MODEST_IS_DIMMING_RULES_GROUP(self));
+ g_return_if_fail (MODEST_IS_WINDOW(window));
+ g_return_if_fail (MODEST_IS_DIMMING_RULE (rule));
+
+ priv = MODEST_DIMMING_RULES_GROUP_GET_PRIVATE(self);
+
+ /* Set window to process dimming rules */
+ priv->window = MODEST_WINDOW (window);
+
+ widget = modest_dimming_rule_get_widget (rule);
+#ifndef MODEST_TOOLKIT_GTK
+ /* Connect insensitive-presss handler to show notifications */
+ g_signal_connect (G_OBJECT (widget), "insensitive-press",
+ G_CALLBACK (_insensitive_press_callback),
+ rule);
+#endif
+ /* Register new dimming rule */
+ modest_dimming_rule_set_group (rule, self);
+ action_path = modest_dimming_rule_get_action_path (rule);
+ if (action_path)
+ g_hash_table_insert (priv->rules_map, g_strdup(action_path), rule);
+ else
+ priv->widget_rules = g_slist_prepend (priv->widget_rules, rule);
+}
+
+void
+modest_dimming_rules_group_add_widget_rule (ModestDimmingRulesGroup *self,
+ GtkWidget *widget,
+ GCallback callback,
+ ModestWindow *window)
+{
+ ModestDimmingRulesGroupPrivate *priv;
+ ModestDimmingRule *dim_rule = NULL;
+
+ g_return_if_fail (MODEST_IS_DIMMING_RULES_GROUP(self));
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+ g_return_if_fail (MODEST_IS_WINDOW(window));
+
+ priv = MODEST_DIMMING_RULES_GROUP_GET_PRIVATE(self);
+
+ /* Set window to process dimming rules */
+ if (priv->window_weak_ref)
+ g_object_weak_unref ((GObject *) priv->window, on_window_destroy, self);
+ priv->window = MODEST_WINDOW (window);
+ g_object_weak_ref (G_OBJECT (window), on_window_destroy, self);
+ priv->window_weak_ref = TRUE;
+
+ dim_rule = modest_dimming_rule_new_from_widget (priv->window,
+ (ModestDimmingCallback) callback,
+ widget);
+
+ _add_rule (self, dim_rule, window);
+}
+
void
modest_dimming_rules_group_add_rules (ModestDimmingRulesGroup *self,
const ModestDimmingEntry modest_dimming_entries[],
guint n_elements,
- gpointer user_data)
+ ModestWindow *window)
{
ModestDimmingRulesGroupPrivate *priv;
ModestDimmingRule *dim_rule = NULL;
g_return_if_fail (MODEST_IS_DIMMING_RULES_GROUP(self));
g_return_if_fail (modest_dimming_entries != NULL);
g_return_if_fail (n_elements > 0);
- g_return_if_fail (MODEST_IS_WINDOW(user_data));
+ g_return_if_fail (MODEST_IS_WINDOW(window));
priv = MODEST_DIMMING_RULES_GROUP_GET_PRIVATE(self);
/* Set window to process dimming rules */
- priv->window = MODEST_WINDOW (user_data);
+ if (priv->window_weak_ref)
+ g_object_weak_unref ((GObject *) priv->window, on_window_destroy, self);
+ priv->window = MODEST_WINDOW (window);
+ g_object_weak_ref (G_OBJECT (window), on_window_destroy, self);
+ priv->window_weak_ref = TRUE;
/* Add dimming rules */
for (i=0; i < n_elements; i++) {
if (!unique) continue;
/* Check action path is valid */
- widget = modest_window_get_action_widget (MODEST_WINDOW (user_data), entry.action_path);
+ widget = modest_window_get_action_widget (MODEST_WINDOW (window), entry.action_path);
if (widget == NULL) continue;
/* Create a new dimming rule */
dim_rule = modest_dimming_rule_new (priv->window,
(ModestDimmingCallback) entry.callback,
entry.action_path);
-
- /* Connect insensitive-presss handler to show notifications */
- g_signal_connect (G_OBJECT (widget), "insensitive-press",
- G_CALLBACK (_insensitive_press_callback),
- dim_rule);
-
- /* Register new dimming rule */
- modest_dimming_rule_set_group (dim_rule, self);
- g_hash_table_insert (priv->rules_map, g_strdup(entry.action_path), dim_rule);
+
+ _add_rule (self, dim_rule, window);
}
}
g_return_if_fail (MODEST_IS_DIMMING_RULES_GROUP(self));
priv = MODEST_DIMMING_RULES_GROUP_GET_PRIVATE(self);
+ if (!priv->window)
+ return;
+
/* Init dimming rules init data */
state = modest_ui_dimming_rules_define_dimming_state (priv->window);
modest_window_set_dimming_state (priv->window, state);
/* execute group dimming rules */
g_hash_table_foreach (priv->rules_map, _execute_dimming_rule, NULL);
+ g_slist_foreach (priv->widget_rules, (GFunc) _execute_widget_dimming_rule, NULL);
/* Free dimming ruls init data */
modest_window_set_dimming_state (priv->window, NULL);
}
static void
+_execute_widget_dimming_rule (gpointer data, gpointer user_data)
+{
+ g_return_if_fail (MODEST_IS_DIMMING_RULE (data));
+
+ /* Process dimming rule */
+ modest_dimming_rule_process (MODEST_DIMMING_RULE(data));
+}
+
+#ifndef MODEST_TOOLKIT_GTK
+static void
_insensitive_press_callback (GtkWidget *widget, gpointer user_data)
{
ModestDimmingRulesGroup *group = NULL;
notification = modest_dimming_rule_get_notification (rule);
if (notification == NULL)
goto frees;
-
+
+ /* Notifications for dimmed items are not shown in Hildon2 */
+#ifndef MODEST_TOOLKIT_HILDON2
/* Show notification banner */
- modest_platform_information_banner (NULL, NULL, notification);
-
+ modest_platform_information_banner (NULL, NULL, notification);
+#endif
+
/* Free */
frees:
if (group != NULL)
if (notification != NULL)
g_free(notification);
}
+#endif
+
+static void
+on_window_destroy (gpointer data,
+ GObject *object)
+{
+ ModestDimmingRulesGroup *self = MODEST_DIMMING_RULES_GROUP (data);
+ ModestDimmingRulesGroupPrivate *priv = MODEST_DIMMING_RULES_GROUP_GET_PRIVATE (self);
+
+ priv->window = NULL;
+}
projects / modest / blobdiff