From: Martin Schaaf <mascha@ma-scha.de>
Date: Mon, 15 Jul 2002 18:21:28 +0000 (+0000)
Subject: correct display recipient on From...
X-Git-Tag: rel_0_8_0~41
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=93546296bb5f36041f437f27139e4b338cff304b

correct display recipient on From...
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 1fb0022f4..5bfa4a044 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2002-07-15 [martin]	0.7.8claws70
+
+	* src/summaryview.c
+		option "display recipient on 'From'..." now works
+		without the need of enabling the option
+		"display  sender  using  address  book".
+
 2002-07-15 [christoph]	0.7.8claws69
 
 	* src/summaryview.c
diff --git a/configure.in b/configure.in
index f9974da98..bfe6d8a83 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws69
+EXTRA_VERSION=claws70
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/summaryview.c b/src/summaryview.c
index f0a7f76f6..5872d60e5 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2259,16 +2259,22 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
 	    !MSG_IS_NEWS(msginfo->flags)) {
 		gchar *addr = NULL;
 
-		if (prefs_common.use_addr_book) {
-			Xstrdup_a(addr, msginfo->from, return);
-			extract_address(addr);
+		Xstrdup_a(addr, msginfo->from, return);
+		extract_address(addr);
 
+		if (prefs_common.use_addr_book) {
 			if (account_find_from_address(addr)) {
 				addr = summary_complete_address(msginfo->to);
 				g_free(to);
 				to   = g_strconcat("-->", addr == NULL ? msginfo->to : addr, NULL);
 				text[col_pos[S_COL_FROM]] = to;
 			}
+		} else {
+			if (cur_account && cur_account->address && !strcmp( addr, cur_account->address)) {
+				g_free(to);
+				to = g_strconcat("-->", msginfo->to, NULL);
+				text[col_pos[S_COL_FROM]] = to;
+			}
 		}
 	}