#include "modest-singletons.h"
#include "modest-runtime.h"
+#include "modest-debug.h"
/* 'private'/'protected' functions */
static void modest_singletons_class_init (ModestSingletonsClass *klass);
struct _ModestSingletonsPrivate {
ModestConf *conf;
ModestAccountMgr *account_mgr;
- ModestTnyAccountStore *account_store;
+ ModestEmailClipboard *email_clipboard;
ModestCacheMgr *cache_mgr;
ModestMailOperationQueue *mail_op_queue;
TnyPlatformFactory *platform_fact;
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) {
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");
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");
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));
+ 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->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);
}
{
ModestSingletonsPrivate *priv;
ModestSingletons *self;
+ static gboolean invoked = FALSE;
+
+ if (invoked) {
+ 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 instance\n");
+ g_printerr ("modest: failed to create singletons object\n");
g_object_unref (G_OBJECT(self));
self = NULL;
}
-
+
+ invoked = TRUE;
return 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*
return MODEST_SINGLETONS_GET_PRIVATE(self)->mail_op_queue;
}
-
-
TnyDevice*
modest_singletons_get_device (ModestSingletons *self)
{
}
-
TnyPlatformFactory*
modest_singletons_get_platform_factory (ModestSingletons *self)
{
projects / modest / blobdiff