2007-04-23 [wwp] 2.9.1cvs18

	* src/prefs_common.c
		Fix 2.9.1cvs5: no header was being translated at all.

diff --git a/ChangeLog b/ChangeLog
index 135b167700f5d933f52752c8c530cd2511cf44d7..8ebfec3d6b877265798551632f5ed71115f3f994 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-23 [wwp]       2.9.1cvs18
+
+       * src/prefs_common.c
+               Fix 2.9.1cvs5: no header was being translated at all.
+

 2007-04-23 [colin]     2.9.1cvs17
 
        * src/Makefile.am
 2007-04-23 [colin]     2.9.1cvs17
 
        * src/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index a0dade482eabd3e5c5d69bc1a47d4c1689745b80..8d28625de7e5e0a08655a2707b3d0b676a8a0676 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2545,3 +2545,4 @@
 ( cvs diff -u -r 1.382.2.372 -r 1.382.2.373 src/compose.c;  ) > 2.9.1cvs15.patchset
 ( cvs diff -u -r 1.155.2.61 -r 1.155.2.62 src/Makefile.am;  cvs diff -u -r 1.25.2.36 -r 1.25.2.37 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.25 -r 1.18.2.26 src/stock_pixmap.h;  cvs diff -u -r 1.395.2.298 -r 1.395.2.299 src/summaryview.c;  cvs diff -u -r 1.68.2.36 -r 1.68.2.37 src/summaryview.h;  cvs diff -u -r 1.1.4.38 -r 1.1.4.39 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/gtksctree.h;  diff -u /dev/null src/pixmaps/selection.xpm;  ) > 2.9.1cvs16.patchset
 ( cvs diff -u -r 1.155.2.61 -r 1.155.2.62 src/Makefile.am;  cvs diff -u -r 1.25.2.36 -r 1.25.2.37 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.25 -r 1.18.2.26 src/stock_pixmap.h;  cvs diff -u -r 1.395.2.298 -r 1.395.2.299 src/summaryview.c;  cvs diff -u -r 1.68.2.36 -r 1.68.2.37 src/summaryview.h;  cvs diff -u -r 1.1.4.38 -r 1.1.4.39 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/gtksctree.h;  diff -u /dev/null src/pixmaps/selection.xpm;  ) > 2.9.1cvs17.patchset
 ( cvs diff -u -r 1.382.2.372 -r 1.382.2.373 src/compose.c;  ) > 2.9.1cvs15.patchset
 ( cvs diff -u -r 1.155.2.61 -r 1.155.2.62 src/Makefile.am;  cvs diff -u -r 1.25.2.36 -r 1.25.2.37 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.25 -r 1.18.2.26 src/stock_pixmap.h;  cvs diff -u -r 1.395.2.298 -r 1.395.2.299 src/summaryview.c;  cvs diff -u -r 1.68.2.36 -r 1.68.2.37 src/summaryview.h;  cvs diff -u -r 1.1.4.38 -r 1.1.4.39 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/gtksctree.h;  diff -u /dev/null src/pixmaps/selection.xpm;  ) > 2.9.1cvs16.patchset
 ( cvs diff -u -r 1.155.2.61 -r 1.155.2.62 src/Makefile.am;  cvs diff -u -r 1.25.2.36 -r 1.25.2.37 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.25 -r 1.18.2.26 src/stock_pixmap.h;  cvs diff -u -r 1.395.2.298 -r 1.395.2.299 src/summaryview.c;  cvs diff -u -r 1.68.2.36 -r 1.68.2.37 src/summaryview.h;  cvs diff -u -r 1.1.4.38 -r 1.1.4.39 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/gtksctree.h;  diff -u /dev/null src/pixmaps/selection.xpm;  ) > 2.9.1cvs17.patchset

+( cvs diff -u -r 1.204.2.131 -r 1.204.2.132 src/prefs_common.c;  ) > 2.9.1cvs18.patchset

diff --git a/configure.ac b/configure.ac
index 6b666cb90390e4d6ff1d12ca4218399eee00b292..f6d071388206babf7ae05e367a1085dc72b64136 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=17
+EXTRA_VERSION=18

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 713b0a341a11cc3b96273af2605b5a961dc323d5..79b6ff95026d609f7a448683ceb3e3961473621d 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -1314,7 +1314,7 @@ gboolean prefs_common_unsafe_ssl_certs(void)
 */
 const gchar *prefs_common_translated_header_name(const gchar *header_name)
 {
 */
 const gchar *prefs_common_translated_header_name(const gchar *header_name)
 {

-       if (header_name != NULL || *header_name == '\0')
+       if (header_name == NULL || *header_name == '\0')

                return header_name;
 
        return prefs_common.trans_hdr ? gettext(header_name) : header_name;
                return header_name;
 
        return prefs_common.trans_hdr ? gettext(header_name) : header_name;