2006-08-14 [paul] 2.4.0cvs47

	* src/prefs_display_header.c
		re-enable user-defined Displayed Headers

diff --git a/ChangeLog b/ChangeLog
index 9714bd588a9a4726e75cc38382fa3dcda4b6a28a..414c843cab949f0e18a323865d9f2f8433b7da68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-14 [paul]      2.4.0cvs47
+
+       * src/prefs_display_header.c
+               re-enable user-defined Displayed Headers
+
 2006-08-14 [paul]      2.4.0cvs46
 
        * src/prefs_account.c

diff --git a/PATCHSETS b/PATCHSETS
index fca7f23885bdb0c414be54a294033c3aa4ef6bd3..c1fd9c8b44e7eccdc8833d88a9fd4b916ab08a4f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1738,3 +1738,4 @@
 ( cvs diff -u -r 1.18.2.35 -r 1.18.2.36 src/plugins/spamassassin/spamassassin.c;  ) > 2.4.0cvs44.patchset
 ( cvs diff -u -r 1.36.2.73 -r 1.36.2.74 src/common/utils.c;  ) > 2.4.0cvs45.patchset
 ( cvs diff -u -r 1.105.2.64 -r 1.105.2.65 src/prefs_account.c;  ) > 2.4.0cvs46.patchset
+( cvs diff -u -r 1.16.2.19 -r 1.16.2.20 src/prefs_display_header.c;  ) > 2.4.0cvs47.patchset

diff --git a/configure.ac b/configure.ac
index 66779d9e0aff4c6f00201de98796376f6fc5aa28..523eca9d5d34430f9f0d784ea29b046c6e294925 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=46
+EXTRA_VERSION=47
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index 0ffce125aa66ac0c750aad720300e707b8af0960..3f13de79f1f4eb3e65486d3614e678a071898208 100644 (file)
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -252,7 +252,7 @@ static void prefs_display_header_create(void)
        gtk_widget_show (hdr_label);
        gtk_box_pack_start (GTK_BOX (hbox1), hdr_label, FALSE, FALSE, 0);
 
-       hdr_combo = gtk_combo_box_new_text();
+       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.trans_hdr ? gettext(defaults[i]) : defaults[i]);
@@ -560,8 +560,7 @@ static void prefs_display_header_list_view_set_row(gboolean hidden)
        const gchar *entry_text;
        GtkTreeModel *model;
 
-       entry_text = defaults[gtk_combo_box_get_active(
-                                               GTK_COMBO_BOX(dispheader.hdr_combo))];
+       entry_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(dispheader.hdr_combo));
        if (entry_text[0] == '\0') {
                alertpanel_error(_("Header name is not set."));
                return;