revise label colouring, add filter action for label colouring, fix filtering issues
[claws.git] / src / summaryview.c
index 091ee2e4fbe5b03691c0334b890abd812a77f869..0f3df2fe8490b9af52902b89d562d9a9cc39bde3 100644 (file)
@@ -75,6 +75,7 @@
 #include "scoring.h"
 #include "prefs_folder_item.h"
 #include "filtering.h"
+#include "labelcolors.h"
 
 #include "pixmaps/dir-open.xpm"
 #include "pixmaps/mark.xpm"
@@ -309,6 +310,10 @@ static gint summary_cmp_by_label   (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
 
+#if MARK_ALL_READ
+static void summary_mark_all_read (SummaryView *summaryview);                                   
+#endif
+
 GtkTargetEntry summary_drag_types[1] =
 {
        {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
@@ -326,6 +331,9 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/_Mark/---"),              NULL, NULL,             0, "<Separator>"},
        {N_("/_Mark/Mark as unr_ead"),  NULL, summary_mark_as_unread, 0, NULL},
        {N_("/_Mark/Mark as rea_d"),    NULL, summary_mark_as_read, 0, NULL},
+#if MARK_ALL_READ      
+       {N_("/_Mark/Mark all read"),    NULL, summary_mark_all_read, 0, NULL},
+#endif 
        {N_("/_Mark/Ignore thread"),    NULL, summary_ignore_thread, 0, NULL},
        {N_("/_Mark/Unignore thread"),  NULL, summary_unignore_thread, 0, NULL},
 
@@ -349,25 +357,7 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/Select _all"),            NULL, summary_select_all, 0, NULL}
 };
 
-/* L A B E L   C O L O R   S T U F F */
-
-static struct 
-{
-       GdkColor        color;
-       gchar          *label;
-}
-label_colors[] = 
-{
-       { { 0, 0xffff, (0x99 << 8), 0x0 },              N_("Orange")   },
-       { { 0, 0xffff, 0, 0 },                          N_("Red")      },
-       { { 0, 0xffff, (0x66 << 8), 0xffff },           N_("Pink")     },
-       { { 0, 0x0, (0xcc << 8), 0xffff },              N_("Sky blue") },
-       { { 0, 0x0, 0x0, 0xffff },                      N_("Blue")     },
-       { { 0, 0x0, 0x99 << 8, 0x0 },                   N_("Green")    },
-       { { 0, 0x66 << 8, 0x33 << 8, 0x33 << 8 },       N_("Brown")    }
-};
-
-#define LABEL_COLORS_ELEMS (sizeof label_colors / sizeof label_colors[0])
+#define LABEL_COLORS_ELEMS labelcolors_get_color_count() 
 
 static void label_menu_item_activate_cb(GtkWidget *widget, gpointer data)
 {
@@ -375,7 +365,11 @@ static void label_menu_item_activate_cb(GtkWidget *widget, gpointer data)
        SummaryView *view = gtk_object_get_data(GTK_OBJECT(widget), "view");
 
        g_return_if_fail(view);
-       color <<= 7;
+
+       /* "dont_toggle" state set? */
+       if (gtk_object_get_data(GTK_OBJECT(view->label_menu), "dont_toggle"))
+               return;
+
        summary_set_label(view, color, NULL);
 }
 
@@ -387,7 +381,9 @@ void summary_set_label_color(GtkCTree *ctree, GtkCTreeNode *node,
        GdkColor  color;
        GtkStyle *style, *prev_style, *ctree_style;
        MsgInfo  *msginfo;
-       gint      color_index = ((gint)(labelcolor >> 7)) - 1;
+       gint     color_index;
+
+       color_index = labelcolor == 0 ? -1 :  (gint) labelcolor - 1;
 
        ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
 
@@ -399,7 +395,7 @@ void summary_set_label_color(GtkCTree *ctree, GtkCTreeNode *node,
        style = gtk_style_copy(prev_style);
 
        if (color_index < 0 || color_index >= LABEL_COLORS_ELEMS) {
-               labelcolor = MSG_LABEL;
+               color_index = 0;
                color.red = ctree_style->fg[GTK_STATE_NORMAL].red;
                color.green = ctree_style->fg[GTK_STATE_NORMAL].green;
                color.blue = ctree_style->fg[GTK_STATE_NORMAL].blue;
@@ -411,13 +407,14 @@ void summary_set_label_color(GtkCTree *ctree, GtkCTreeNode *node,
                style->fg[GTK_STATE_SELECTED] = color;
                gtk_ctree_node_set_row_style(ctree, node, style);
        }
-       else
-               color = label_colors[color_index].color;
+       else {
+               color = labelcolors_get_color(color_index);
+       }               
 
        msginfo = gtk_ctree_node_get_row_data(ctree, node);
 
-       MSG_UNSET_FLAGS(msginfo->flags, MSG_LABEL);
-       MSG_SET_FLAGS(msginfo->flags, labelcolor);
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_LABEL);
+       MSG_SET_LABEL_VALUE(msginfo->flags, labelcolor);
 
        if ( style ) {
                style->fg[GTK_STATE_NORMAL] = color;
@@ -436,6 +433,58 @@ void summary_set_label(SummaryView *summaryview, guint labelcolor, GtkWidget *wi
                summary_set_label_color(ctree, GTK_CTREE_NODE(cur->data), labelcolor);
 }
 
+static void label_menu_item_activate_item_cb(GtkMenuItem *label_menu_item, gpointer data)
+{
+       SummaryView  *summaryview;
+       GtkMenuShell *label_menu;
+       GtkCheckMenuItem **items;
+       int  n;
+       GList *cur, *sel;
+
+       summaryview = (SummaryView *) data;
+       g_return_if_fail(summaryview);
+       if (NULL == (sel = GTK_CLIST(summaryview->ctree)->selection))
+               return;
+       
+       label_menu = GTK_MENU_SHELL(summaryview->label_menu);
+       g_return_if_fail(label_menu);
+
+       items = alloca( (LABEL_COLORS_ELEMS + 1) * sizeof(GtkWidget *));
+       g_return_if_fail(items);
+
+       /* NOTE: don't return prematurely because we set the "dont_toggle" state
+        * for check menu items */
+       gtk_object_set_data(GTK_OBJECT(label_menu), "dont_toggle", GINT_TO_POINTER(1));
+
+       /* clear items. get item pointers. */
+       for (n = 0, cur = label_menu->children; cur != NULL; cur = cur->next) {
+               if (GTK_IS_CHECK_MENU_ITEM(cur->data)) {
+                       gtk_check_menu_item_set_state(GTK_CHECK_MENU_ITEM(cur->data), FALSE);
+                       items[n] = GTK_CHECK_MENU_ITEM(cur->data);
+                       n++;
+               }
+       }
+
+       if (n == (LABEL_COLORS_ELEMS + 1)) {
+               /* iterate all messages and set the state of the appropriate items */
+               for (; sel != NULL; sel = sel->next) {
+                       MsgInfo *msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+                                               GTK_CTREE_NODE(sel->data));
+                       gint menu_item;                         
+                       if (msginfo) {
+                               menu_item = MSG_GET_LABEL_VALUE(msginfo->flags);
+                               if (!items[menu_item]->active)
+                                       gtk_check_menu_item_set_state(items[menu_item], TRUE);
+                       }
+               }
+       }
+       else 
+               g_warning("invalid number of color elements (%d)\n", n);
+       
+       /* reset "dont_toggle" state */
+       gtk_object_set_data(GTK_OBJECT(label_menu), "dont_toggle", GINT_TO_POINTER(0));
+}
+
 static void summary_create_label_menu(SummaryView *summaryview)
 {
        const gint LABEL_MENU_POS = 5;
@@ -443,9 +492,12 @@ static void summary_create_label_menu(SummaryView *summaryview)
        GtkWidget *label_menu;
        GtkWidget *item;
        gint       i;
-       
+
        label_menu_item = gtk_menu_item_new_with_label(_("Label"));
        gtk_menu_insert(GTK_MENU(summaryview->popupmenu), label_menu_item, LABEL_MENU_POS);
+       gtk_signal_connect(GTK_OBJECT(label_menu_item), "activate",
+               GTK_SIGNAL_FUNC(label_menu_item_activate_item_cb), summaryview);
+               
        gtk_widget_show(label_menu_item);
        summaryview->label_menu_item = label_menu_item;
 
@@ -455,11 +507,12 @@ static void summary_create_label_menu(SummaryView *summaryview)
         * index of label_colors[] as data parameter. for the None color we pass
         * an invalid (high) value. also we attach a data pointer so we can
         * always get back the SummaryView pointer. */
-       item = gtk_menu_item_new_with_label(_("None"));
+        
+       item = gtk_check_menu_item_new_with_label(_("None"));
        gtk_menu_append(GTK_MENU(label_menu), item);
        gtk_signal_connect(GTK_OBJECT(item), "activate",  
                GTK_SIGNAL_FUNC(label_menu_item_activate_cb),
-               GUINT_TO_POINTER(-1));
+               GUINT_TO_POINTER(0));
        gtk_object_set_data(GTK_OBJECT(item), "view", summaryview);     
        gtk_widget_show(item);
        
@@ -467,8 +520,9 @@ static void summary_create_label_menu(SummaryView *summaryview)
        gtk_menu_append(GTK_MENU(label_menu), item);
        gtk_widget_show(item);
 
+       /* create pixmap/label menu items */
        for (i = 0; i < LABEL_COLORS_ELEMS; i++) {
-               item = gtk_menu_item_new_with_label(label_colors[i].label);
+               item = labelcolors_create_check_color_menu_item(i);
                gtk_menu_append(GTK_MENU(label_menu), item);
                gtk_signal_connect(GTK_OBJECT(item), "activate", 
                                   GTK_SIGNAL_FUNC(label_menu_item_activate_cb),
@@ -476,6 +530,7 @@ static void summary_create_label_menu(SummaryView *summaryview)
                gtk_object_set_data(GTK_OBJECT(item), "view", summaryview);
                gtk_widget_show(item);
        }
+       
        gtk_widget_show(label_menu);
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(label_menu_item), label_menu);
        summaryview->label_menu = label_menu;   
@@ -676,8 +731,6 @@ SummaryView *summary_create(void)
        summaryview->sort_mode = SORT_BY_NONE;
        summaryview->sort_type = GTK_SORT_ASCENDING;
 
-       summary_create_label_menu(summaryview);
-
        summary_change_display_item(summaryview);
 
        gtk_widget_show_all(vbox);
@@ -727,6 +780,8 @@ void summary_init(SummaryView *summaryview)
 
        summary_clear_list(summaryview);
        summary_set_menu_sensitive(summaryview);
+       summary_create_label_menu(summaryview);
+
 }
 
 GtkCTreeNode * summary_find_next_important_score(SummaryView *summaryview,
@@ -796,8 +851,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCTreeNode *node;
-       GSList *mlist = NULL;
-       gchar *buf;
+       GSList *mlist = NULL; gchar *buf;
        gboolean is_refresh;
        guint prev_msgnum = 0;
        GtkCTreeNode *selected_node = summaryview->folderview->selected;
@@ -809,6 +863,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 
        is_refresh = (!prefs_common.open_inbox_on_inc &&
                      item == summaryview->folder_item) ? TRUE : FALSE;
+
        if (is_refresh) {
                prev_msgnum = summary_get_current_msgnum(summaryview);
                if (prev_msgnum < 1)
@@ -828,8 +883,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                        summary_write_cache(summaryview);
                else
                        return FALSE;
-       } else
+       }
+       else if (!summaryview->filtering_happened) {
                summary_write_cache(summaryview);
+       }
+
+       summaryview->filtering_happened = FALSE;
 
        summaryview->folderview->opened = selected_node;
 
@@ -980,7 +1039,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                (summaryview->mainwin, summaryview->selected ? TRUE : FALSE);
 
        debug_print("\n");
-       STATUSBAR_PUSH(summaryview->mainwin, _("done."));
+       STATUSBAR_PUSH(summaryview->mainwin, _("Done."));
 
        main_window_cursor_normal(summaryview->mainwin);
 
@@ -1075,7 +1134,7 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
                menu_set_insensitive_all
                        (GTK_MENU_SHELL(summaryview->popupmenu));
                return;
-       } 
+       }
 
        if (summaryview->folder_item->folder->type != F_NEWS) {
                if (summaryview->folder_item->stype != F_TRASH)
@@ -1112,6 +1171,9 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
 
        menu_set_sensitive(ifactory, "/Mark/Mark as unread", TRUE);
        menu_set_sensitive(ifactory, "/Mark/Mark as read",   TRUE);
+#if MARK_ALL_READ      
+       menu_set_sensitive(ifactory, "/Mark/Mark all read", TRUE);
+#endif 
        menu_set_sensitive(ifactory, "/Mark/Ignore thread",   TRUE);
        menu_set_sensitive(ifactory, "/Mark/Unignore thread", TRUE);
 
@@ -1750,7 +1812,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                                        if (MSG_IS_UNREAD(msginfo->flags))
                                                summaryview->unread--;
 */
-                                       MSG_SET_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+                                       MSG_SET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
                                }
                        }
 
