2006-03-12 [paul] 2.0.0cvs133

	* src/compose.c
		fix Bug 924, 'Account combo box shows up wrong
		if & is in account name'

diff --git a/ChangeLog b/ChangeLog
index f19d0e91d482d541a596171182c7f8897a9eb1b3..4cfff33b46137d03be720b4daf7e07dddd67c17c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-12 [paul]      2.0.0cvs133
+
+       * src/compose.c
+               fix Bug 924, 'Account combo box shows up wrong 
+               if & is in account name'
+
 2006-03-11 [colin]     2.0.0cvs132
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index 003ee7a50f6cd3417b8ea146bdba03b4bcca3596..09f9cc7b5907ec1d28d85f5388ea69b3f4a122a3 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1317,3 +1317,4 @@
 ( cvs diff -u -r 1.18.2.30 -r 1.18.2.31 src/plugins/spamassassin/spamassassin.c;  cvs diff -u -r 1.4.2.10 -r 1.4.2.11 src/plugins/spamassassin/spamassassin.h;  cvs diff -u -r 1.23.2.23 -r 1.23.2.24 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 2.0.0cvs130.patchset
 ( cvs diff -u -r 1.23.2.24 -r 1.23.2.25 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 2.0.0cvs131.patchset
 ( cvs diff -u -r 1.395.2.180 -r 1.395.2.181 src/summaryview.c;  ) > 2.0.0cvs132.patchset
+( cvs diff -u -r 1.382.2.249 -r 1.382.2.250 src/compose.c;  ) > 2.0.0cvs133.patchset

diff --git a/configure.ac b/configure.ac
index 9452d2f875cd777e02b841a57a145ae0c39f8fe6..d2b797de9b86b01032e6fc5297afe85f1a6e6c67 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=132
+EXTRA_VERSION=133
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index a886318ceaa0f761ca567d78b2edf54781a5389d..c3d6833bfff0e20c8f41fe1fa6a73fbff65ba033 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -5834,11 +5834,11 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
                if (ac == compose->account) def_menu = num;
 
                if (ac->name)
-                       name = g_strdup_printf("<i>%s</i> : %s &lt;<b>%s</b>&gt;",
+                       name = g_markup_printf_escaped("<i>%s</i> : %s &lt;<b>%s</b>&gt;",
                                               ac->account_name,
                                               ac->name, ac->address);
                else
-                       name = g_strdup_printf("<i>%s</i> : &lt;<b>%s</b>&gt;",
+                       name = g_markup_printf_escaped("<i>%s</i> : &lt;<b>%s</b>&gt;",
                                               ac->account_name, ac->address);
                MENUITEM_ADD(menu, menuitem, name, ac->account_id);
                gtk_label_set_use_markup (