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

* src/modest-tny-account-store.c: (modest_tny_account_store_alert):
Adapt to the changed tinymail API, using the new TnyAccount* parameter.
This allows us to show the server name in the error message, fixing
projects.maemo.org bug NB#62904.
Also, use the appropriate logical ID message for the account protocol.

pmo-trunk-r2668

diff --git a/ChangeLog2 b/ChangeLog2
index 1b6db3c..777986c 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,13 @@
 2007-07-10  Murray Cumming  <murrayc@murrayc.com>
 
+       * src/modest-tny-account-store.c: (modest_tny_account_store_alert):
+       Adapt to the changed tinymail API, using the new TnyAccount* parameter.
+       This allows us to show the server name in the error message, fixing 
+       projects.maemo.org bug NB#62904.
+       Also, use the appropriate logical ID message for the account protocol.
+
+2007-07-10  Murray Cumming  <murrayc@murrayc.com>
+
        * src/modest-tny-account-store.c: (on_idle_wrong_password):
        A compilation fix, though the build wasn't broken for me.
 

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 7380646..af388a7 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -462,7 +462,7 @@ on_sendqueue_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg,
                        return;
        }
 
-       /* Get the account name: */
+       /* Get the server name: */
        const gchar* server_name = NULL;
        
        TnyCamelTransportAccount* server_account = tny_camel_send_queue_get_transport_account (

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index eef9b81..5d05bb4 100644 (file)
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -622,7 +622,7 @@ modest_account_mgr_set_first_account_as_default (ModestAccountMgr *self)
        gchar *old_default;
        gboolean result = FALSE, found;
        GSList* list_sorted, *iter;
-       const gchar* account_name;
+       const gchar* account_name = NULL;
        GSList *account_names = modest_account_mgr_account_names (self, TRUE /* only enabled */);
 
        /* Return TRUE if there is no account */
@@ -649,7 +649,7 @@ modest_account_mgr_set_first_account_as_default (ModestAccountMgr *self)
                        iter = g_slist_next (iter);
        }
 
-       if (found)
+       if (found && account_name)
                result = modest_account_mgr_set_default_account (self, account_name);
 
        modest_account_mgr_free_account_names (account_names);

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 001bdd8..36cdff7 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -1076,11 +1076,9 @@ modest_tny_account_store_find_account_by_url (TnyAccountStore *self, const gchar
 
 
 static gboolean
-modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
+modest_tny_account_store_alert (TnyAccountStore *self, TnyAccount *account, TnyAlertType type,
                                gboolean question, const GError *error)
 {
-       /* TODO: It would be nice to know what account caused this error. */
-       
        g_return_val_if_fail (error, FALSE);
 
        if ((error->domain != TNY_ACCOUNT_ERROR) 
@@ -1094,7 +1092,20 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
        printf("DEBUG: %s: GError code: %d, message=%s\n", 
                                __FUNCTION__, error->code, error->message);
        
-
+       /* Get the server name: */
+       const gchar* server_name = NULL;
+       if (account && TNY_IS_ACCOUNT (account)) {
+               server_name = tny_account_get_hostname (account);
+               printf ("modest: %s: account name = %s, server_name=%s\n", __FUNCTION__, 
+                       tny_account_get_id (account), server_name);
+       }
+       
+       if (!server_name)
+               server_name = _("Unknown Server");      
+               
+       const ModestTransportStoreProtocol proto
+               = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account));
+               
        /* const gchar *prompt = NULL; */
        gchar *prompt = NULL;
        switch (error->code) {
@@ -1106,16 +1117,32 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
                                __FUNCTION__, error->domain, error->code, error->message);
                        prompt = NULL;
                        break;
+                       
                case TNY_ACCOUNT_ERROR_TRY_CONNECT_HOST_LOOKUP_FAILED:
+                       /* TODO: Show the appropriate message, depending on whether it's POP or IMAP: */
                        g_debug ("%s: Handling GError domain=%d, code=%d (lookup failed), message=%s", 
                                __FUNCTION__, error->domain, error->code, error->message);
-                       prompt = g_strdup (_("emev_ni_ui_pop3_msg_connect_error"));
+                               
+                       switch (proto) {
+                               case MODEST_PROTOCOL_STORE_POP:
+                                       prompt = g_strdup_printf (_("emev_ni_ui_pop3_msg_connect_error"), server_name);
+                                       break;
+                               case MODEST_PROTOCOL_STORE_IMAP:
+                                       prompt = g_strdup_printf (_("emev_ni_ui_imap_connect_server_error"), server_name);
+                                       break;
+                               case MODEST_PROTOCOL_TRANSPORT_SMTP:
+                               default: /* Arbitrary default. */
+                                       prompt = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name);
+                                       break;
+                       }
+       
                        /*
                        prompt = g_strdup_printf(
                                _("Incorrect Account Settings:\n Host lookup failed.%s"), 
                                error->message);
                        */
                        break;
+                       
                case TNY_ACCOUNT_ERROR_TRY_CONNECT_AUTHENTICATION_NOT_SUPPORTED:
                        g_debug ("%s: Handling GError domain=%d, code=%d (authentication not supported), message=%s", 
                                __FUNCTION__, error->domain, error->code, error->message);
@@ -1124,6 +1151,7 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
                                _("Incorrect Account Settings:\nThe secure authentication method is not supported.\n%s"), 
                                error->message);
                        break;
+                       
                case TNY_ACCOUNT_ERROR_TRY_CONNECT_CERTIFICATE:
                        g_debug ("%s: Handling GError domain=%d, code=%d (certificatae), message=%s", 
                                __FUNCTION__, error->domain, error->code, error->message);
@@ -1154,43 +1182,10 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
                                _("Incorrect Account Settings"), 
                                error->message);
                                
-                       /* TODO: If we can ever determine that the problem is a wrong password:
-                        * In this case, the UI spec wants us to show a banner, and then 
-                        * open the Account Settings dialog. */
-                       /* Note: Sometimes, the get_password() function seems to be called again 
-                        * when a password is wrong, but sometimes this alert_func is called. */
-                       #if 0
-                       GtkWidget *parent_widget = 
-                               GTK_WIDGET (
-                                       modest_window_mgr_get_main_window (
-                                               modest_runtime_get_window_mgr ()));
-                       
-                       hildon_banner_show_information (
-                               parent_widget,
-                               NULL /* icon name */,
-                               _("mcen_ib_username_pw_incorrect") );
-                               
-                       /* Show the Account Settings window: */
-                       ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new ();
-                       /* TODO: Get the account somehow. Maybe tinymail should send it with the signal. */
-                       const gchar* modest_account_name = 
-                               modest_tny_account_get_parent_modest_account_name_for_server_account (account);
-                       g_assert (modest_account_name);
-                       modest_account_settings_dialog_set_account_name (dialog, 
-                               modest_account_name);
-                       
-                       gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self));
-                       gtk_dialog_run (GTK_DIALOG (dialog));
-                       gtk_widget_destroy (GTK_WIDGET (dialog));
-                       #endif
+                       /* Note: If the password was wrong then get_password() would be called again,
+                        * instead of this vfunc being called. */
                         
                        break;
-                       
-               //TODO: We have started receiving errors of 
-               //domain=TNY_ACCOUNT_ERROR, code=TNY_ACCOUNT_ERROR_TRY_CONNECT, message="Canceled".
-               //If this is really a result of us cancelling our own operation then 
-               //a) this probably shouldn't be an error, and
-               //b) should have its own error code.
                
                default:
                        g_warning ("%s: Unhandled GError code: %d, message=%s",