* fixed includes (modest-identity-mgr.h was missing)

[modest] / src / modest-tny-account-store.c

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index d929607..7d7b97a 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -107,7 +107,7 @@ modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass)
                g_signal_new ("password_requested",
                              G_TYPE_FROM_CLASS (gobject_class),
                              G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET(ModestTnyAccountStoreClass,password_requested),
+                             G_STRUCT_OFFSET(ModestTnyAccountStoreClass, password_requested),
                              NULL, NULL,
                              g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1, G_TYPE_POINTER);
@@ -192,8 +192,10 @@ modest_tny_account_store_new (ModestAccountMgr *modest_acc_mgr)
        obj  = G_OBJECT(g_object_new(MODEST_TYPE_TNY_ACCOUNT_STORE, NULL));
 
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj);
-       g_object_ref(G_OBJECT(priv->modest_acc_mgr = modest_acc_mgr));
-
+       
+       g_object_ref(G_OBJECT(modest_acc_mgr));
+       priv->modest_acc_mgr = modest_acc_mgr;
+       
        priv->device = (TnyDeviceIface*)tny_device_new();
        if (!priv->device) {
                g_warning ("Cannot create Device instance");
@@ -213,7 +215,7 @@ modest_tny_account_store_new (ModestAccountMgr *modest_acc_mgr)
 
 
 static gchar*
-get_password (TnyAccountIface *account, const gchar *prompt)
+get_password (TnyAccountIface *account, const gchar *prompt, gboolean *cancel)
 {
        const gchar *key;
        const TnyAccountStoreIface *account_store;
@@ -230,20 +232,16 @@ get_password (TnyAccountIface *account, const gchar *prompt)
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
 
        val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key,
-                                                           MODEST_ACCOUNT_PASSWORD,
-                                                            NULL);
-       if (!val)
-        {
-                /* FIXME:
-                 * append the prompt to the emitted signal,
-                 * so the password dialog shows the prompt supplied by the caller of this function.
-                 */
-                g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0,
-                               key);
-
+                                                                                               MODEST_ACCOUNT_PASSWORD, NULL);
+       if (!val) {
+               /* FIXME:
+                * append the prompt to the emitted signal,
+                * so the password dialog shows the prompt supplied by the caller of this function.
+                */
+               g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0, key);
        }
 
-        return val;
+       return val;
 }
 
 
@@ -262,7 +260,7 @@ add_account  (TnyAccountStoreIface *self, TnyAccountIface *account)
        ModestTnyAccountStore *account_store;
        ModestTnyAccountStorePrivate *priv;
 
-       const gchar* account_name;
+       const gchar *account_name;
        const gchar *hostname, *username, *proto;
 
        g_return_val_if_fail (self, FALSE);
@@ -289,7 +287,6 @@ add_account  (TnyAccountStoreIface *self, TnyAccountIface *account)
 }
 
 
-
 static void
 modest_tny_account_store_add_store_account  (TnyAccountStoreIface *self,
                                             TnyStoreAccountIface *account)
@@ -299,7 +296,6 @@ modest_tny_account_store_add_store_account  (TnyAccountStoreIface *self,
 }
 
 
-
 static void
 modest_tny_account_store_add_transport_account  (TnyAccountStoreIface *self,
                                                 TnyTransportAccountIface *account)
@@ -309,7 +305,6 @@ modest_tny_account_store_add_transport_account  (TnyAccountStoreIface *self,
 }
 
 
-
 static TnyAccountIface*
 tny_account_from_key (ModestTnyAccountStore *self, const gchar *key,
                      gboolean is_store)
@@ -390,7 +385,6 @@ tny_accounts_from_server_accounts (ModestTnyAccountStore *self, GSList *accounts
 
        while (cursor) {
                TnyAccountIface *tny_account;
-               gchar *key = cursor->data;
                tny_account = tny_account_from_key (self, (gchar*)cursor->data,
                                                    is_store);
                if (!tny_account) {
@@ -407,13 +401,12 @@ tny_accounts_from_server_accounts (ModestTnyAccountStore *self, GSList *accounts
 }
 
 
-
 static const GList*
 modest_tny_account_store_get_store_accounts  (TnyAccountStoreIface *iface)
 {
        ModestTnyAccountStore        *self;
        ModestTnyAccountStorePrivate *priv;
-       GSList                       *accounts, *cursor;
+       GSList                       *accounts;
        GList                        *tny_accounts;
 
        g_return_val_if_fail (iface, NULL);
@@ -441,13 +434,12 @@ modest_tny_account_store_get_store_accounts  (TnyAccountStoreIface *iface)
 }
 
 
-
 static const GList*
 modest_tny_account_store_get_transport_accounts (TnyAccountStoreIface *iface)
 {
        ModestTnyAccountStore        *self;
        ModestTnyAccountStorePrivate *priv;
-       GSList                       *accounts, *cursor;
+       GSList                       *accounts;
        GList                        *tny_accounts;
 
        g_return_val_if_fail (iface, NULL);
@@ -488,7 +480,6 @@ ModestAccountMgr
 }
 
 
-
 TnySessionCamel*
 tny_account_store_get_session (TnyAccountStore *self)
 {
@@ -501,7 +492,6 @@ tny_account_store_get_session (TnyAccountStore *self)
 }
 
 
-
 /**
  * modest_tny_account_store_get_cache_dir:
  * @self: self a TnyAccountStoreIface instance
@@ -518,8 +508,6 @@ modest_tny_account_store_get_cache_dir (TnyAccountStoreIface *self)
        ModestTnyAccountStorePrivate *priv;
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
 
-       gchar *cache_dir;
-
        if (!priv->cache_dir) {
                if (g_getenv("HOME") != NULL)
                        priv->cache_dir = g_strconcat(g_getenv("HOME"),
@@ -529,17 +517,17 @@ 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;
 }
 
 
-
 static void
 modest_tny_account_store_iface_init (gpointer g_iface, gpointer iface_data)
 {
@@ -549,17 +537,16 @@ modest_tny_account_store_iface_init (gpointer g_iface, gpointer iface_data)
 
        klass = (TnyAccountStoreIfaceClass *)g_iface;
 
-        klass->add_store_account_func      =
+       klass->add_store_account_func      =
                modest_tny_account_store_add_store_account;
-        klass->get_store_accounts_func     =
+       klass->get_store_accounts_func     =
                modest_tny_account_store_get_store_accounts;
-        klass->add_transport_account_func  =
+       klass->add_transport_account_func  =
                modest_tny_account_store_add_transport_account;
-        klass->get_transport_accounts_func =
+       klass->get_transport_accounts_func =
                modest_tny_account_store_get_transport_accounts;
        klass->get_cache_dir_func =
                modest_tny_account_store_get_cache_dir;
        klass->get_device_func =
                modest_tny_account_store_get_device;
-
 }