2012-10-31 [paul] 3.8.1cvs111

	* src/prefs_folder_item.c
		add missing closing bracket. thanks to Andreas Rönnquist.

diff --git a/ChangeLog b/ChangeLog
index d8cf36933f4b7b888d33ebeb32b1fb83f958e45b..2576cbd58aee60096259e374a253e93ac67f1045 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-31 [paul]      3.8.1cvs111
+
+       * src/prefs_folder_item.c
+               add missing closing bracket. thanks to Andreas Rönnquist.
+
 2012-10-31 [colin]     3.8.1cvs110
 
        * src/prefs_folder_item.c

diff --git a/PATCHSETS b/PATCHSETS
index 11032b0588dad16bc0b91471d961b055c899fd7b..e809f23209f54aa3b10b87834cc83d8184aede97 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4485,3 +4485,4 @@
 ( cvs diff -u -r 1.96.2.253 -r 1.96.2.254 src/textview.c;  ) > 3.8.1cvs108.patchset
 ( cvs diff -u -r 1.2.2.40 -r 1.2.2.41 src/folder_item_prefs.c;  cvs diff -u -r 1.2.2.25 -r 1.2.2.26 src/folder_item_prefs.h;  cvs diff -u -r 1.94.2.239 -r 1.94.2.240 src/messageview.c;  cvs diff -u -r 1.52.2.88 -r 1.52.2.89 src/prefs_folder_item.c;  ) > 3.8.1cvs109.patchset
 ( cvs diff -u -r 1.52.2.89 -r 1.52.2.90 src/prefs_folder_item.c;  ) > 3.8.1cvs110.patchset
+( cvs diff -u -r 1.52.2.90 -r 1.52.2.91 src/prefs_folder_item.c;  ) > 3.8.1cvs111.patchset

diff --git a/configure.ac b/configure.ac
index 884b839b75140cc639ebc114ab12b68c3aedc2b0..ae5194304475a88d202fc51883524874df546d2e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=110
+EXTRA_VERSION=111
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index d227cac76cd6afdd4229a2e28ac432da8f9ef324..226f34b19d4b5234dc83b28ec0c7745e371fec81 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -518,9 +518,8 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        combobox_select_by_data(GTK_COMBO_BOX(promote_html_part),
                        item->prefs->promote_html_part);
 
-       CLAWS_SET_TIP(hbox, _(
-                               "\"Default\" will follow global preference (found in /Preferences/"
-                               "Message View/Text Options"));
+       CLAWS_SET_TIP(hbox, _("\"Default\" will follow global preference (found in /Preferences/"
+                             "Message View/Text Options)"));
 
        promote_html_part_rec_checkbtn = gtk_check_button_new();
        gtk_widget_show (promote_html_part_rec_checkbtn);