X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-singletons.c;h=76f6ec19e6fa0341a6b2cbb180adcfbe786052b1;hp=28f50a111cd6eb18912d2e9447e7b57703a1f41e;hb=a6ff5269ddd912e12602d34a7bc7429711e84b61;hpb=627c4af6ac85444cc3256fa568baf4a8d62178ae

diff --git a/src/modest-singletons.c b/src/modest-singletons.c
index 28f50a1..76f6ec1 100644
--- a/src/modest-singletons.c
+++ b/src/modest-singletons.c
@@ -31,6 +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 */
@@ -48,13 +53,9 @@ struct _ModestSingletonsPrivate {
 	TnyPlatformFactory        *platform_fact;
 	TnyDevice                 *device;
 	ModestWindowMgr           *window_mgr;
-<<<<<<< .working
-	TnyStreamCache            *images_cache;
-=======
 	ModestProtocolRegistry    *protocol_registry;
 	ModestPluginFactory   *plugin_factory;
 	TnyStreamCache            *images_cache;
->>>>>>> .merge-right.r5668
 };
 #define MODEST_SINGLETONS_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                MODEST_TYPE_SINGLETONS, \
@@ -113,9 +114,6 @@ modest_singletons_init (ModestSingletons *obj)
 	priv->platform_fact   = NULL;
 	priv->device          = NULL;
 	priv->window_mgr      = NULL;
-<<<<<<< .working
-	priv->images_cache    = NULL;
-=======
 	priv->protocol_registry = NULL;
 	priv->plugin_factory = NULL;
 
@@ -126,7 +124,6 @@ modest_singletons_init (ModestSingletons *obj)
 	}
 	modest_protocol_registry_set_to_default (priv->protocol_registry);
 	priv->images_cache    = NULL;
->>>>>>> .merge-right.r5668
 	
 	priv->conf           = modest_conf_new ();
 	if (!priv->conf) {
@@ -170,21 +167,15 @@ modest_singletons_init (ModestSingletons *obj)
 		return;
 	}
 
-	priv->window_mgr = modest_window_mgr_new ();
+#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;
 	}
-<<<<<<< .working
-
-	images_cache_path = g_build_filename (g_get_home_dir (), MODEST_DIR, MODEST_IMAGES_CACHE_DIR, NULL);
-	priv->images_cache = tny_fs_stream_cache_new (images_cache_path, MODEST_IMAGES_CACHE_SIZE);
-	g_free (images_cache_path);
-	if (!priv->images_cache) {
-		g_printerr ("modest: cannot create images cache instance\n");
-		return;
-	}
-=======
 
 	priv->plugin_factory = modest_plugin_factory_new ();
 	if (!priv->plugin_factory) {
@@ -200,7 +191,6 @@ modest_singletons_init (ModestSingletons *obj)
 		return;
 	}
 
->>>>>>> .merge-right.r5668
 }
 
 static void
@@ -252,6 +242,18 @@ modest_singletons_finalize (GObject *obj)
 		priv->email_clipboard = NULL;
 	}
 
+	if (priv->plugin_factory) {
+		MODEST_DEBUG_VERIFY_OBJECT_LAST_REF(priv->plugin_factory,"");
+		g_object_unref (G_OBJECT(priv->plugin_factory));
+		priv->plugin_factory = NULL;
+	}
+
+	if (priv->protocol_registry) {
+		MODEST_DEBUG_VERIFY_OBJECT_LAST_REF(priv->protocol_registry,"");
+		g_object_unref (G_OBJECT(priv->protocol_registry));
+		priv->protocol_registry = NULL;
+	}
+
 	/* It is important that the account manager is uninitialized after
 	 * the mail op queue is uninitialized because the mail op queue
 	 * cancells any mail operations which in turn access the account
@@ -358,15 +360,6 @@ modest_singletons_get_window_mgr (ModestSingletons *self)
 	g_return_val_if_fail (self, NULL);
 	return MODEST_SINGLETONS_GET_PRIVATE(self)->window_mgr;
 }
-<<<<<<< .working
-
-TnyStreamCache* 
-modest_singletons_get_images_cache (ModestSingletons *self)
-{
-	g_return_val_if_fail (self, NULL);
-	return MODEST_SINGLETONS_GET_PRIVATE(self)->images_cache;
-}
-=======
 
 ModestProtocolRegistry* 
 modest_singletons_get_protocol_registry (ModestSingletons *self)
@@ -389,4 +382,3 @@ modest_singletons_get_plugin_factory (ModestSingletons *self)
 
 	return MODEST_SINGLETONS_GET_PRIVATE (self)->plugin_factory;
 }
->>>>>>> .merge-right.r5668