* all:

[modest] / src / modest-account-mgr.c

diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c
index ccbe841..ebbf2fb 100644 (file)
--- a/src/modest-account-mgr.c
+++ b/src/modest-account-mgr.c
@@ -31,21 +31,13 @@
 #include <modest-marshal.h>
 #include <modest-account-mgr.h>
 #include <modest-account-mgr-priv.h>
+#include <modest-account-mgr-helpers.h>
 
 /* 'private'/'protected' functions */
 static void modest_account_mgr_class_init (ModestAccountMgrClass * klass);
 static void modest_account_mgr_init       (ModestAccountMgr * obj);
 static void modest_account_mgr_finalize   (GObject * obj);
 
-
-typedef struct _ModestAccountMgrPrivate ModestAccountMgrPrivate;
-struct _ModestAccountMgrPrivate {
-       ModestConf        *modest_conf;
-};
-
-#define MODEST_ACCOUNT_MGR_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
-                                                MODEST_TYPE_ACCOUNT_MGR, \
-                                                ModestAccountMgrPrivate))
 /* list my signals */
 enum {
        ACCOUNT_CHANGED_SIGNAL,
@@ -89,7 +81,7 @@ on_key_change (ModestConf *conf, const gchar *key, ModestConfEvent event, gpoint
        if (is_server_account)
                enabled = TRUE;
        else 
-               enabled = modest_account_mgr_account_get_enabled (self, account);
+               enabled = modest_account_mgr_get_enabled (self, account);
 
        /* account was changed.
         * and always notify when enabled/disabled changes
@@ -268,8 +260,7 @@ modest_account_mgr_add_account (ModestAccountMgr *self,
                        return FALSE;
                }
        }
-
-       modest_account_mgr_account_set_enabled (self, name, TRUE);
+       modest_account_mgr_set_enabled (self, name, TRUE);
        
        return TRUE;
 }
@@ -455,7 +446,6 @@ modest_account_mgr_account_names (ModestAccountMgr * self, GError ** err)
 }
 
 
-
 gchar *
 modest_account_mgr_get_string (ModestAccountMgr *self, const gchar *name,
                               const gchar *key, gboolean server_account, GError **err) {