@@ -1761,8 +1823,8 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
 
                        summary_set_marks_func(ctree, node, summaryview);
                        
-                       if ( MSG_GET_LABEL(msginfo->flags) )
-                         summary_set_label_color(ctree, node, (msginfo->flags & MSG_LABEL));
+                       if (MSG_GET_LABEL(msginfo->flags))
+                               summary_set_label_color(ctree, node, MSG_GET_LABEL_VALUE(msginfo->flags));
 
                        /* preserve previous node if the message is
                           duplicated */
@@ -1827,7 +1889,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                        summary_set_marks_func(ctree, node, summaryview);
 
                        if ( MSG_GET_LABEL(msginfo->flags) )
-                         summary_set_label_color(ctree, node, (msginfo->flags & MSG_LABEL));
+                         summary_set_label_color(ctree, node, MSG_GET_LABEL_VALUE(msginfo->flags));
 
                        if (msginfo->msgid && *msginfo->msgid &&
                            g_hash_table_lookup(msgid_table, msginfo->msgid)
@@ -2002,13 +2064,15 @@ static void summary_set_header(gchar *text[], MsgInfo *msginfo)
                Xalloca(from, strlen(msginfo->from) + 1, return);
                strcpy(from, msginfo->from);
                extract_address(from);
-               count = complete_address(from);
-               if (count > 1) {
-                       g_free(from_name);
-                       from = get_complete_address(1);
-                       from_name = procheader_get_fromname(from);
-                       g_free(from);
-                       text[S_COL_FROM] = from_name;
+               if (*from) {
+                       count = complete_address(from);
+                       if (count > 1) {
+                               g_free(from_name);
+                               from = get_complete_address(1);
+                               from_name = procheader_get_fromname(from);
+                               g_free(from);
+                               text[S_COL_FROM] = from_name;
+                       }
                }
        }
 
@@ -2054,10 +2118,8 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
        if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                summaryview->unread--;
        if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
-               MSG_UNSET_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
-
+               MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
                CHANGE_FLAGS(msginfo);
-
                summary_set_row_marks(summaryview, row);
                gtk_clist_thaw(GTK_CLIST(ctree));
                summary_status_show(summaryview);
@@ -2246,8 +2308,7 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
        else if ((global_scoring ||
                  summaryview->folder_item->prefs->scoring) &&
                 (msginfo->score >= summaryview->important_score) &&
-                ((msginfo->flags &
-                  (MSG_MARKED | MSG_MOVE | MSG_COPY)) == 0)) {
+                (MSG_IS_MARKED(msginfo->flags) || MSG_IS_MOVE(msginfo->flags) || MSG_IS_COPY(msginfo->flags))) {
                gtk_ctree_node_set_text(ctree, row, S_COL_MARK, "!");
                gtk_ctree_node_set_foreground(ctree, row,
                                              &summaryview->color_important);
@@ -2281,11 +2342,10 @@ static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->moved--;
        if (MSG_IS_COPY(msginfo->flags))
                summaryview->copied--;
-       MSG_UNSET_FLAGS(msginfo->flags, MSG_DELETED | MSG_MOVE | MSG_COPY);
-       MSG_SET_FLAGS(msginfo->flags, MSG_MARKED);
-
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
+       MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
+       MSG_SET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
        CHANGE_FLAGS(msginfo);
-
        summary_set_row_marks(summaryview, row);
        debug_print(_("Message %d is marked\n"), msginfo->msgnum);
 }
@@ -2315,10 +2375,8 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
                summaryview->unread--;
        if (MSG_IS_NEW(msginfo->flags) ||
            MSG_IS_UNREAD(msginfo->flags)) {
-               MSG_UNSET_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
-
+               MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
                CHANGE_FLAGS(msginfo);
-               
                summary_set_row_marks(summaryview, row);
                debug_print(_("Message %d is marked as read\n"),
                            msginfo->msgnum);
@@ -2337,6 +2395,15 @@ void summary_mark_as_read(SummaryView *summaryview)
        summary_status_show(summaryview);
 }
 
+#if MARK_ALL_READ
+static void summary_mark_all_read(SummaryView *summaryview)
+{
+       summary_select_all(summaryview);
+       summary_mark_as_read(summaryview);
+       summary_unselect_all(summaryview);
+}
+#endif
+
 static void summary_mark_row_as_unread(SummaryView *summaryview,
                                       GtkCTreeNode *row)
 {
@@ -2346,12 +2413,12 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
        if (MSG_IS_DELETED(msginfo->flags)) {
                msginfo->to_folder = NULL;
-               MSG_UNSET_FLAGS(msginfo->flags, MSG_DELETED);
+               MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
                summaryview->deleted--;
        }
-       MSG_UNSET_FLAGS(msginfo->flags, MSG_REPLIED | MSG_FORWARDED);
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_REPLIED | MSG_FORWARDED);
        if (!MSG_IS_UNREAD(msginfo->flags)) {
-               MSG_SET_FLAGS(msginfo->flags, MSG_UNREAD);
+               MSG_SET_PERM_FLAGS(msginfo->flags, MSG_UNREAD);
                gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
                                          unreadxpm, unreadxpmmask);
                summaryview->unread++;
@@ -2390,14 +2457,10 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->moved--;
        if (MSG_IS_COPY(msginfo->flags))
                summaryview->copied--;
-       MSG_UNSET_FLAGS(msginfo->flags,
-                       MSG_MARKED |
-                       MSG_MOVE |
-                       MSG_COPY);
-       MSG_SET_FLAGS(msginfo->flags, MSG_DELETED);
-
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
+       MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
+       MSG_SET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
        CHANGE_FLAGS(msginfo);
-
        summaryview->deleted++;
 
        if (!prefs_common.immediate_exec)
@@ -2484,14 +2547,9 @@ static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->moved--;
        if (MSG_IS_COPY(msginfo->flags))
                summaryview->copied--;
-       MSG_UNSET_FLAGS(msginfo->flags,
-                       MSG_MARKED |
-                       MSG_DELETED |
-                       MSG_MOVE |
-                       MSG_COPY);
-
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED | MSG_DELETED);
+       MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
        CHANGE_FLAGS(msginfo);
