* cosmetics

pmo-trunk-r134

diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c
index 56c213f..3ea2ed6 100644 (file)
--- a/src/modest-account-mgr.c
+++ b/src/modest-account-mgr.c
@@ -96,8 +96,10 @@ modest_account_mgr_finalize (GObject * obj)
        ModestAccountMgr *self = MODEST_ACCOUNT_MGR (obj);
        ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
 
-       g_object_unref (G_OBJECT (priv->modest_conf));
-       priv->modest_conf = NULL;
+       if (priv->modest_conf) {
+               g_object_unref (G_OBJECT(priv->modest_conf));
+               priv->modest_conf = NULL;
+       }
 }
 
 GObject *

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index d929607..254c775 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -533,7 +533,9 @@ modest_tny_account_store_get_cache_dir (TnyAccountStoreIface *self)
 static const TnyDeviceIface*
 modest_tny_account_store_get_device (TnyAccountStoreIface *self)
 {
-       ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+       ModestTnyAccountStorePrivate *priv;
+
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
 
        return priv->device;
 }