Rocco Rutte:

- fix "Bad mailbox name" for IMAP which re-appeared (noted by Thorsten Gunkel)

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@584 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/VERSION.svn b/VERSION.svn
index ecb9d0c..af368af 100644 (file)
--- a/VERSION.svn
+++ b/VERSION.svn
@@ -1 +1 @@
-581
+584

diff --git a/do-commit.sh b/do-commit.sh
index d36aa33..1376de8 100755 (executable)
--- a/do-commit.sh
+++ b/do-commit.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 svn update
 #!/bin/sh
 svn update

-echo "`svn info | awk -F': ' '/^Revision: / {print $2}'`+1" | bc > ./trunk/VERSION.svn
+echo "`svn info | awk -F': ' '/^Revision: / {print $2}'`+1" | bc > ./VERSION.svn

 svn commit "$@"
 svn commit "$@"

diff --git a/imap/imap.c b/imap/imap.c
index 9a2234f..db9901a 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -1444,7 +1444,7 @@ int imap_subscribe (char *path, int subscribe)
   BUFFER err, token;
   IMAP_MBOX mx;
 
   BUFFER err, token;
   IMAP_MBOX mx;
 

-  if (mx_get_magic (path) == M_IMAP || imap_parse_path (path, &mx)) {
+  if (mx_get_magic (path) != M_IMAP || imap_parse_path (path, &mx) < 0) {

     mutt_error (_("Bad mailbox name"));
     return -1;
   }
     mutt_error (_("Bad mailbox name"));
     return -1;
   }