struct _ModestSingletonsPrivate {
ModestConf *conf;
ModestAccountMgr *account_mgr;
+ ModestEmailClipboard *email_clipboard;
ModestTnyAccountStore *account_store;
ModestCacheMgr *cache_mgr;
ModestMailOperationQueue *mail_op_queue;
TnyPlatformFactory *platform_fact;
TnyDevice *device;
+ ModestWindowMgr *window_mgr;
};
#define MODEST_SINGLETONS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_SINGLETONS, \
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->conf = NULL;
+ priv->account_mgr = NULL;
+ priv->email_clipboard = 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 = 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");
if (!priv->mail_op_queue) {
g_printerr ("modest: cannot create modest mail operation queue instance\n");
return;
- }
-}
-
+ }
-static void
-check_object_is_dead (GObject *obj, gchar *name)
-{
- if (G_IS_OBJECT(obj))
- g_warning ("BUG: %s still has %d ref(s)\n", name, obj->ref_count);
+ priv->window_mgr = modest_window_mgr_new ();
+ if (!priv->window_mgr) {
+ g_printerr ("modest: cannot create modest window manager instance\n");
+ return;
+ }
}
static void
modest_singletons_finalize (GObject *obj)
{
ModestSingletonsPrivate *priv;
- gboolean debug = modest_runtime_get_debug_flags() & MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS;
priv = MODEST_SINGLETONS_GET_PRIVATE(obj);
-
+
+ if (priv->window_mgr) {
+ modest_runtime_verify_object_last_ref(priv->window_mgr,"");
+ g_object_unref (G_OBJECT(priv->window_mgr));
+ priv->window_mgr = NULL;
+ }
+
if (priv->account_store) {
+ modest_runtime_verify_object_last_ref(priv->account_store,"");
g_object_unref (G_OBJECT(priv->account_store));
- if (debug)
- check_object_is_dead ((GObject*)priv->account_store,
- "priv->account_store");
priv->account_store = NULL;
}
- if (priv->account_mgr) {
- g_object_unref (G_OBJECT(priv->account_mgr));
- if (debug)
- check_object_is_dead ((GObject*)priv->account_mgr,
- "priv->account_mgr");
- priv->account_mgr = NULL;
- }
-
- if (priv->conf) {
- g_object_unref (G_OBJECT(priv->conf));
- if (debug)
- check_object_is_dead ((GObject*)priv->conf,
- "priv->conf");
- priv->conf = NULL;
+ if (priv->email_clipboard) {
+ modest_runtime_verify_object_last_ref(priv->email_clipboard,"");
+ g_object_unref (G_OBJECT(priv->email_clipboard));
+ priv->email_clipboard = NULL;
}
if (priv->cache_mgr) {
+ modest_runtime_verify_object_last_ref(priv->cache_mgr,"");
g_object_unref (G_OBJECT(priv->cache_mgr));
- if (debug)
- check_object_is_dead ((GObject*)priv->cache_mgr,
- "priv->cache_mgr");
priv->cache_mgr = NULL;
}
if (priv->device) {
+ modest_runtime_verify_object_last_ref(priv->device,"");
g_object_unref (G_OBJECT(priv->device));
- if (debug)
- check_object_is_dead ((GObject*)priv->cache_mgr,
- "priv->device");
priv->device = NULL;
}
if (priv->platform_fact) {
+ modest_runtime_verify_object_last_ref(priv->platform_fact,"");
g_object_unref (G_OBJECT(priv->platform_fact));
- if (debug)
- check_object_is_dead ((GObject*)priv->cache_mgr,
- "priv->platform_fact");
priv->platform_fact = NULL;
}
+ if (priv->mail_op_queue) {
+ modest_runtime_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_runtime_verify_object_last_ref(priv->account_mgr,"");
+ g_object_unref (G_OBJECT(priv->account_mgr));
+ priv->account_mgr = NULL;
+ }
+
+ if (priv->conf) {
+ modest_runtime_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 ("modest: modest_singletons_new may only be called once\n");
+ g_assert (!invoked); /* abort */
+ return NULL; /* g_assert may be NOP */
+ }
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->account_store &&
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;
}
+ModestEmailClipboard*
+modest_singletons_get_email_clipboard (ModestSingletons *self)
+{
+ g_return_val_if_fail (self, NULL);
+ return MODEST_SINGLETONS_GET_PRIVATE(self)->email_clipboard;
+}
+
ModestTnyAccountStore*
modest_singletons_get_account_store (ModestSingletons *self)
{
return MODEST_SINGLETONS_GET_PRIVATE(self)->mail_op_queue;
}
-
-
TnyDevice*
modest_singletons_get_device (ModestSingletons *self)
{
}
-
TnyPlatformFactory*
modest_singletons_get_platform_factory (ModestSingletons *self)
{
g_return_val_if_fail (self, NULL);
return MODEST_SINGLETONS_GET_PRIVATE(self)->platform_fact;
}
+
+ModestWindowMgr*
+modest_singletons_get_window_mgr (ModestSingletons *self)
+{
+ g_return_val_if_fail (self, NULL);
+ return MODEST_SINGLETONS_GET_PRIVATE(self)->window_mgr;
+}
projects / modest / blobdiff