2007-07-26 Murray Cumming <murrayc@murrayc.com>

* src/modest-tny-account-store.c: (recreate_all_accounts):
Recreate them even if they were NULL before. I guess something
else was already creating them before, or this would never
have worked.
(modest_tny_account_store_get_server_account): Make sure that
the tny accounts have been created before trying to find one.
This allows libmodest_dbus_client_compose_mail() to work
when the UI is not yet visible.
This is probably useful in other cases too.

(get_password): When the password is wrong after it is entered
in the protected password dialog, show an info banner (in an
idle handler) before showing the protected password dialog
again.

pmo-trunk-r2807

diff --git a/ChangeLog2 b/ChangeLog2
index 37b01ad..1773d7e 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,22 @@
 2007-07-26  Murray Cumming  <murrayc@murrayc.com>
 
+       * src/modest-tny-account-store.c: (recreate_all_accounts):
+       Recreate them even if they were NULL before. I guess something 
+       else was already creating them before, or this would never 
+       have worked.
+       (modest_tny_account_store_get_server_account): Make sure that 
+       the tny accounts have been created before trying to find one.
+       This allows libmodest_dbus_client_compose_mail() to work 
+       when the UI is not yet visible.
+       This is probably useful in other cases too.
+
+       (get_password): When the password is wrong after it is entered 
+       in the protected password dialog, show an info banner (in an 
+       idle handler) before showing the protected password dialog 
+       again.
+
+2007-07-26  Murray Cumming  <murrayc@murrayc.com>
+
        * src/modest-ui-actions.h:
        * src/modest-ui-actions.c: Added 
        modest_do_refresh_current_folder() containing some code from 

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index bf01e38..fdd51cf 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -271,6 +271,8 @@ account_list_disconnect (GSList *accounts)
 static void
 recreate_all_accounts (ModestTnyAccountStore *self)
 {
+       /* printf ("DEBUG: %s\n", __FUNCTION__); */
+       
        ModestTnyAccountStorePrivate *priv = 
                MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
        
@@ -279,19 +281,23 @@ recreate_all_accounts (ModestTnyAccountStore *self)
                priv->store_accounts_outboxes = NULL;
        }
                        
+                       
        if (priv->store_accounts) {
                account_list_free (priv->store_accounts);
                priv->store_accounts = NULL;
-               get_server_accounts (TNY_ACCOUNT_STORE(self),
-                                            NULL, TNY_ACCOUNT_TYPE_STORE);
        }
        
+       get_server_accounts (TNY_ACCOUNT_STORE(self),
+                                            NULL, TNY_ACCOUNT_TYPE_STORE);
+       
+       
        if (priv->transport_accounts) {
                account_list_free (priv->transport_accounts);
                priv->transport_accounts = NULL;
-               get_server_accounts (TNY_ACCOUNT_STORE(self), NULL,
-                                            TNY_ACCOUNT_TYPE_TRANSPORT);
        }
+       
+       get_server_accounts (TNY_ACCOUNT_STORE(self), NULL,
+                                            TNY_ACCOUNT_TYPE_TRANSPORT);
 }
 
 static void
@@ -457,6 +463,23 @@ void on_account_settings_hide (GtkWidget *widget, gpointer user_data)
 }
 
 static 
+gboolean on_idle_wrong_password_warning_only (gpointer user_data)
+{
+       gdk_threads_enter();
+       
+       ModestWindow *main_window = 
+                               modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
+                               
+       /* Show an explanatory temporary banner: */
+       hildon_banner_show_information ( 
+               GTK_WIDGET(main_window), NULL, _("mcen_ib_username_pw_incorrect"));
+               
+       gdk_threads_leave();
+       
+       return FALSE; /* Don't show again. */
+}
+               
+static 
 gboolean on_idle_wrong_password (gpointer user_data)
 { 
        TnyAccount *account = (TnyAccount*)user_data;
@@ -665,7 +688,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
        
                        
                        /* The password must be wrong, so show the account settings dialog so it can be corrected: */
-                       /* We show it in the main loop, because this function might no tbe in the main loop. */
+                       /* We show it in the main loop, because this function might not be in the main loop. */
                        g_object_ref (account); /* unrefed in the idle handler. */
                        g_idle_add (on_idle_wrong_password, account);
                        
@@ -680,6 +703,11 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
                gboolean remember = FALSE;
                pwd = NULL;
                
+               if (already_asked) {
+                       /* Show an info banner, before we show the protected password dialog: */
+                       g_idle_add (on_idle_wrong_password_warning_only, NULL);
+               }
+               
                request_password_in_main_loop_and_wait (self, account_id, 
                               &username, &pwd, cancel, &remember);
                
@@ -1515,15 +1543,27 @@ modest_tny_account_store_get_server_account (ModestTnyAccountStore *self,
        
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
 
+       /* Make sure that the tny accounts have been created:
+        * TODO: We might want to do this in several places.
+        */
+       if (!priv->store_accounts || !priv->transport_accounts)
+               recreate_all_accounts (self);
+
        account_list = (type == TNY_ACCOUNT_TYPE_STORE) ? 
                priv->store_accounts : 
                priv->transport_accounts;
+
+       if (!account_list) {
+               g_printerr ("%s: No server accounts of type %s\n", __FUNCTION__, 
+                       (type == TNY_ACCOUNT_TYPE_STORE) ? "store" : "transport");
+               return NULL;
+       }
        
        /* Look for the server account */
        while (account_list && !found) {
                const gchar *modest_acc_name;
 
-               account = TNY_ACCOUNT (account_list->data);;
+               account = TNY_ACCOUNT (account_list->data);
                modest_acc_name = 
                        modest_tny_account_get_parent_modest_account_name_for_server_account (account);
                
@@ -1534,9 +1574,9 @@ modest_tny_account_store_get_server_account (ModestTnyAccountStore *self,
        }
 
        if (!found) {
-               g_printerr ("modest: could not get tny %s account for %s\n",
+               g_printerr ("modest: %s: could not get tny %s account for %s\n.  Number of server accounts of this type=%d\n", __FUNCTION__, 
                            (type == TNY_ACCOUNT_TYPE_STORE) ? "store" : "transport",
-                           account_name);
+                           account_name, g_slist_length (account_list));
        } else {
                /* Pick a reference */
                g_object_ref (account);