From 278b0f58a7609a1c447dd266421e21842963d4a1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ho=C3=A0=20Vi=C3=AAt=20Dinh?= <dinh.viet.hoa@free.fr>
Date: Sat, 3 Nov 2001 17:13:22 +0000
Subject: [PATCH] nickname bug / options disabled when on inbox

---
 ChangeLog.claws   | 10 ++++++++++
 configure.in      |  2 +-
 src/folderview.c  |  2 ++
 src/summaryview.c |  4 ++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 802733a42..63187618f 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2001-11-18 [hoa]	0.6.4claws20
+
+	* src/folderview.c
+		enable property and scoring options when right
+		click on "inbox"
+
+	* src/summaryview.c
+		fixed bug when nickname were displayed using
+		the address book.
+
 2001-11-02 [darko]	0.6.4claws19
 
 	* src/compose.c
diff --git a/configure.in b/configure.in
index 91c879871..c27f75b3d 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws19
+EXTRA_VERSION=claws20
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
diff --git a/src/folderview.c b/src/folderview.c
index 27c97576c..51345fbb1 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1253,6 +1253,8 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
 				update_tree = rescan_tree = TRUE;
 			else if (item->stype == F_NORMAL)
 				rename_folder = delete_folder = folder_property = folder_scoring = TRUE;
+			else if (item->stype == F_INBOX)
+				folder_property = folder_scoring = TRUE;
 		} else if (FOLDER_TYPE(folder) == F_NEWS) {
 			if (item->parent != NULL)
 				delete_folder = folder_scoring = TRUE;
diff --git a/src/summaryview.c b/src/summaryview.c
index 7cb1a877e..58def0230 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2093,7 +2093,7 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
 		}
 	}
 
-	if ((text[S_COL_FROM] != to) && prefs_common.use_addr_book &&
+	if ((text[col_pos[S_COL_FROM]] != to) && prefs_common.use_addr_book &&
 	    msginfo->from) {
 		gint count;
 		gchar *from;
@@ -2108,7 +2108,7 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
 				from = get_complete_address(1);
 				from_name = procheader_get_fromname(from);
 				g_free(from);
-				text[S_COL_FROM] = from_name;
+				text[col_pos[S_COL_FROM]] = from_name;
 			}
 		}
 	}
-- 
2.25.1