2007-06-13 Murray Cumming <murrayc@murrayc.com>

[modest] / src / modest-singletons.c

diff --git a/src/modest-singletons.c b/src/modest-singletons.c
index 44653fe..9c0ede2 100644 (file)
--- a/src/modest-singletons.c
+++ b/src/modest-singletons.c
@@ -160,50 +160,50 @@ modest_singletons_finalize (GObject *obj)
        priv = MODEST_SINGLETONS_GET_PRIVATE(obj);
 
        if (priv->account_store) {
+               modest_runtime_verify_object_last_ref(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) {
+               modest_runtime_verify_object_last_ref(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->conf) {
+               modest_runtime_verify_object_last_ref(priv->conf,"");
                g_object_unref (G_OBJECT(priv->conf));
-               modest_runtime_verify_object_death(priv->conf,"");
                priv->conf = NULL;
        }
 
        if (priv->cache_mgr) {
+               modest_runtime_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_runtime_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_runtime_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_runtime_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;
        }
        
        if (priv->window_mgr) {
+               modest_runtime_verify_object_last_ref(priv->window_mgr,"");
                g_object_unref (G_OBJECT(priv->window_mgr));
-               modest_runtime_verify_object_death(priv->window_mgr,"");
                priv->window_mgr = NULL;
        }