X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=inline;f=src%2Fmodest-singletons.c;h=09249b0b63a2c92326851fe2e137899e35a2125f;hb=f68f57e6aa049365b5be5b3a072145403445c97f;hp=7be780a7cce5813648c3b4ee914abc0457d985d6;hpb=a257b9e8b31184a663ccb7676362d4ac2cb1b039;p=modest

diff --git a/src/modest-singletons.c b/src/modest-singletons.c
index 7be780a..09249b0 100644
--- a/src/modest-singletons.c
+++ b/src/modest-singletons.c
@@ -31,7 +31,11 @@
 #include "modest-runtime.h"
 #include "modest-defs.h"
 #include "modest-debug.h"
+#ifdef MODEST_TOOLKIT_HILDON2
+#include "hildon2/modest-hildon2-window-mgr.h"
+#else
 #include "widgets/modest-hildon1-window-mgr.h"
+#endif
 #include <tny-fs-stream-cache.h>
 
 /* 'private'/'protected' functions */
@@ -163,7 +167,11 @@ modest_singletons_init (ModestSingletons *obj)
 		return;
 	}
 
+#if MODEST_TOOLKIT_HILDON2
+	priv->window_mgr = modest_hildon2_window_mgr_new ();
+#else
 	priv->window_mgr = modest_hildon1_window_mgr_new ();
+#endif
 	if (!priv->window_mgr) {
 		g_printerr ("modest: cannot create modest window manager instance\n");
 		return;