X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fmx_imap.c;h=2675dff39a2111fe159696b4efe89889b33d7b69;hb=820b351118c174e9a5413a42ffbe778d837aecb5;hp=cd6d71b76a43e20b5809b4f07c70ca8b43ea9ee8;hpb=ce220f6dc8789ed75468c63adce953fbdfed11a8;p=apps%2Fmadmutt.git

diff --git a/imap/mx_imap.c b/imap/mx_imap.c
index cd6d71b..2675dff 100644
--- a/imap/mx_imap.c
+++ b/imap/mx_imap.c
@@ -24,8 +24,6 @@ int imap_is_magic (const char* path, struct stat* st) {
   url_scheme_t s;
   if (!path || !*path)
     return (-1);
-  if (*path == '{')     /* painpine compatibility */
-    return (M_IMAP);
   s = url_check_scheme (NONULL (path));
   return ((s == U_IMAP || s == U_IMAPS) ? M_IMAP : -1);
 }
@@ -46,6 +44,12 @@ static int imap_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr)
   return 0;
 }
 
+/* this ugly kludge is required since the last int to
+ * imap_check_mailbox() doesn't mean 'lock' but 'force'... */
+static int _imap_check_mailbox (CONTEXT* ctx, int* index_hint, int lock) {
+  return (imap_check_mailbox (ctx, index_hint, 0));
+}
+
 mx_t* imap_reg_mx (void) {
   mx_t* fmt = safe_calloc (1, sizeof (mx_t));
 
@@ -58,5 +62,6 @@ mx_t* imap_reg_mx (void) {
   fmt->mx_acl_check = acl_check_imap;
   fmt->mx_fastclose_mailbox = imap_close_mailbox;
   fmt->mx_sync_mailbox = imap_sync_mailbox;
+  fmt->mx_check_mailbox = _imap_check_mailbox;
   return (fmt);
 }