Update all accounts after they have been modified,

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

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index b9061d0..9ed5db9 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -216,15 +216,6 @@ modest_tny_account_store_base_init (gpointer g_class)
                                      NULL, NULL,
                                      g_cclosure_marshal_VOID__OBJECT,
                                      G_TYPE_NONE, 1, TNY_TYPE_ACCOUNT);
-               
-/*             signals[TNY_ACCOUNT_STORE_CONNECTING_FINISHED] = */
-/*                     g_signal_new ("connecting_finished", */
-/*                                   TNY_TYPE_ACCOUNT_STORE, */
-/*                                   G_SIGNAL_RUN_FIRST, */
-/*                                   G_STRUCT_OFFSET (TnyAccountStoreIface, connecting_finished), */
-/*                                   NULL, NULL, */
-/*                                   g_cclosure_marshal_VOID__VOID,  */
-/*                                   G_TYPE_NONE, 0); */
 
                signals[PASSWORD_REQUESTED_SIGNAL] =
                        g_signal_new ("password_requested",
@@ -482,15 +473,10 @@ on_account_changed (ModestAccountMgr *acc_mgr,
                TnyAccount *tny_account;
                tny_account = TNY_ACCOUNT (tny_iterator_get_current (iter));
                if (tny_account) {
-                       TnyConnectionStatus conn_status = tny_account_get_connection_status (tny_account);
-
-                       if (conn_status != TNY_CONNECTION_STATUS_RECONNECTING &&
-                           conn_status != TNY_CONNECTION_STATUS_INIT) {
-                               if (!strcmp (tny_account_get_id (tny_account), account_name)) {
-                                       found = TRUE;
-                                       modest_tny_account_update_from_account (tny_account);
-                                       g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, tny_account);
-                               }
+                       if (!strcmp (tny_account_get_id (tny_account), account_name)) {
+                               found = TRUE;
+                               modest_tny_account_update_from_account (tny_account);
+                               g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, tny_account);
                        }
                        g_object_unref (tny_account);
                }
@@ -602,20 +588,6 @@ show_wrong_password_dialog (TnyAccount *account)
 }
 #endif
 
-
-static void
-request_password_and_wait (ModestTnyAccountStore *account_store, 
-                                        const gchar* server_account_id,
-                                        gchar **username,
-                                        gchar **password,
-                                        gboolean *cancel, 
-                                        gboolean *remember)
-{
-       g_signal_emit (G_OBJECT(account_store), signals[PASSWORD_REQUESTED_SIGNAL], 0,
-                      server_account_id, /* server_account_name */
-                      username, password, cancel, remember);
-}
-
 /* This callback will be called by Tinymail when it needs the password
  * from the user or the account settings.
  * It can also call forget_password() before calling this,
@@ -715,9 +687,12 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
                        /* Show an info banner, before we show the protected password dialog: */
                        show_password_warning_only();
                }
-               
-               request_password_and_wait (self, account_id, 
+
+               /* Request password */
+               g_signal_emit (G_OBJECT(account_store), signals[PASSWORD_REQUESTED_SIGNAL], 0,
+                              account_id, /* server_account_name */
                               &username, &pwd, cancel, &remember);
+
                
                if (!*cancel) {
                        /* The password will be returned as the result,
@@ -1372,7 +1347,8 @@ modest_tny_account_store_get_smtp_specific_transport_account_for_open_connection
        
        
 #ifdef MODEST_HAVE_CONIC
-       g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device));
+       g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE (device), NULL);
+       
        TnyMaemoConicDevice *maemo_device = TNY_MAEMO_CONIC_DEVICE (device);    
        const gchar* iap_id = tny_maemo_conic_device_get_current_iap_id (maemo_device);
        /* printf ("DEBUG: %s: iap_id=%s\n", __FUNCTION__, iap_id); */
@@ -1570,8 +1546,11 @@ add_outbox_from_transport_account_to_global_outbox (ModestTnyAccountStore *self,
        /* Get the outbox folder */
        folders = tny_simple_list_new ();
        tny_folder_store_get_folders (TNY_FOLDER_STORE (account_outbox), folders, NULL, NULL);
-       g_assert (tny_list_get_length (folders) == 1);
-               
+       if (tny_list_get_length (folders) != 1) {
+               g_warning ("%s: > 1 outbox found (%d)?!", __FUNCTION__,
+                          tny_list_get_length (folders));
+       }
+                       
        iter_folders = tny_list_create_iterator (folders);
        per_account_outbox = TNY_FOLDER (tny_iterator_get_current (iter_folders));
        g_object_unref (iter_folders);
@@ -1611,10 +1590,17 @@ insert_account (ModestTnyAccountStore *self,
 
        /* Get the server and the transport account */
        store_account = create_tny_account (self, account, TNY_ACCOUNT_TYPE_STORE);
-       transport_account = create_tny_account (self, account, TNY_ACCOUNT_TYPE_TRANSPORT);
+       if (!store_account || !TNY_IS_ACCOUNT(store_account)) {
+               g_warning ("%s: failed to create store account", __FUNCTION__);
+               return;
+       }
 
-       g_assert (store_account);
-       g_assert (transport_account);
+       transport_account = create_tny_account (self, account, TNY_ACCOUNT_TYPE_TRANSPORT);
+       if (!transport_account || !TNY_IS_ACCOUNT(transport_account)) {
+               g_warning ("%s: failed to create transport account", __FUNCTION__);
+               g_object_unref (store_account);
+               return;
+       }
 
        /* Add accounts to the lists */
        tny_list_append (priv->store_accounts, G_OBJECT (store_account));