2012-04-01 [colin] 3.8.0cvs36

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index eec42c719f4351cce03d967057d91675f0fbafba..f64c1cdded876cd79e617d5851d8880dc0461931 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -57,7 +57,12 @@
 #include "colorlabel.h"
 #include "inc.h"
 #include "imap.h"
-#include "addressbook.h"
+#ifndef USE_NEW_ADDRBOOK
+       #include "addressbook.h"
+#else
+       #include "addressbook-dbus.h"
+       #include "addressadd.h"
+#endif
 #include "addr_compl.h"
 #include "folder_item_prefs.h"
 #include "filtering.h"
@@ -1134,7 +1139,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        if (!summaryview->mainwin)
                return FALSE;
        START_TIMING("");
-       summaryview->last_displayed = NULL;
        summary_switch_from_to(summaryview, item);
 
        inc_lock();
@@ -1383,7 +1387,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        if (is_refresh) {
                if (!quicksearch_is_in_typing(summaryview->quicksearch)) {
-                       summaryview->last_displayed = summaryview->displayed;
                        summaryview->displayed =
                                summary_find_msg_by_msgnum(summaryview,
                                                           displayed_msgnum);
@@ -2044,12 +2047,6 @@ void summary_select_next_labeled(SummaryView *summaryview)
                summary_select_node(summaryview, node, TRUE, FALSE);
 }
 
-void summary_select_last_read(SummaryView *summaryview)
-{
-       if (summaryview->last_displayed)
-               summary_select_node(summaryview, summaryview->last_displayed, TRUE, FALSE);
-}
-
 void summary_select_parent(SummaryView *summaryview)
 {
        GtkCMCTreeNode *node = NULL;
@@ -2068,6 +2065,14 @@ void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
        summary_select_node(summaryview, node, FALSE, TRUE);
 }
 
+void summary_display_by_msgnum(SummaryView *summaryview, guint msgnum)
+{
+       GtkCMCTreeNode *node;
+
+       node = summary_find_msg_by_msgnum(summaryview, msgnum);
+       summary_select_node(summaryview, node, TRUE, FALSE);
+}
+
 void summary_select_by_msg_list(SummaryView    *summaryview, GSList *msginfos)
 {
        GtkCMCTree *ctree;
@@ -3502,7 +3507,6 @@ static void summary_display_msg_full(SummaryView *summaryview,
                        else
                                gtkut_window_popup(summaryview->ext_messageview->window);
                        msgview = summaryview->ext_messageview;
-                       summaryview->last_displayed = summaryview->displayed;
                        summaryview->displayed = row;
                        val = messageview_show(msgview, msginfo, all_headers);
                        if (mimeview_tree_is_empty(msgview->mimeview))
@@ -3511,7 +3515,6 @@ static void summary_display_msg_full(SummaryView *summaryview,
                                GTK_CMCLIST(summaryview->ctree)->focus_row);
                } else {
                        msgview = summaryview->messageview;
-                       summaryview->last_displayed = summaryview->displayed;
                        summaryview->displayed = row;
                        if (!messageview_is_visible(msgview) &&
                            gtk_window_is_active(GTK_WINDOW(summaryview->mainwin->window))) {
@@ -3794,13 +3797,24 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCMCTreeNode *row)
        } else if (MSG_IS_MOVE(flags)) {
                gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_MARK],
                                          movedxpm);
-               if (style)
-                       style = bold_marked_style;
-               else {
-                       style = small_marked_style;
-               }
+               if (!msginfo->to_folder ||
+                   !folder_has_parent_of_type(msginfo->to_folder, F_TRASH)) {
+                       if (style)
+                               style = bold_marked_style;
+                       else {
+                               style = small_marked_style;
+                       }
                        gtk_cmctree_node_set_foreground
                                (ctree, row, &summaryview->color_marked);
+               } else {
+                       if (style)
+                               style = bold_deleted_style;
+                       else {
+                               style = small_deleted_style;
+                       }
+                               gtk_cmctree_node_set_foreground
+                                       (ctree, row, &summaryview->color_dim);
+               }
        } else if (MSG_IS_COPY(flags)) {
                gtk_cmctree_node_set_pixbuf(ctree, row, col_pos[S_COL_MARK],
                                          copiedxpm);
@@ -4617,8 +4631,13 @@ void summary_add_address(SummaryView *summaryview)
        if (image)
                picture = gtk_image_get_pixbuf(GTK_IMAGE(image));
 
+#ifndef USE_NEW_ADDRBOOK
        addressbook_add_contact(msginfo->fromname, from, NULL, picture);
-
+#else
+       if (addressadd_selection(msginfo->fromname, from, NULL, picture)) {
+               debug_print( "addressbook_add_contact - added\n" );
+       }
+#endif
        if (image)
                gtk_widget_destroy(image);
 }
@@ -6507,7 +6526,6 @@ void summary_set_column_order(SummaryView *summaryview)
 
        summaryview->selected = summary_find_msg_by_msgnum(summaryview, selected_msgnum);
        summaryview->displayed = summary_find_msg_by_msgnum(summaryview, displayed_msgnum);
-       summaryview->last_displayed = summaryview->displayed;
        if (!summaryview->displayed)
                messageview_clear(summaryview->messageview);
        else
@@ -6809,6 +6827,8 @@ static void summary_unselected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
 static void summary_selected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
                             gint column, SummaryView *summaryview)
 {
+       GList *list, *cur;
+       MessageView *msgview;
        MsgInfo *msginfo;
        gboolean marked_unread = FALSE;
 
@@ -6900,6 +6920,17 @@ static void summary_selected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
                break;
        }
 
+       list = messageview_get_msgview_list();
+       for (cur = list; cur != NULL; cur = cur->next) {
+               msgview = (MessageView *) cur->data;
+               
+               if (msgview->new_window && msgview->update_needed) {
+                       MsgInfo *new_msginfo = summary_get_selected_msg(summaryview);
+                       messageview_show(msgview, new_msginfo, msgview->all_headers);
+                       msgview->update_needed = FALSE;         
+               }
+       }
+
        if (summaryview->display_msg ||
            (prefs_common.always_show_msg &&
             messageview_is_visible(summaryview->messageview))) {
@@ -7835,7 +7866,9 @@ void summary_harvest_address(SummaryView *summaryview)
                        continue;
                msgList = g_list_append( msgList, GUINT_TO_POINTER( msginfo->msgnum ) );
        }
+
        addressbook_harvest( summaryview->folder_item, TRUE, msgList );
+
        g_list_free( msgList );
 }