X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-singletons.c;h=e756b114950f812e83d45f399dbfa02ced8590c7;hp=5998e5e5e3945e78cc1b4959bba931175fefa2ce;hb=87596c5aa5517ac7ba37e50664a969fcaaea72f9;hpb=33df6842a563bf75ad3253e62afbc74d31840dd8

diff --git a/src/modest-singletons.c b/src/modest-singletons.c
index 5998e5e..e756b11 100644
--- a/src/modest-singletons.c
+++ b/src/modest-singletons.c
@@ -166,7 +166,13 @@ modest_singletons_finalize (GObject *obj)
 	ModestSingletonsPrivate *priv;
 		
 	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));
@@ -179,12 +185,6 @@ modest_singletons_finalize (GObject *obj)
 		priv->email_clipboard = NULL;
 	}
 
-	if (priv->conf) {
-		modest_runtime_verify_object_last_ref(priv->conf,"");
-		g_object_unref (G_OBJECT(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));
@@ -218,13 +218,13 @@ modest_singletons_finalize (GObject *obj)
 		g_object_unref (G_OBJECT(priv->account_mgr));
 		priv->account_mgr = NULL;
 	}
-
-	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->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);
 }