projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
imap
/
util.c
diff --git
a/imap/util.c
b/imap/util.c
index
e60cd8c
..
fa54de6
100644
(file)
--- a/
imap/util.c
+++ b/
imap/util.c
@@
-99,7
+99,7
@@
int imap_parse_path (const char *path, IMAP_MBOX * mx)
url_parse_ciss (&url, c);
if (!(url.scheme == U_IMAP || url.scheme == U_IMAPS) ||
url_parse_ciss (&url, c);
if (!(url.scheme == U_IMAP || url.scheme == U_IMAPS) ||
- mutt_account_fromurl (&mx->account, &url) < 0) {
+ mutt_account_fromurl (&mx->account, &url) < 0
|| !*mx->account.host
) {
mem_free (&c);
return -1;
}
mem_free (&c);
return -1;
}
@@
-516,9
+516,11
@@
int imap_wait_keepalive (pid_t pid)
int rc;
short imap_passive = option (OPTIMAPPASSIVE);
int rc;
short imap_passive = option (OPTIMAPPASSIVE);
+ int imap_askreconnect = quadoption (OPT_IMAPRECONNECT);
set_option (OPTIMAPPASSIVE);
set_option (OPTKEEPQUIET);
set_option (OPTIMAPPASSIVE);
set_option (OPTKEEPQUIET);
+ set_quadoption (OPT_IMAPRECONNECT, M_NO);
sigprocmask (SIG_SETMASK, NULL, &oldmask);
sigprocmask (SIG_SETMASK, NULL, &oldmask);
@@
-547,6
+549,7
@@
int imap_wait_keepalive (pid_t pid)
unset_option (OPTKEEPQUIET);
if (!imap_passive)
unset_option (OPTIMAPPASSIVE);
unset_option (OPTKEEPQUIET);
if (!imap_passive)
unset_option (OPTIMAPPASSIVE);
+ set_quadoption (OPT_IMAPRECONNECT, imap_askreconnect);
return rc;
}
return rc;
}