2007-06-08 Murray Cumming <murrayc@murrayc.com>

* src/modest-tny-account-store.c: (modest_tny_account_store_alert):
Improve the error dialog to show Incorrect Account Settings, which seems
clearer, and say that the internal error message (to be removed from the
dialog later) is often misleading.
I have confirmed that projects.maemo.org bug NB#58543 is no longer a problem.

* src/modest-tny-account.c:
(modest_tny_account_new_from_server_account): Uncomment the printf of the
URL because this is so useful for debugging on the device.

* src/widgets/modest-serversecurity-combo-box.c:
(modest_serversecurity_combo_box_fill): Correct a logical ID

pmo-trunk-r2127

diff --git a/ChangeLog2 b/ChangeLog2
index 5c66468..1898274 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,20 @@
 2007-06-08  Murray Cumming  <murrayc@murrayc.com>
 
 2007-06-08  Murray Cumming  <murrayc@murrayc.com>
 

+       * src/modest-tny-account-store.c: (modest_tny_account_store_alert):
+       Improve the error dialog to show Incorrect Account Settings, which seems 
+       clearer, and say that the internal error message (to be removed from the 
+       dialog later) is often misleading.
+       I have confirmed that projects.maemo.org bug NB#58543 is no longer a problem.
+       
+       * src/modest-tny-account.c:
+       (modest_tny_account_new_from_server_account): Uncomment the printf of the 
+       URL because this is so useful for debugging on the device.
+       
+       * src/widgets/modest-serversecurity-combo-box.c:
+       (modest_serversecurity_combo_box_fill): Correct a logical ID.
+
+2007-06-08  Murray Cumming  <murrayc@murrayc.com>
+

        * src/modest-mail-operation.c:
        (modest_mail_operation_send_new_mail):
        Added a comment about a nasty but apparently harmless message. Details 
        * src/modest-mail-operation.c:
        (modest_mail_operation_send_new_mail):
        Added a comment about a nasty but apparently harmless message. Details 

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index a41cf72..1dc8cef 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -923,6 +923,8 @@ static gboolean
 modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
                                gboolean question, const GError *error)
 {
 modest_tny_account_store_alert (TnyAccountStore *self, 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) 
        g_return_val_if_fail (error, FALSE);
 
        if ((error->domain != TNY_ACCOUNT_ERROR) 

@@ -942,7 +944,10 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
                /* The tinymail camel implementation just sends us this for almost 
                 * everything, so we have to guess at the cause.
                 * It could be a wrong password, or inability to resolve a hostname, 
                /* The tinymail camel implementation just sends us this for almost 
                 * everything, so we have to guess at the cause.
                 * It could be a wrong password, or inability to resolve a hostname, 

-                * or lack of network, or something entirely different: */
+                * or lack of network, or incorrect authentication method, or something entirely different: */
+               /* TODO: Fix camel to provide specific error codes, and then use the 
+                * specific dialog messages from Chapter 12 of the UI spec.
+                */

                case TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT: 
                    g_debug ("%s: Handling GError domain=%d, code=%d, message=%s", 
                                __FUNCTION__, error->domain, error->code, error->message);
                case TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT: 
                    g_debug ("%s: Handling GError domain=%d, code=%d, message=%s", 
                                __FUNCTION__, error->domain, error->code, error->message);

@@ -950,7 +955,9 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
                        /* TODO: Remove the internal error message for the real release.
                         * This is just so the testers can give us more information: */
                        /* prompt = _("Modest account not yet fully configured."); */
                        /* TODO: Remove the internal error message for the real release.
                         * This is just so the testers can give us more information: */
                        /* prompt = _("Modest account not yet fully configured."); */

-                       prompt = g_strdup_printf(_("Modest account not yet fully configured. Error=%s"), 
+                       prompt = g_strdup_printf(
+                               "%s\n (Internal error message, often very misleading:\n%s", 
+                               _("Incorrect Account Settings"), 

                                error->message);
                                
                        /* TODO: If we can ever determine that the problem is a wrong password:
                                error->message);
                                
                        /* TODO: If we can ever determine that the problem is a wrong password:

@@ -986,7 +993,7 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
                        break;
                        
                //TODO: We have started receiving errors of 
                        break;
                        
                //TODO: We have started receiving errors of 

-               //domain=TNY_ACCOUNT_ERROR, code=TNY_ACCOUNT_ERROR_TRY_CONNECT, messagae="Canceled".
+               //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.
                //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.

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index 5cd4ee3..6716c72 100644 (file)
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -319,9 +319,10 @@ modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr,
                        tny_account_set_port (tny_account, account_data->port);
        }
 
                        tny_account_set_port (tny_account, account_data->port);
        }
 

-       /* FIXME: for debugging */
+       /* FIXME: for debugging. 
+        * Let's keep this because it is very useful for debugging. */

        url = tny_account_get_url_string (TNY_ACCOUNT(tny_account));
        url = tny_account_get_url_string (TNY_ACCOUNT(tny_account));

-/*     g_message ("modest: %s:\n  account-url: %s", __FUNCTION__, url); */
+       printf ("DEBUG %s:\n  account-url: %s\n", __FUNCTION__, url);

        g_free (url);
        /***********************/
        
        g_free (url);
        /***********************/
        

diff --git a/src/widgets/modest-serversecurity-combo-box.c b/src/widgets/modest-serversecurity-combo-box.c
index 0df836d..fda07d9 100644 (file)
--- a/src/widgets/modest-serversecurity-combo-box.c
+++ b/src/widgets/modest-serversecurity-combo-box.c
@@ -173,7 +173,7 @@ void modest_serversecurity_combo_box_fill (ModestServersecurityComboBox *combobo
                gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_CONNECTION_SSL, MODEL_COL_NAME, _("mcen_fi_advsetup_other_security_securepop3s"), -1);
        } else if(protocol == MODEST_PROTOCOL_STORE_IMAP) {
                gtk_list_store_append (liststore, &iter);
                gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_CONNECTION_SSL, MODEL_COL_NAME, _("mcen_fi_advsetup_other_security_securepop3s"), -1);
        } else if(protocol == MODEST_PROTOCOL_STORE_IMAP) {
                gtk_list_store_append (liststore, &iter);

-               gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_CONNECTION_SSL, MODEL_COL_NAME, _("mcen_fi_advsetup_other_security_secureimap4"), -1);
+               gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_CONNECTION_SSL, MODEL_COL_NAME, _("mcen_fi_advsetup_other_security_secureimap4s"), -1);

        } else if(protocol == MODEST_PROTOCOL_TRANSPORT_SMTP) {
                gtk_list_store_append (liststore, &iter);
                gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_CONNECTION_SSL, MODEL_COL_NAME, _("mcen_fi_advsetup_other_security_ssl"), -1);
        } else if(protocol == MODEST_PROTOCOL_TRANSPORT_SMTP) {
                gtk_list_store_append (liststore, &iter);
                gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOL_CONNECTION_SSL, MODEL_COL_NAME, _("mcen_fi_advsetup_other_security_ssl"), -1);