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

* src/modest-ui-actions.c:
(modest_ui_actions_on_password_requested):
Show mail_ib_login_cancelled info banner when the user cancels
the protected password dialog, to fix projects.maemo.org
bug NB#63617.

pmo-trunk-r2767

diff --git a/ChangeLog2 b/ChangeLog2
index 0dcfbee..9235a1c 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,13 @@
 2007-07-23  Murray Cumming  <murrayc@murrayc.com>
 
+       * src/modest-ui-actions.c:
+       (modest_ui_actions_on_password_requested):
+       Show mail_ib_login_cancelled info banner when the user cancels 
+       the protected password dialog, to fix projects.maemo.org 
+       bug NB#63617.
+
+2007-07-23  Murray Cumming  <murrayc@murrayc.com>
+
        * src/maemo/modest-account-settings-dialog.c:
        (create_page_outgoing): Put this page in a GtkScrolledWindow, 
        matching the UI mock-up in the UI spec, and allowing access 

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 9d6c944..31b85d8 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -49,6 +49,7 @@
 #ifdef MODEST_PLATFORM_MAEMO
 #include "maemo/modest-osso-state-saving.h"
 #include "maemo/modest-maemo-utils.h"
+#include "maemo/modest-hildon-includes.h"
 #endif /* MODEST_PLATFORM_MAEMO */
 
 #include "widgets/modest-ui-constants.h"
@@ -2439,6 +2440,27 @@ modest_ui_actions_on_move_folder_to_trash_folder (GtkAction *action, ModestMainW
        delete_folder (main_window, TRUE);
 }
 
+
+static void
+show_error (GtkWidget *parent_widget, const gchar* text)
+{
+       hildon_banner_show_information(parent_widget, NULL, text);
+       
+#if 0
+       GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_window, text)); */
+       /*
+         GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (parent_window,
+         (GtkDialogFlags)0,
+         GTK_MESSAGE_ERROR,
+         GTK_BUTTONS_OK,
+         text ));
+       */
+                
+       gtk_dialog_run (dialog);
+       gtk_widget_destroy (GTK_WIDGET (dialog));
+#endif
+}
+
 void
 modest_ui_actions_on_password_requested (TnyAccountStore *account_store, 
                                         const gchar* server_account_name,
@@ -2596,6 +2618,8 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
                        *cancel   = FALSE;
                        
        } else {
+               show_error(GTK_WIDGET (main_window), _("mail_ib_login_cancelled"));
+               
                if (username)
                        *username = NULL;