2005-03-30 [colin] 1.9.6cvs15

	* src/imap.c
		Fix handling of imap folders containing [] in
		their name. Thanks to Nahuel Angelinetti for
		the detailed bugreport.

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 1823b06e27145d2f7d06765a186306061cd9006d..f0884e94083095becbf3470561c0352d1b16f2cf 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2005-03-30 [colin]     1.9.6cvs15
+
+       * src/imap.c
+               Fix handling of imap folders containing [] in 
+               their name. Thanks to Nahuel Angelinetti for
+               the detailed bugreport.
+
 2005-03-30 [colin]     1.9.6cvs14
 
        * src/common/utils.h

diff --git a/PATCHSETS b/PATCHSETS
index 3923bbf547d1f32abec31aa47c4df4e29471cefc..632d769e19301f8b503599ad69379b7e6c4a2f4c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -431,3 +431,4 @@
 ( cvs diff -u -r 1.12.2.20 -r 1.12.2.21 src/action.c; cvs diff -u -r 1.5.10.7 -r 1.5.10.8 src/addrgather.c; cvs diff -u -r 1.6.10.4 -r 1.6.10.5 src/addrharvest.c; cvs diff -u -r 1.2.4.5 -r 1.2.4.6 src/browseldap.c; cvs diff -u -r 1.382.2.114 -r 1.382.2.115 src/compose.c; cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/exphtmldlg.c; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/expldifdlg.c; cvs diff -u -r 1.12.2.6 -r 1.12.2.7 src/html.c; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 src/html.h; cvs diff -u -r 1.4.12.4 -r 1.4.12.5 src/importmutt.c; cvs diff -u -r 1.1.14.4 -r 1.1.14.5 src/importpine.c; cvs diff -u -r 1.115.2.30 -r 1.115.2.31 src/main.c; cvs diff -u -r 1.274.2.32 -r 1.274.2.33 src/mainwindow.c; cvs diff -u -r 1.94.2.48 -r 1.94.2.49 src/messageview.c; cvs diff -u -r 1.204.2.33 -r 1.204.2.34 src/prefs_common.c; cvs diff -u -r 1.103.2.13 -r 1.103.2.14 src/prefs_common.h; cvs diff -u -r 1.47.2.17 -r 1.47.2.18 src/procheader.c; cvs diff -u -r 1.395.2.61 -r 1.395.2.62 src/summaryview.c; cvs diff -u -r 1.68.2.6 -r 1.68.2.7 src/summaryview.h; cvs diff -u -r 1.96.2.50 -r 1.96.2.51 src/textview.c; cvs diff -u -r 1.36.2.26 -r 1.36.2.27 src/common/utils.c; cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.8 -r 1.4.2.9 src/gtk/gtkutils.h; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpmime/passphrase.c; ) > 1.9.6cvs12.patchset
 ( cvs diff -u -r 1.13.2.10 -r 1.13.2.11 src/common/socket.c; ) > 1.9.6cvs13.patchset
 ( cvs diff -u -r 1.20.2.14 -r 1.20.2.15 src/common/utils.h; cvs diff -u -r 1.36.2.27 -r 1.36.2.28 src/common/utils.c; cvs diff -u -r 1.9.2.10 -r 1.9.2.11 src/common/defs.h; cvs diff -u -r 1.75.2.5 -r 1.75.2.6 src/matcher.c; cvs diff -u -r 1.16.2.15 -r 1.16.2.16 src/msgcache.c; cvs diff -u -r 1.101.2.9 -r 1.101.2.10 src/news.c; cvs diff -u -r 1.150.2.21 -r 1.150.2.22 src/procmsg.c; cvs diff -u -r 1.60.2.10 -r 1.60.2.11 src/procmsg.h; cvs diff -u -r 1.22.2.7 -r 1.22.2.8 src/quote_fmt_parse.y; cvs diff -u -r 1.395.2.62 -r 1.395.2.63 src/summaryview.c; ) > 1.9.6cvs14.patchset
+( cvs diff -u -r 1.179.2.16 -r 1.179.2.17 src/imap.c; ) > 1.9.6cvs15.patchset

diff --git a/configure.ac b/configure.ac
index a4c29545c79ade5bd1e9954067d916bcacde3152..ec295df0338e49416b48ec27d0dea508389a172c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/imap.c b/src/imap.c
index 70b82ced8d6b985428168657002ae3c70960b780..dcd06ce907add7dbd3991d45f85e387b52cc6e52 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -137,7 +137,7 @@ typedef enum
 
 #define QUOTE_IF_REQUIRED(out, str)                            \
 {                                                              \
-       if (*str != '"' && strpbrk(str, " \t(){}%*") != NULL) { \
+       if (*str != '"' && strpbrk(str, " \t(){}[]%*") != NULL) {       \
                gchar *__tmp;                                   \
                gint len;                                       \
                                                                \