X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-window.c;h=cab203da3655411c02460e165af51f42fbe81211;hp=acf9d909df461984e97ac044501db7f34a694be6;hb=e374da56f67092cecb1572dd4bee2ca34e0bc04c;hpb=f6d386ff93e929092ba105385a29d760aeba9ff7

diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c
index acf9d90..cab203d 100644
--- a/src/widgets/modest-window.c
+++ b/src/widgets/modest-window.c
@@ -89,7 +89,11 @@ modest_window_get_type (void)
 			NULL
 		};
 #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 
@@ -157,6 +161,10 @@ modest_window_finalize (GObject *obj)
 		g_object_unref (G_OBJECT(priv->ui_dimming_manager));
 		priv->ui_dimming_manager = NULL;
 	}
+	if (priv->dimming_state != NULL) {
+		g_slice_free (DimmedState, priv->dimming_state);
+		priv->dimming_state = NULL;
+	}
 
 	g_free (priv->active_account);