-
        summary_set_row_marks(summaryview, row);
 
        debug_print(_("Message %s/%d is unmarked\n"),
@@ -2522,13 +2580,12 @@ static void summary_move_row_to(SummaryView *summaryview, GtkCTreeNode *row,
        msginfo->to_folder = to_folder;
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
-       MSG_UNSET_FLAGS(msginfo->flags,
-                       MSG_MARKED | MSG_DELETED | MSG_COPY);
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED | MSG_DELETED);
+       MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_COPY);
        if (!MSG_IS_MOVE(msginfo->flags)) {
-               MSG_SET_FLAGS(msginfo->flags, MSG_MOVE);
+               MSG_SET_TMP_FLAGS(msginfo->flags, MSG_MOVE);
                summaryview->moved++;
        }
-
        if (!prefs_common.immediate_exec)
                summary_set_row_marks(summaryview, row);
 
@@ -2584,13 +2641,12 @@ static void summary_copy_row_to(SummaryView *summaryview, GtkCTreeNode *row,
        msginfo->to_folder = to_folder;
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
-       MSG_UNSET_FLAGS(msginfo->flags,
-                       MSG_MARKED | MSG_DELETED | MSG_MOVE);
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED | MSG_DELETED);
+       MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE);
        if (!MSG_IS_COPY(msginfo->flags)) {
-               MSG_SET_FLAGS(msginfo->flags, MSG_COPY);
+               MSG_SET_TMP_FLAGS(msginfo->flags, MSG_COPY);
                summaryview->copied++;
        }
