X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-singletons.c;h=45d2e5b97f95152ba529e49cd944289ed421a4cf;hp=44653feb7605e74da084e0879a2d6ac5c0d7bc25;hb=c5e5c216be6773f1a37385084d067672db73edc3;hpb=98bc76b00da273d0253f82b32ba4384e6b9dd957

diff --git a/src/modest-singletons.c b/src/modest-singletons.c
index 44653fe..45d2e5b 100644
--- a/src/modest-singletons.c
+++ b/src/modest-singletons.c
@@ -29,6 +29,7 @@
 
 #include "modest-singletons.h"
 #include "modest-runtime.h"
+#include "modest-debug.h"
 
 /* 'private'/'protected' functions */
 static void modest_singletons_class_init (ModestSingletonsClass *klass);
@@ -39,7 +40,7 @@ typedef struct _ModestSingletonsPrivate ModestSingletonsPrivate;
 struct _ModestSingletonsPrivate {
 	ModestConf                *conf;
 	ModestAccountMgr          *account_mgr;
-	ModestTnyAccountStore     *account_store;
+	ModestEmailClipboard      *email_clipboard;
 	ModestCacheMgr            *cache_mgr;	
 	ModestMailOperationQueue  *mail_op_queue;
 	TnyPlatformFactory        *platform_fact;
@@ -94,14 +95,14 @@ modest_singletons_init (ModestSingletons *obj)
 	ModestSingletonsPrivate *priv;
 	priv = MODEST_SINGLETONS_GET_PRIVATE(obj);
 
-	priv->conf           = NULL;
-	priv->account_mgr    = NULL;
-	priv->account_store  = NULL;
-	priv->cache_mgr      = NULL;
-	priv->mail_op_queue  = NULL;
-	priv->platform_fact  = NULL;
-	priv->device         = NULL;
-	priv->window_mgr     = NULL;
+	priv->conf            = NULL;
+	priv->account_mgr     = NULL;
+	priv->email_clipboard = NULL;
+	priv->cache_mgr       = NULL;
+	priv->mail_op_queue   = NULL;
+	priv->platform_fact   = NULL;
+	priv->device          = NULL;
+	priv->window_mgr      = NULL;
 	
 	priv->conf           = modest_conf_new ();
 	if (!priv->conf) {
@@ -115,6 +116,12 @@ modest_singletons_init (ModestSingletons *obj)
 		return;
 	}
 
+	priv->email_clipboard    = modest_email_clipboard_new ();
+	if (!priv->email_clipboard) {
+		g_printerr ("modest: cannot create modest email clipboard instance\n");
+		return;
+	}
+
 	priv->platform_fact  = modest_tny_platform_factory_get_instance ();
 	if (!priv->platform_fact) {
 		g_printerr ("modest: cannot create platform factory instance\n");
@@ -127,12 +134,6 @@ modest_singletons_init (ModestSingletons *obj)
 		return;
 	}
 	
-	priv->account_store  = modest_tny_account_store_new (priv->account_mgr, priv->device);
-	if (!priv->account_store) {
-		g_printerr ("modest: cannot create modest tny account store instance\n");
-		return;
-	}
-	
 	priv->cache_mgr     = modest_cache_mgr_new ();
 	if (!priv->cache_mgr) {
 		g_printerr ("modest: cannot create modest cache mgr instance\n");
@@ -158,55 +159,59 @@ modest_singletons_finalize (GObject *obj)
 	ModestSingletonsPrivate *priv;
 		
 	priv = MODEST_SINGLETONS_GET_PRIVATE(obj);
-
-	if (priv->account_store) {
-		g_object_unref (G_OBJECT(priv->account_store));
-		modest_runtime_verify_object_death(priv->account_store,"");
-		priv->account_store = NULL;
-	}
-
-	if (priv->account_mgr) {
-		g_object_unref (G_OBJECT(priv->account_mgr));
-		modest_runtime_verify_object_death(priv->account_mgr,"");
-		priv->account_mgr = NULL;
+	
+	if (priv->window_mgr) {
+		MODEST_DEBUG_VERIFY_OBJECT_LAST_REF(priv->window_mgr,"");
+		g_object_unref (G_OBJECT(priv->window_mgr));
+		priv->window_mgr = NULL;
 	}
-
-	if (priv->conf) {
-		g_object_unref (G_OBJECT(priv->conf));
-		modest_runtime_verify_object_death(priv->conf,"");
-		priv->conf = NULL;
+	
+	if (priv->email_clipboard) {
+		MODEST_DEBUG_VERIFY_OBJECT_LAST_REF(priv->email_clipboard,"");
+		g_object_unref (G_OBJECT(priv->email_clipboard));
+		priv->email_clipboard = NULL;
 	}
 
 	if (priv->cache_mgr) {
+		MODEST_DEBUG_VERIFY_OBJECT_LAST_REF(priv->cache_mgr,"");
 		g_object_unref (G_OBJECT(priv->cache_mgr));
-		modest_runtime_verify_object_death(priv->cache_mgr,"");
 		priv->cache_mgr = NULL;
 	}
 
 	if (priv->device) {
+		MODEST_DEBUG_VERIFY_OBJECT_LAST_REF(priv->device,"");
 		g_object_unref (G_OBJECT(priv->device));
-		modest_runtime_verify_object_death(priv->device,"");
 		priv->device = NULL;
 	}
 
 	if (priv->platform_fact) {
+		MODEST_DEBUG_VERIFY_OBJECT_LAST_REF(priv->platform_fact,"");
 		g_object_unref (G_OBJECT(priv->platform_fact));
-		modest_runtime_verify_object_death(priv->platform_fact,"");
 		priv->platform_fact = NULL;
 	}
 
 	if (priv->mail_op_queue) {
+		MODEST_DEBUG_VERIFY_OBJECT_LAST_REF(priv->mail_op_queue,"");
 		g_object_unref (G_OBJECT(priv->mail_op_queue));
-		modest_runtime_verify_object_death(priv->mail_op_queue,"");
 		priv->mail_op_queue = 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
+	 * manager (see modest_mail_operation_notify_end()). */
+	if (priv->account_mgr) {
+		MODEST_DEBUG_VERIFY_OBJECT_LAST_REF(priv->account_mgr,"");
+		g_object_unref (G_OBJECT(priv->account_mgr));
+		priv->account_mgr = NULL;
+	}
 	
-	if (priv->window_mgr) {
-		g_object_unref (G_OBJECT(priv->window_mgr));
-		modest_runtime_verify_object_death(priv->window_mgr,"");
-		priv->window_mgr = NULL;
+	if (priv->conf) {
+		MODEST_DEBUG_VERIFY_OBJECT_LAST_REF(priv->conf,"");
+		g_object_unref (G_OBJECT(priv->conf));
+		priv->conf = NULL;
 	}
-
+	
 	G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -218,16 +223,17 @@ modest_singletons_new (void)
 	static gboolean invoked = FALSE;
 
 	if (invoked) {
-		g_printerr ("modest: modest_singletons_new may only be called once\n");
-		g_assert (!invoked); /* abort */
-		return NULL; /* g_assert may be NOP */
+		g_printerr ("%s: modest: modest_singletons_new may only be called once, aborting...\n",
+			    __FUNCTION__);
+		abort();
+		return NULL;
 	}
 	
 	self = MODEST_SINGLETONS(g_object_new(MODEST_TYPE_SINGLETONS, NULL));
 	priv = MODEST_SINGLETONS_GET_PRIVATE(self);
 	
 	/* widget_factory will still be NULL, as it is initialized lazily */
-	if (!(priv->conf && priv->account_mgr && priv->account_store &&
+	if (!(priv->conf && priv->account_mgr && priv->email_clipboard && 
 	      priv->cache_mgr && priv->mail_op_queue && priv->device && priv->platform_fact)) {
 		g_printerr ("modest: failed to create singletons object\n");
 		g_object_unref (G_OBJECT(self));
@@ -253,11 +259,11 @@ modest_singletons_get_account_mgr (ModestSingletons *self)
 	return MODEST_SINGLETONS_GET_PRIVATE(self)->account_mgr;
 }
 
-ModestTnyAccountStore*
-modest_singletons_get_account_store (ModestSingletons *self)
+ModestEmailClipboard*
+modest_singletons_get_email_clipboard (ModestSingletons *self)
 {
 	g_return_val_if_fail (self, NULL);
-	return MODEST_SINGLETONS_GET_PRIVATE(self)->account_store;
+	return MODEST_SINGLETONS_GET_PRIVATE(self)->email_clipboard;
 }
 
 ModestCacheMgr*
@@ -274,8 +280,6 @@ modest_singletons_get_mail_operation_queue (ModestSingletons *self)
 	return MODEST_SINGLETONS_GET_PRIVATE(self)->mail_op_queue;
 }
 
-
-
 TnyDevice*
 modest_singletons_get_device (ModestSingletons *self)
 {
@@ -284,7 +288,6 @@ modest_singletons_get_device (ModestSingletons *self)
 }
 
 
-
 TnyPlatformFactory*
 modest_singletons_get_platform_factory (ModestSingletons *self)
 {