Modified webpage: now tinymail repository is in gitorious.

[modest] / src / modest-singletons.c

diff --git a/src/modest-singletons.c b/src/modest-singletons.c
index ca28aeb..e4159e4 100644 (file)
--- a/src/modest-singletons.c
+++ b/src/modest-singletons.c
@@ -34,7 +34,7 @@
 #ifdef MODEST_TOOLKIT_HILDON2
 #include "hildon2/modest-hildon2-window-mgr.h"
 #else
-#include "widgets/modest-hildon1-window-mgr.h"
+#include "gtk/modest-gtk-window-mgr.h"
 #endif
 #include <tny-fs-stream-cache.h>
 
@@ -55,6 +55,7 @@ struct _ModestSingletonsPrivate {
        ModestWindowMgr           *window_mgr;
        ModestProtocolRegistry    *protocol_registry;
        ModestPluginFactory   *plugin_factory;
+       ModestToolkitFactory      *toolkit_factory;
        TnyStreamCache            *images_cache;
 };
 #define MODEST_SINGLETONS_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -116,6 +117,7 @@ modest_singletons_init (ModestSingletons *obj)
        priv->window_mgr      = NULL;
        priv->protocol_registry = NULL;
        priv->plugin_factory = NULL;
+       priv->toolkit_factory = NULL;
 
        priv->protocol_registry = modest_protocol_registry_new ();
        if (!priv->protocol_registry) {
@@ -149,6 +151,12 @@ modest_singletons_init (ModestSingletons *obj)
                return;
        }
 
+       priv->toolkit_factory  = modest_toolkit_factory_get_instance ();
+       if (!priv->toolkit_factory) {
+               g_printerr ("modest: cannot create toolkit factory instance\n");
+               return;
+       }
+
        priv->device  = tny_platform_factory_new_device (priv->platform_fact);
        if (!priv->device) {
                g_printerr ("modest: cannot create tny device instance\n");
@@ -170,7 +178,7 @@ modest_singletons_init (ModestSingletons *obj)
 #if MODEST_TOOLKIT_HILDON2
        priv->window_mgr = modest_hildon2_window_mgr_new ();
 #else
-       priv->window_mgr = modest_hildon1_window_mgr_new ();
+       priv->window_mgr = modest_gtk_window_mgr_new ();
 #endif
        if (!priv->window_mgr) {
                g_printerr ("modest: cannot create modest window manager instance\n");
@@ -354,6 +362,13 @@ modest_singletons_get_platform_factory (ModestSingletons *self)
        return MODEST_SINGLETONS_GET_PRIVATE(self)->platform_fact;
 }
 
+ModestToolkitFactory*
+modest_singletons_get_toolkit_factory (ModestSingletons *self)
+{
+       g_return_val_if_fail (self, NULL);
+       return MODEST_SINGLETONS_GET_PRIVATE(self)->toolkit_factory;
+}
+
 ModestWindowMgr* 
 modest_singletons_get_window_mgr (ModestSingletons *self)
 {