-
        if (!prefs_common.immediate_exec)
                summary_set_row_marks(summaryview, row);
 
@@ -2711,7 +2767,7 @@ void summary_print(SummaryView *summaryview)
                        (ctree, GTK_CTREE_NODE(cur->data));
                if (msginfo) procmsg_print_message(msginfo, cmdline);
        }
-       
+
        g_free(cmdline);
 }
 
@@ -2864,8 +2920,7 @@ static void summary_execute_copy_func(GtkCTree *ctree, GtkCTreeNode *node,
                summaryview->mlist =
                        g_slist_append(summaryview->mlist, msginfo);
 
-               MSG_UNSET_FLAGS(msginfo->flags, MSG_COPY);
-               
+               MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_COPY);
                summary_set_row_marks(summaryview, node);
        }
 }
@@ -2890,7 +2945,7 @@ static void summary_execute_delete(SummaryView *summaryview)
 
        for(cur = summaryview->mlist ; cur != NULL ; cur = cur->next) {
                MsgInfo * msginfo = cur->data;
-               MSG_UNSET_FLAGS(msginfo->flags, MSG_DELETED);
+               MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
        }
 
        folder_item_move_msgs_with_dest(trash, summaryview->mlist);
@@ -3398,10 +3453,8 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        switch (column) {
        case S_COL_MARK:
                if (MSG_IS_MARKED(msginfo->flags)) {
-                       MSG_UNSET_FLAGS(msginfo->flags, MSG_MARKED);
-
+                       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
                        CHANGE_FLAGS(msginfo);
-                       
                        summary_set_row_marks(summaryview, row);
                } else
                        summary_mark_row(summaryview, row);
@@ -3811,7 +3864,7 @@ static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpoin
                summaryview->newmsgs--;
        if (MSG_IS_UNREAD(msginfo->flags))
                summaryview->unread--;
-       MSG_SET_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+       MSG_SET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
 
        CHANGE_FLAGS(msginfo);
                
@@ -3842,7 +3895,7 @@ static void summary_unignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpo
                summaryview->newmsgs++;
        if (MSG_IS_UNREAD(msginfo->flags))
                summaryview->unread++;
-       MSG_UNSET_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
 
        CHANGE_FLAGS(msginfo);