correct display recipient on From...
authorMartin Schaaf <mascha@ma-scha.de>
Mon, 15 Jul 2002 18:21:28 +0000 (18:21 +0000)
committerMartin Schaaf <mascha@ma-scha.de>
Mon, 15 Jul 2002 18:21:28 +0000 (18:21 +0000)
ChangeLog.claws
configure.in
src/summaryview.c

index 1fb0022f43183c8a9a91048a1bcc6f1b5e1a544a..5bfa4a04452f1bc2117cd850c9e83363d35727c9 100644 (file)
@@ -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
 2002-07-15 [christoph] 0.7.8claws69
 
        * src/summaryview.c
index f9974da98e83cb34b188e6051ab63c1b1e652143..bfe6d8a8384d01da33c74d5f9561dd5791477d81 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
 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
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index f0a7f76f631745bd4cfa809276164a0fa92ef398..5872d60e55fdb5aa8a9b9b7b0e20d2702161ce85 100644 (file)
@@ -2259,16 +2259,22 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
            !MSG_IS_NEWS(msginfo->flags)) {
                gchar *addr = NULL;
 
            !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;
                        }
                        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;
+                       }
                }
        }
 
                }
        }