* src/widgets/modest-msg-view.c:

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

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 8211b78..bf01e38 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -688,6 +688,9 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
                         * but we need to tell tinymail about the username too: */
                        tny_account_set_user (account, username);
                        
+                       /* Do not save the password in gconf, 
+                        * because the UI spec says "The password will never be saved in the account": */
+                       /*
                        if (remember) {
                                printf ("%s: Storing username=%s, password=%s\n", 
                                        __FUNCTION__, username, pwd);
@@ -696,6 +699,8 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
                                modest_server_account_set_password (priv->account_mgr, server_account_name,
                                                               pwd);
                        }
+                       */
+
                        /* We need to dup the string even knowing that
                           it's already a dup of the contents of an
                           entry, because it if it's wrong, then camel
@@ -1331,48 +1336,31 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAccount *account, TnyA
        if (!prompt)
                return FALSE;
 
-#ifdef MODEST_PLATFORM_MAEMO
-       /* The Tinymail documentation says that we should show Yes and No buttons, 
-        * when it is a question.
-        * Obviously, we need tinymail to use more specific error codes instead,
-        * so we know what buttons to show. */
-        GtkWidget *dialog = NULL;
-        if (question) {
-               dialog = GTK_WIDGET (hildon_note_new_confirmation (NULL, 
+       ModestWindow *main_window = 
+               modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
+       gboolean retval = TRUE;
+       if (question) {
+               /* The Tinymail documentation says that we should show Yes and No buttons, 
+                * when it is a question.
+                * Obviously, we need tinymail to use more specific error codes instead,
+                * so we know what buttons to show. */
+        
+               /* TODO: Do this in the main context: */
+               GtkWidget *dialog = GTK_WIDGET (hildon_note_new_confirmation (GTK_WINDOW (main_window), 
                        prompt));
+               const int response = gtk_dialog_run (GTK_DIALOG (dialog));
+               if (question) {
+                       retval = (response == GTK_RESPONSE_YES) ||
+                                        (response == GTK_RESPONSE_OK);
+               }
+       
+               gtk_widget_destroy (dialog);
+       
         } else {
-               dialog = GTK_WIDGET (hildon_note_new_information (NULL, 
-                       prompt));
+               /* Just show the error text and use the default response: */
+               modest_maemo_show_information_note_in_main_context_and_forget (GTK_WINDOW (main_window), 
+                       prompt);
         }
-#else
-
-       GtkMessageType gtktype = GTK_MESSAGE_ERROR;
-       switch (type)
-       {
-               case TNY_ALERT_TYPE_INFO:
-               gtktype = GTK_MESSAGE_INFO;
-               break;
-               case TNY_ALERT_TYPE_WARNING:
-               gtktype = GTK_MESSAGE_WARNING;
-               break;
-               case TNY_ALERT_TYPE_ERROR:
-               default:
-               gtktype = GTK_MESSAGE_ERROR;
-               break;
-       }
-       
-       GtkWidget *dialog = gtk_message_dialog_new (NULL, 0,
-               gtktype, GTK_BUTTONS_YES_NO, prompt);
-#endif /* #ifdef MODEST_PLATFORM_MAEMO */
-
-       gboolean retval = TRUE;
-       const int response = gtk_dialog_run (GTK_DIALOG (dialog));
-       if (question) {
-               retval = (response == GTK_RESPONSE_YES) ||
-                                (response == GTK_RESPONSE_OK);
-       }
-
-       gtk_widget_destroy (dialog);
        
        /* TODO: Don't free this when we no longer strdup the message for testers. */
        g_free (prompt);