From: Colin Leroy <colin@colino.net>
Date: Fri, 16 Nov 2007 17:24:44 +0000 (+0000)
Subject: 2007-11-16 [colin]	3.0.2cvs137
X-Git-Tag: rel_3_1_0~9
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=14dc78faab1762456257266fda9a6fe0befa02a7

2007-11-16 [colin]	3.0.2cvs137

	* src/prefs_display_header.c
		Fix bug 1389, 'Changing 'Display headers
		in message view' breaks dispheaderrc'
---

diff --git a/ChangeLog b/ChangeLog
index 2d5feb272..f7410256c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-16 [colin]	3.0.2cvs137
+
+	* src/prefs_display_header.c
+		Fix bug 1389, 'Changing 'Display headers 
+		in message view' breaks dispheaderrc'
+
 2007-11-14 [colin]	3.0.2cvs136
 
 	* src/summaryview.c
diff --git a/PATCHSETS b/PATCHSETS
index bc571dab0..50dc7afac 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3049,3 +3049,4 @@
 ( cvs diff -u -r 1.12.2.24 -r 1.12.2.25 src/plugins/dillo_viewer/dillo_viewer.c;  ) > 3.0.2cvs134.patchset
 ( cvs diff -u -r 1.60.2.40 -r 1.60.2.41 src/filtering.c;  ) > 3.0.2cvs135.patchset
 ( cvs diff -u -r 1.395.2.334 -r 1.395.2.335 src/summaryview.c;  cvs diff -u -r 1.1.2.81 -r 1.1.2.82 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/gtk/quicksearch.h;  ) > 3.0.2cvs136.patchset
+( cvs diff -u -r 1.16.2.32 -r 1.16.2.33 src/prefs_display_header.c;  ) > 3.0.2cvs137.patchset
diff --git a/configure.ac b/configure.ac
index 4bd509899..22f20dc94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=136
+EXTRA_VERSION=137
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index b6d7bd51c..c0bd2ec2b 100644
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -285,7 +285,7 @@ static void prefs_display_header_create(void)
 	hdr_combo = gtk_combo_box_entry_new_text();
 	for(i=0; i < 9 ; i++)
 		gtk_combo_box_append_text(GTK_COMBO_BOX (hdr_combo),
-			prefs_common_translated_header_name(defaults[i]));
+			defaults[i]);
 	gtk_combo_box_set_active(GTK_COMBO_BOX(hdr_combo), 0);
 	gtk_widget_show (hdr_combo);
 	gtk_box_pack_start (GTK_BOX (hbox1), hdr_combo, TRUE, TRUE, 0);
@@ -760,7 +760,7 @@ static void prefs_display_header_insert_header(GtkListStore *store,
 	gtk_list_store_append(store, &iter);
 	gtk_list_store_set(store, &iter,
 			   PREFS_HDR_HEADER,
-			   prefs_common_translated_header_name(name),
+			   name,
 			   PREFS_HDR_DATA, dp,
 			   -1);
 }