* Changed the order in which the singletons and the account store are finalized...

pmo-trunk-r3740

diff --git a/src/modest-runtime.c b/src/modest-runtime.c
index 3d3843c..aa41989 100644 (file)
--- a/src/modest-runtime.c
+++ b/src/modest-runtime.c
@@ -87,17 +87,16 @@ modest_runtime_uninit (void)
        
        g_return_val_if_fail (MODEST_IS_SINGLETONS(_singletons), FALSE);
        
+       MODEST_DEBUG_VERIFY_OBJECT_LAST_REF(_singletons,"");
+       g_object_unref(_singletons);
+       _singletons = NULL;
+
        if (_account_store) {
                MODEST_DEBUG_VERIFY_OBJECT_LAST_REF(_account_store,"");
                g_object_unref(_account_store);
                _account_store = NULL;
        }
        
-       MODEST_DEBUG_VERIFY_OBJECT_LAST_REF(_singletons,"");
-       g_object_unref(_singletons);
-       _singletons = NULL;
-
-       
        if (_sig_handlers) {
                modest_signal_mgr_disconnect_all_and_destroy (_sig_handlers);
                _sig_handlers = NULL;