2008-01-23 [paul] 3.2.0cvs64

	* src/prefs_folder_item.c
		fix bug 1485, 'selecting a folder's default
		account if name contains '&''

diff --git a/ChangeLog b/ChangeLog
index 2cf4a736b3bfb3ad6bf084056b04b55314a04667..0de91d437e89eb54d3b1a4a3775f66d569c44562 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-23 [paul]      3.2.0cvs64
+
+       * src/prefs_folder_item.c
+               fix bug 1485, 'selecting a folder's default
+               account if name contains '&''
+
 2008-01-23 [colin]     3.2.0cvs63
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index 548c664a15cc5faf0188c0e60489c74450bcee2a..f0daee013704a6c7aa3f317a23d98542be969beb 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3200,3 +3200,4 @@
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 doc/man/claws-mail.1;  ) > 3.2.0cvs61.patchset
 ( cvs diff -u -r 1.61.2.77 -r 1.61.2.78 src/account.c;  cvs diff -u -r 1.11.2.9 -r 1.11.2.10 src/account.h;  cvs diff -u -r 1.382.2.432 -r 1.382.2.433 src/compose.c;  cvs diff -u -r 1.94.2.168 -r 1.94.2.169 src/messageview.c;  cvs diff -u -r 1.395.2.352 -r 1.395.2.353 src/summaryview.c;  cvs diff -u -r 1.36.2.132 -r 1.36.2.133 src/common/utils.c;  cvs diff -u -r 1.20.2.58 -r 1.20.2.59 src/common/utils.h;  ) > 3.2.0cvs62.patchset
 ( cvs diff -u -r 1.213.2.175 -r 1.213.2.176 src/folder.c;  cvs diff -u -r 1.87.2.52 -r 1.87.2.53 src/folder.h;  cvs diff -u -r 1.115.2.182 -r 1.115.2.183 src/main.c;  cvs diff -u -r 1.274.2.230 -r 1.274.2.231 src/mainwindow.c;  ) > 3.2.0cvs63.patchset
+( cvs diff -u -r 1.52.2.55 -r 1.52.2.56 src/prefs_folder_item.c;  ) > 3.2.0cvs64.patchset

diff --git a/configure.ac b/configure.ac
index 7753629f05f618314671825a522219709db5dc42..7abe7cfb9098d0accd4d832b826a7fa4b919a3d3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=63
+EXTRA_VERSION=64
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 4d1205277d2f7020e9a590bdd94529eb9be2d659..ed7823bfaf67b14ea2362cec1642f0138824f04d 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -890,7 +890,7 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
                if (item->folder->klass->type != F_NEWS && ac_prefs->protocol == A_NNTP)
                        continue;
 
-               COMBOBOX_ADD (optmenu_default_account_menu,
+               COMBOBOX_ADD_ESCAPED (optmenu_default_account_menu,
                                        ac_prefs->account_name?ac_prefs->account_name : _("Untitled"),
                                        ac_prefs->account_id);