diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2021-10-17 11:16:40 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2021-10-17 11:16:40 -0600 |
| commit | c3cfdbf77188f1a63888dc4c92c60a6f6259d91b (patch) | |
| tree | 0237567945ca8241a6aa292ea769b3730380bfdd | |
| parent | 9b2bd07cf27037177bb76d699cd29c03b6b6c20c (diff) | |
| download | alpine-c3cfdbf77188f1a63888dc4c92c60a6f6259d91b.tar.xz | |
* Exiting the authroization screen for XOAUTH2 makes alpine cancel the
authentication, so update the variable user_says_cancel to reflect this.
| -rw-r--r-- | alpine/imap.c | 7 | ||||
| -rw-r--r-- | pith/pine.hlp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/alpine/imap.c b/alpine/imap.c index 5b2a1f74..a6a54dec 100644 --- a/alpine/imap.c +++ b/alpine/imap.c @@ -149,7 +149,7 @@ cache_method_message(STORE_S *in_store) } else{ q_status_message(SM_ORDER | SM_DING, 3, 3, _("Create a password file in order to save the login information")); - so_puts(in_store, _("</P><P> Although your version if Alpine was compiled with password file support, this has not been set up yet. ")); + so_puts(in_store, _("</P><P> Although your version of Alpine was compiled with password file support, this has not been set up yet. ")); so_puts(in_store, _("as a result, the next time you open this folder, you will go through this process once again.\n\n")); } #else @@ -179,7 +179,7 @@ cache_method_message_no_screen (void) } else{ snprintf(tmp_20k_buf+strlen(tmp_20k_buf), SIZEOF_20KBUF-strlen(tmp_20k_buf), "%s", - _(" Although your version if Alpine was compiled with password file support, this has not been set up yet. ")); + _(" Although your version of Alpine was compiled with password file support, this has not been set up yet. ")); tmp_20k_buf[SIZEOF_20KBUF-1] = '\0'; snprintf(tmp_20k_buf+strlen(tmp_20k_buf), SIZEOF_20KBUF-strlen(tmp_20k_buf), "%s", _("as a result, the next time you open this folder, you will go through this process once again.\n\n")); @@ -442,7 +442,8 @@ oauth2_set_device_info(OAUTH2_S *oa2, char *method) sargs.aux_rv_value = (void *) &aux_rv_value; do { - scrolltool(&sargs); + if(scrolltool(&sargs) == MC_NO) + ps_global->user_says_cancel = 1; ps_global->mangled_screen = 1; ps_global->painted_body_on_startup = 0; ps_global->painted_footer_on_startup = 0; diff --git a/pith/pine.hlp b/pith/pine.hlp index 0ef97809..696722c5 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 603 2021-10-10 11:00:24 +Alpine Commit 604 2021-10-17 11:16:37 ============= h_news ================= <HTML> <HEAD> |