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);
gboolean notifications_enabled;
GHashTable *rules_map;
GSList *widget_rules;
+ gboolean window_weak_ref;
};
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));
}
(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;
+ }
- if (priv->widget_rules != NULL)
+ 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)->finalize (obj);
+ G_OBJECT_CLASS(parent_class)->dispose (obj);
}
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,
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;
/* Add dimming rules */
for (i=0; i < n_elements; i++) {