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

* src/modest-tny-account-store.c:
        (modest_tny_account_store_alert): Adapt to the changed tinymail API,
        using a GError instead of a string message, so we can translate it in
        Modest.

pmo-trunk-r1782

diff --git a/ChangeLog2 b/ChangeLog2
index fea1b1a..c619606 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,13 @@
 2007-05-08  Murray Cumming  <murrayc@murrayc.com>
 
+       * src/modest-tny-account-store.c:
+       (modest_tny_account_store_alert): Adapt to the changed tinymail API, 
+       using a GError instead of a string message, so we can translate it in 
+       Modest.
+
+
+2007-05-08  Murray Cumming  <murrayc@murrayc.com>
+
        * src/maemo/modest-address-book.c:
        (modest_address_book_check_names):
        * src/maemo/modest-msg-view-window.c:

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 3d70bb0..e8fd54d 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -33,6 +33,7 @@
 #include <tny-account.h>
 #include <tny-account-store.h>
 #include <tny-store-account.h>
+#include <tny-error.h>
 #include <tny-transport-account.h>
 #include <tny-simple-list.h>
 #include <tny-account-store.h>
@@ -255,6 +256,8 @@ get_account_store_for_account (TnyAccount *account)
 static gchar*
 get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel)
 {
+       /* printf("DEBUG: %s\n", __FUNCTION__); */
+       
        const gchar *key;
        const TnyAccountStore *account_store;
        ModestTnyAccountStore *self;
@@ -313,6 +316,8 @@ get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel)
        } else
                *cancel = FALSE;
  
+    /* printf("  DEBUG: %s: returning %s\n", __FUNCTION__, pwd); */
+       
        return pwd;
 }
 
@@ -602,8 +607,12 @@ modest_tny_account_store_find_account_by_url (TnyAccountStore *self, const gchar
 
 static gboolean
 modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
-                               const gchar *prompt)
+                               const GError *error)
 {
+       g_return_val_if_fail (error, FALSE);
+       
+       printf("DEBUG: %s: error->message=%s\n", __FUNCTION__, error->message);
+       
        GtkMessageType gtktype;
        gboolean retval = FALSE;
        GtkWidget *dialog;
@@ -621,6 +630,22 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
                gtktype = GTK_MESSAGE_ERROR;
                break;
        }
+       
+       const gchar *prompt = NULL;
+       switch (error->code)
+       {
+               case TNY_ACCOUNT_ERROR_TRY_CONNECT:
+                       /* Use a Logical ID: */
+                       prompt = _("Modest account not yet fully configured");
+                       break;
+               default:
+                       g_warning ("%s: Unhandled GError code.", __FUNCTION__);
+                       prompt = NULL;
+               break;
+       }
+       
+       if (!prompt)
+               return FALSE;
 
        dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
                gtktype, GTK_BUTTONS_YES_NO, prompt);

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 57d01be..56eb343 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -1656,6 +1656,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
                                         gboolean *remember,
                                         ModestMainWindow *main_window)
 {
+       /* printf("DEBUG: %s\n", __FUNCTION__); */
        gchar *txt;
        GtkWidget *dialog, *entry, *remember_pass_check;