2006-04-07 [colin] 2.1.0cvs16

	* README
	* src/compose.c
	* src/prefs_common.c
	* src/prefs_common.h
		Add hidden compose_no_markup pref

diff --git a/ChangeLog b/ChangeLog
index 3056cee73fe54930b7c84eb3ddd15ec952c693ca..e8e4de355a87cf169c6bb7f636ceff03341bca16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-07 [colin]     2.1.0cvs16
+
+       * README
+       * src/compose.c
+       * src/prefs_common.c
+       * src/prefs_common.h
+               Add hidden compose_no_markup pref
+
 2006-04-07 [wwp]       2.1.0cvs15
 
        * src/summary_search.c

diff --git a/PATCHSETS b/PATCHSETS
index bd4a4675c5ec777d1fa23d0f2cc8bb5a4d732f58..ab68c4864dbe5ce5f365939330eb5abe7e274082 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1387,3 +1387,4 @@
 ( cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/plugins/dillo_viewer/dillo_prefs.c;  ) > 2.1.0cvs13.patchset
 ( cvs diff -u -r 1.3.12.14 -r 1.3.12.15 src/message_search.c;  cvs diff -u -r 1.15.2.27 -r 1.15.2.28 src/summary_search.c;  ) > 2.1.0cvs14.patchset
 ( cvs diff -u -r 1.15.2.28 -r 1.15.2.29 src/summary_search.c;  cvs diff -u -r 1.8.2.2 -r 1.8.2.3 .cvsignore;  ) > 2.1.0cvs15.patchset
+( cvs diff -u -r 1.8.2.9 -r 1.8.2.10 README;  cvs diff -u -r 1.382.2.259 -r 1.382.2.260 src/compose.c;  cvs diff -u -r 1.204.2.80 -r 1.204.2.81 src/prefs_common.c;  cvs diff -u -r 1.103.2.45 -r 1.103.2.46 src/prefs_common.h;  ) > 2.1.0cvs16.patchset

diff --git a/README b/README
index 400443144d9e82cdfbbe8292b2fd8aa20941da54..1ec39987867fb8c9083b9ca27627d7d5aae22a11 100644 (file)
--- a/README
+++ b/README
@@ -543,6 +543,10 @@ http://claws.sylpheed.org/plugins.php
        display a confirmation dialog on drag n drop of folders
        0: off  1: on
 
+    compose_no_markup          (default: 0)
+       prevents italic and bold in the Compose' From header
+       0: normal (markup) 1: no markup
+
 10. Tools
 --------- 
   You will find all of these tools in the 'tools' directory:

diff --git a/configure.ac b/configure.ac
index dbfe416cb60d0a1ece8060cc01b9cfbcf334fc16..ea8fea710a9f2c53b2c7078315f8aec261ceb617 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=15
+EXTRA_VERSION=16
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 1664ea498c1312fbe52a0abbbb3f87142b7bc86b..32c35802282cf622f49cab48fbdfc9b32ba3f477 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -5899,13 +5899,23 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
 
                if (ac == compose->account) def_menu = num;
 
-               if (ac->name)
-                       name = g_markup_printf_escaped("<i>%s</i> : %s &lt;<b>%s</b>&gt;",
-                                              ac->account_name,
-                                              ac->name, ac->address);
-               else
-                       name = g_markup_printf_escaped("<i>%s</i> : &lt;<b>%s</b>&gt;",
-                                              ac->account_name, ac->address);
+               if (prefs_common.compose_no_markup) {
+                       if (ac->name)
+                               name = g_markup_printf_escaped("%s : %s &lt;%s&gt;",
+                                                      ac->account_name,
+                                                      ac->name, ac->address);
+                       else
+                               name = g_markup_printf_escaped("%s : &lt;%s&gt;",
+                                                      ac->account_name, ac->address);
+               } else {
+                       if (ac->name)
+                               name = g_markup_printf_escaped("<i>%s</i> : %s &lt;<b>%s</b>&gt;",
+                                                      ac->account_name,
+                                                      ac->name, ac->address);
+                       else
+                               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 (
                                GTK_LABEL (gtk_bin_get_child (GTK_BIN (menuitem))),

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 15b4368fa5eb215bee22ff54bfb1dc6d9c87d356..5fa19a95aee64c6fcdca8a71d03eee21d4e17dfd 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -746,6 +746,8 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"statusbar_update_step", "10", &prefs_common.statusbar_update_step, P_INT,
         NULL, NULL, NULL},
+       {"compose_no_markup", "FALSE", &prefs_common.compose_no_markup, P_BOOL,
+        NULL, NULL, NULL},
 
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 82cb0ff10f91f4d036838c0e238109be50c56329..c4aeebd280925313e0789faf4463ad49d79a6c0d 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -108,7 +108,8 @@ struct _PrefsCommon
        gboolean show_ruler;
        gboolean autosave;
        gint autosave_length;
-       
+       gboolean compose_no_markup;
+
        /* Quote */
        gboolean reply_with_quote;
        gchar *quotemark;