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

* src/modest-ui-actions.c:
        (modest_ui_actions_on_password_requested): Make sure that the remember
        output parameter is always TRUE.

pmo-trunk-r1940

diff --git a/ChangeLog2 b/ChangeLog2
index 1a30c15..825e318 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,11 @@
 2007-05-21  Murray Cumming  <murrayc@murrayc.com>
 
+       * src/modest-ui-actions.c:
+       (modest_ui_actions_on_password_requested): Make sure that the remember 
+       output parameter is always TRUE.
+
+2007-05-21  Murray Cumming  <murrayc@murrayc.com>
+
        * src/modest-tny-account-store.c: (modest_tny_account_store_alert):
        Show a OK/Cancel dialog if the error is a question, though we still do not 
        know anything more about what we are asking the user.

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index ce95798..9e1db5f 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -279,6 +279,10 @@ get_account_store_for_account (TnyAccount *account)
 static gchar*
 get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel)
 {
+       /* Initialize the output parameter: */
+       if (cancel)
+         *cancel = FALSE;
+         
        const gchar *key;
        const TnyAccountStore *account_store;
        ModestTnyAccountStore *self;
@@ -355,6 +359,7 @@ get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel)
 static void
 forget_password (TnyAccount *account)
 {
+       printf ("DEBUG: %s\n", __FUNCTION__);
        ModestTnyAccountStore *self;
        ModestTnyAccountStorePrivate *priv;
        const TnyAccountStore *account_store;

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index bd90389..68481d1 100644 (file)
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -178,14 +178,14 @@ modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr,
               
        /* mbox and maildir accounts use a URI instead of the rest: */
        if (account_data->uri)  {
-               printf("DEBUG: %s: Using URI=%s\n", __FUNCTION__, account_data->uri);
+               /* printf("DEBUG: %s: Using URI=%s\n", __FUNCTION__, account_data->uri); */
                tny_account_set_url_string (TNY_ACCOUNT(tny_account), account_data->uri);
        }
        else {
                /* Set camel-specific options: */
                
                /* Enable secure connection settings: */
-               printf("DEBUG: %s: security=%d\n", __FUNCTION__, account_data->security);
+               /* printf("DEBUG: %s: security=%d\n", __FUNCTION__, account_data->security); */
                const gchar* option_security = NULL;
                switch (account_data->security) {
                case MODEST_PROTOCOL_CONNECTION_NORMAL:
@@ -207,7 +207,7 @@ modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr,
                                                      option_security);
                
                /* Secure authentication: */
-               printf("DEBUG: %s: secure-auth=%d\n", __FUNCTION__, account_data->secure_auth);
+               /* printf("DEBUG: %s: secure-auth=%d\n", __FUNCTION__, account_data->secure_auth); */
                const gchar* auth_mech_name = NULL;
                switch (account_data->secure_auth) {
                case MODEST_PROTOCOL_AUTH_NONE:

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 8b9de02..3445e47 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -1687,6 +1687,13 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
        g_return_if_fail(server_account_name);
        /* printf("DEBUG: %s: server_account_name=%s\n", __FUNCTION__, server_account_name); */
        
+       /* Initalize output parameters: */
+       if (cancel)
+               *cancel = FALSE;
+               
+       if (remember)
+               *remember = TRUE;
+               
 #ifdef MODEST_PLATFORM_MAEMO
        /* Maemo uses a different (awkward) button order,
         * It should probably just use gtk_alternative_dialog_button_order ().
@@ -1842,6 +1849,8 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
 */
 
        gtk_widget_destroy (dialog);
+       
+       printf ("DEBUG: %s: cancel=%d\n", __FUNCTION__, *cancel);
 }
 
 void