Make ui dimming manager dispose stop delayed handlers (fixes NB#97124)

[modest] / src / widgets / modest-window.c

diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c
index 32b415e..99b0015 100644 (file)
--- a/src/widgets/modest-window.c
+++ b/src/widgets/modest-window.c
@@ -41,6 +41,7 @@
 static void modest_window_class_init (ModestWindowClass *klass);
 static void modest_window_init       (ModestWindow *obj);
 static void modest_window_finalize   (GObject *obj);
+static void modest_window_dispose    (GObject *obj);
 
 static gdouble  modest_window_get_zoom_default           (ModestWindow *window);
 
@@ -88,8 +89,12 @@ modest_window_get_type (void)
                        (GInstanceInitFunc) modest_window_init,
                        NULL
                };
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_TOOLKIT_HILDON2
+               parent_type = HILDON_TYPE_STACKABLE_WINDOW;
+#else
                parent_type = HILDON_TYPE_WINDOW;
+#endif
 #else
                parent_type = GTK_TYPE_WINDOW;
 #endif 
@@ -108,6 +113,7 @@ modest_window_class_init (ModestWindowClass *klass)
        gobject_class = (GObjectClass*) klass;
 
        parent_class            = g_type_class_peek_parent (klass);
+       gobject_class->dispose  = modest_window_dispose;
        gobject_class->finalize = modest_window_finalize;
 
        klass->set_zoom_func = modest_window_set_zoom_default;
@@ -149,18 +155,35 @@ modest_window_finalize (GObject *obj)
 
        priv = MODEST_WINDOW_GET_PRIVATE(obj);
 
+       if (priv->dimming_state != NULL) {
+               g_slice_free (DimmedState, priv->dimming_state);
+               priv->dimming_state = NULL;
+       }
+
+       g_free (priv->active_account);
+       
+       G_OBJECT_CLASS(parent_class)->finalize (obj);
+}
+
+static void
+modest_window_dispose (GObject *obj)
+{
+       ModestWindowPrivate *priv;      
+
+       priv = MODEST_WINDOW_GET_PRIVATE(obj);
+
+       priv->ui_dimming_enabled = FALSE;
+
        if (priv->ui_manager) {
                g_object_unref (G_OBJECT(priv->ui_manager));
                priv->ui_manager = NULL;
        }
        if (priv->ui_dimming_manager) {
+               g_object_run_dispose (G_OBJECT (priv->ui_dimming_manager));
                g_object_unref (G_OBJECT(priv->ui_dimming_manager));
                priv->ui_dimming_manager = NULL;
        }
-
-       g_free (priv->active_account);
-       
-       G_OBJECT_CLASS(parent_class)->finalize (obj);
+       G_OBJECT_CLASS(parent_class)->dispose (obj);
 }