correct display recipient on From...

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index 37b255f31884ecdb8f7685280e361b18521413f9..5872d60e55fdb5aa8a9b9b7b0e20d2702161ce85 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -864,9 +864,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 
        g_slist_free(mlist);
 
-       summaryview->folder_item->new    = summaryview->newmsgs;
-       summaryview->folder_item->unread = summaryview->unread;
-       summaryview->folder_item->total  = summaryview->messages;
        folderview_update_msg_num(summaryview->folderview,
                                  summaryview->folderview->opened);
 
@@ -1691,10 +1688,6 @@ static void summary_status_show(SummaryView *summaryview)
                return;
        }
 
-       summaryview->newmsgs    = summaryview->folder_item->new;
-       summaryview->unread     = summaryview->folder_item->unread;
-       summaryview->messages   = summaryview->folder_item->total;
-
        rowlist = GTK_CLIST(summaryview->ctree)->selection;
        for (cur = rowlist; cur != NULL; cur = cur->next) {
                msginfo = gtk_ctree_node_get_row_data
@@ -1944,7 +1937,7 @@ void summary_sort(SummaryView *summaryview,
        summary_set_column_titles(summaryview);
        summary_set_menu_sensitive(summaryview);
 
-       gtk_ctree_sort_recursive(ctree, NULL);
+       gtk_sctree_sort_recursive(ctree, NULL);
 
        gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
 
@@ -2266,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;
+                       }
                }
        }