fix recurring unread state bug
[claws.git] / src / summaryview.c
index 3ce8e2439a224d5460435cad18575711a4e50bbc..4202a60b3e2eb053f29525c2ba1f38d6fcd40944 100644 (file)
@@ -89,6 +89,7 @@
 #include "pixmaps/forwarded.xpm"
 #include "pixmaps/clip.xpm"
 #include "pixmaps/ignorethread.xpm"
+#include "pixmaps/locked.xpm"
 
 #define STATUSBAR_PUSH(mainwin, str) \
 { \
 
 #define SUMMARY_COL_MARK_WIDTH         10
 #define SUMMARY_COL_UNREAD_WIDTH       13
+#define SUMMARY_COL_LOCKED_WIDTH       13
 #define SUMMARY_COL_MIME_WIDTH         10
 
 static GdkFont *boldfont;
@@ -135,6 +137,8 @@ static GdkPixmap *forwardedxpm;
 static GdkBitmap *forwardedxpmmask;
 static GdkPixmap *ignorethreadxpm;
 static GdkBitmap *ignorethreadxpmmask;
+static GdkPixmap *lockedxpm;
+static GdkBitmap *lockedxpmmask;
 
 static GdkPixmap *clipxpm;
 static GdkBitmap *clipxpmmask;
@@ -186,6 +190,7 @@ static void summary_update_status   (SummaryView            *summaryview);
 
 /* display functions */
 static void summary_status_show                (SummaryView            *summaryview);
+static void summary_set_column_titles  (SummaryView            *summaryview);
 static void summary_set_ctree_from_list        (SummaryView            *summaryview,
                                         GSList                 *mlist);
 static void summary_set_header         (SummaryView            *summaryview,
@@ -201,6 +206,8 @@ static void summary_set_row_marks   (SummaryView            *summaryview,
 /* message handling */
 static void summary_mark_row           (SummaryView            *summaryview,
                                         GtkCTreeNode           *row);
+static void summary_lock_row           (SummaryView            *summaryview,
+                                        GtkCTreeNode           *row);
 static void summary_mark_row_as_read   (SummaryView            *summaryview,
                                         GtkCTreeNode           *row);
 static void summary_mark_row_as_unread (SummaryView            *summaryview,
@@ -243,6 +250,7 @@ static void summary_unthread_for_exec_func  (GtkCTree       *ctree,
                                                 GtkCTreeNode   *node,
                                                 gpointer        data);
 
+void summary_processing(SummaryView *summaryview, GSList * mlist);
 static void summary_filter_func                (GtkCTree               *ctree,
                                         GtkCTreeNode           *node,
                                         gpointer                data);
@@ -320,6 +328,8 @@ static void summary_subject_clicked (GtkWidget              *button,
                                         SummaryView            *summaryview);
 static void summary_score_clicked      (GtkWidget              *button,
                                         SummaryView            *summaryview);
+static void summary_locked_clicked     (GtkWidget              *button,
+                                        SummaryView            *summaryview);
 
 static void summary_start_drag         (GtkWidget        *widget, 
                                         int button,
@@ -361,14 +371,12 @@ static gint summary_cmp_by_subject        (GtkCList               *clist,
 static gint summary_cmp_by_score       (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
+static gint summary_cmp_by_locked      (GtkCList *clist,
+                                        gconstpointer ptr1, gconstpointer ptr2);
 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}
@@ -383,6 +391,7 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/_Forward"),               NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
        {N_("/Forward as a_ttachment"),
                                        NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
+       {N_("/Bounce"),                 NULL, summary_reply_cb, COMPOSE_BOUNCE, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/Re-_edit"),               NULL, summary_reedit,   0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
@@ -427,7 +436,8 @@ static const gchar *const col_label[N_SUMMARY_COLS] = {
        N_("Date"),     /* S_COL_DATE    */
        N_("Size"),     /* S_COL_SIZE    */
        N_("No."),      /* S_COL_NUMBER  */
-       N_("Score")     /* S_COL_SCORE   */
+       N_("Score"),    /* S_COL_SCORE   */
+       N_("L")         /* S_COL_LOCKED  */
 };
 
 SummaryView *summary_create(void)
@@ -533,15 +543,11 @@ void summary_init(SummaryView *summaryview)
                      forwarded_xpm);
        PIXMAP_CREATE(summaryview->ctree, ignorethreadxpm, ignorethreadxpmmask,
                      ignorethread_xpm);
+       PIXMAP_CREATE(summaryview->ctree, lockedxpm, lockedxpmmask, locked_xpm);                      
        PIXMAP_CREATE(summaryview->ctree, clipxpm, clipxpmmask, clip_xpm);
        PIXMAP_CREATE(summaryview->hbox, folderxpm, folderxpmmask,
                      dir_open_xpm);
 
-       pixmap = gtk_pixmap_new(clipxpm, clipxpmmask);
-       gtk_clist_set_column_widget(GTK_CLIST(summaryview->ctree),
-                                   summaryview->col_pos[S_COL_MIME], pixmap);
-       gtk_widget_show(pixmap);
-
        if (!small_style) {
                small_style = gtk_style_copy
                        (gtk_widget_get_style(summaryview->ctree));
@@ -582,6 +588,7 @@ void summary_init(SummaryView *summaryview)
        gtk_widget_show(pixmap);
 
        summary_clear_list(summaryview);
+       summary_set_column_titles(summaryview);
        summary_colorlabel_menu_create(summaryview);
        summary_set_menu_sensitive(summaryview);
 
@@ -701,17 +708,15 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                }
                folder_update_op_count();
        }
-       else if (!summaryview->filtering_happened) {
-               summary_write_cache(summaryview);
-       }
-
-       summaryview->filtering_happened = FALSE;
-
+        
+       summary_write_cache(summaryview);
+        
        summaryview->folderview->opened = selected_node;
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
        summary_clear_list(summaryview);
+       summary_set_column_titles(summaryview);
        summary_set_menu_sensitive(summaryview);
        if (!is_refresh)
                messageview_clear(summaryview->messageview);
@@ -747,6 +752,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
 
        mlist = item->folder->get_msg_list(item->folder, item, !update_cache);
 
+       summary_processing(summaryview, mlist);
+
        for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
                MsgInfo * msginfo = (MsgInfo *) cur->data;
 
@@ -848,9 +855,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
        }
 
        summary_status_show(summaryview);
-
        summary_set_menu_sensitive(summaryview);
-
        main_window_set_toolbar_sensitive(summaryview->mainwin);
 
        debug_print("\n");
@@ -1008,6 +1013,7 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        menu_set_sensitive(ifactory, "/Reply to all",             sens);
        menu_set_sensitive(ifactory, "/Forward",                  TRUE);
        menu_set_sensitive(ifactory, "/Forward as attachment",    TRUE);
+       menu_set_sensitive(ifactory, "/Bounce",                   TRUE);
 
        menu_set_sensitive(ifactory, "/Add sender to address book", sens);
 
@@ -1301,7 +1307,8 @@ static GtkCTreeNode *summary_find_prev_msg(SummaryView *summaryview,
 
        for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
-               if (!MSG_IS_DELETED(msginfo->flags)) break;
+               if (!MSG_IS_DELETED(msginfo->flags))
+                       break;
        }
 
        return node;
@@ -1321,7 +1328,8 @@ static GtkCTreeNode *summary_find_next_msg(SummaryView *summaryview,
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
-               if (!MSG_IS_DELETED(msginfo->flags)) break;
+               if (!MSG_IS_DELETED(msginfo->flags))
+                       break;
        }
 
        return node;
@@ -1703,6 +1711,89 @@ static void summary_status_show(SummaryView *summaryview)
                                  summaryview->messages);
 }
 
+static void summary_set_column_titles(SummaryView *summaryview)
+{
+       GtkCList *clist = GTK_CLIST(summaryview->ctree);
+       GtkWidget *hbox;
+       GtkWidget *label;
+       GtkWidget *arrow;
+       gint pos;
+       const gchar *title;
+       SummaryColumnType type;
+       gboolean single_char;
+       GtkJustification justify;
+
+       static SummarySortType sort_by[N_SUMMARY_COLS] = {
+               SORT_BY_MARK,
+               SORT_BY_UNREAD,
+               SORT_BY_MIME,
+               SORT_BY_SUBJECT,
+               SORT_BY_FROM,
+               SORT_BY_DATE,
+               SORT_BY_SIZE,
+               SORT_BY_NUMBER
+       };
+
+       for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
+               type = summaryview->col_state[pos].type;
+
+               single_char = (type == S_COL_MIME ||
+                              type == S_COL_MARK || type == S_COL_UNREAD);
+               justify = (type == S_COL_NUMBER || type == S_COL_SIZE)
+                       ? GTK_JUSTIFY_RIGHT : GTK_JUSTIFY_LEFT;
+
+               switch (type) {
+               case S_COL_SUBJECT:
+               case S_COL_FROM:
+               case S_COL_DATE:
+               case S_COL_NUMBER:
+                       if (prefs_common.trans_hdr)
+                               title = gettext(col_label[type]);
+                       else
+                               title = col_label[type];
+                       break;
+               default:
+                       title = gettext(col_label[type]);
+               }
+
+               if (type == S_COL_MIME) {
+                       label = gtk_pixmap_new(clipxpm, clipxpmmask);
+                       gtk_widget_show(label);
+                       gtk_clist_set_column_widget(clist, pos, label);
+                       continue;
+               }
+               if (single_char) {
+                       gtk_clist_set_column_title(clist, pos, title);
+                       continue;
+               }
+
+               hbox = gtk_hbox_new(FALSE, 4);
+               label = gtk_label_new(title);
+               if (justify == GTK_JUSTIFY_RIGHT)
+                       gtk_box_pack_end(GTK_BOX(hbox), label,
+                                        FALSE, FALSE, 0);
+               else
+                       gtk_box_pack_start(GTK_BOX(hbox), label,
+                                          FALSE, FALSE, 0);
+
+               if (summaryview->sort_mode == sort_by[type]) {
+                       arrow = gtk_arrow_new
+                               (summaryview->sort_type == GTK_SORT_ASCENDING
+                                ? GTK_ARROW_DOWN : GTK_ARROW_UP,
+                                GTK_SHADOW_IN);
+                       if (justify == GTK_JUSTIFY_RIGHT)
+                               gtk_box_pack_start(GTK_BOX(hbox), arrow,
+                                                  FALSE, FALSE, 0);
+                       else
+                               gtk_box_pack_end(GTK_BOX(hbox), arrow,
+                                                FALSE, FALSE, 0);
+               }
+
+               gtk_widget_show_all(hbox);
+               gtk_clist_set_column_widget(clist, pos, hbox);
+       }
+}
+
 void summary_sort(SummaryView *summaryview, SummarySortType type)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -1740,6 +1831,9 @@ void summary_sort(SummaryView *summaryview, SummarySortType type)
        case SORT_BY_SCORE:
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_score;
                break;
+       case SORT_BY_LOCKED:
+               cmp_func = (GtkCListCompareFunc)summary_cmp_by_locked;
+               break;
        case SORT_BY_LABEL:
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_label;
                break;
@@ -1764,11 +1858,11 @@ void summary_sort(SummaryView *summaryview, SummarySortType type)
        gtk_clist_set_sort_type(clist, summaryview->sort_type);
        summaryview->sort_mode = type;
 
+       summary_set_column_titles(summaryview);
+
        gtk_ctree_sort_node(ctree, NULL);
 
        gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
-       /*gtkut_ctree_set_focus_row(ctree, summaryview->selected);*/
-
        prefs_folder_item_set_config(summaryview->folder_item,
                                     summaryview->sort_type,
                                     summaryview->sort_mode);
@@ -1817,24 +1911,6 @@ gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *gnode,
        return TRUE;
 }
 
-static GtkCTreeNode * subject_table_lookup(GHashTable *subject_table,
-                                          gchar * subject)
-{
-       if (g_strncasecmp(subject, "Re: ", 4) == 0)
-               return g_hash_table_lookup(subject_table, subject + 4);
-       else
-               return g_hash_table_lookup(subject_table, subject);
-}
-
-static void subject_table_insert(GHashTable *subject_table, gchar * subject,
-                                GtkCTreeNode * node)
-{
-       if (g_strncasecmp(subject, "Re: ", 4) == 0)
-               g_hash_table_insert(subject_table, subject + 4, node);
-       else
-               g_hash_table_insert(subject_table, subject, node);
-}
-
 static void summary_set_ctree_from_list(SummaryView *summaryview,
                                        GSList *mlist)
 {
@@ -1909,6 +1985,10 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                        if (msginfo->msgid)
                                g_hash_table_insert(msgid_table,
                                                    msginfo->msgid, node);
+
+                       subject_table_insert(subject_table,
+                                            msginfo->subject,
+                                            node);
                }
                mlist = g_slist_reverse(mlist);
        }
@@ -2065,7 +2145,7 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
        text[col_pos[S_COL_SCORE]]  = itos_buf(col_score, msginfo->threadscore);
 #else
        text[col_pos[S_COL_SCORE]]  = itos_buf(col_score, msginfo->score);
-#endif
+#endif 
 
        if (msginfo->date_t) {
                procheader_date_get_localtime(date_modified,
@@ -2152,13 +2232,6 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
                summaryview->newmsgs--;
        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_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);
-       }
 
        if (new_window) {
                MessageView *msgview;
@@ -2182,6 +2255,14 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
                gtkut_ctree_node_move_if_on_the_edge(ctree, row);
        }
 
+       if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
+               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);
+       }
+
        if (GTK_WIDGET_VISIBLE(summaryview->headerwin->window))
                header_window_show(summaryview->headerwin, msginfo);
 
@@ -2423,6 +2504,14 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], NULL);
        }
 
+       if (MSG_IS_LOCKED(flags)) {
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_LOCKED],
+                                         lockedxpm, lockedxpmmask);
+       }
+       else {
+               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], NULL);
+       }
+
        if (MSG_IS_MIME(flags)) {
                gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
                                          clipxpm, clipxpmmask);
@@ -2441,7 +2530,11 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
 
 void summary_set_marks_selected(SummaryView *summaryview)
 {
-       summary_set_row_marks(summaryview, summaryview->selected);
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GList *cur;
+
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+               summary_set_row_marks(summaryview, GTK_CTREE_NODE(cur->data));
 }
 
 static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
@@ -2475,6 +2568,38 @@ static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
        debug_print(_("Message %d is marked\n"), msginfo->msgnum);
 }
 
+static void summary_lock_row(SummaryView *summaryview, GtkCTreeNode *row)
+{
+       /* almost verbatim summary_mark_row(); may want a menu action? */
+       gboolean changed = FALSE;
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       MsgInfo *msginfo;
+
+       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       if (MSG_IS_DELETED(msginfo->flags))
+               summaryview->deleted--;
+       if (MSG_IS_MOVE(msginfo->flags)) {
+               summaryview->moved--;
+               changed = TRUE;
+       }
+       if (MSG_IS_COPY(msginfo->flags)) {
+               summaryview->copied--;
+               changed = TRUE;
+       }
+       if (changed && !prefs_common.immediate_exec) {
+               msginfo->to_folder->op_count--;
+               if (msginfo->to_folder->op_count == 0)
+                       folderview_update_item(msginfo->to_folder, 0);
+       }
+       msginfo->to_folder = NULL;
+       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_LOCKED);
+       CHANGE_FLAGS(msginfo);
+       summary_set_row_marks(summaryview, row);
+       debug_print(_("Message %d is locked\n"), msginfo->msgnum);
+}
+
 void summary_mark(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -2585,6 +2710,8 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
+       if (MSG_IS_LOCKED(msginfo->flags)) return;
+
        if (MSG_IS_DELETED(msginfo->flags)) return;
 
        if (MSG_IS_MOVE(msginfo->flags)) {
@@ -3231,13 +3358,6 @@ static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
                                                msginfo->msgid))
                        g_hash_table_remove(summaryview->msgid_table,
                                            msginfo->msgid);
-
-               if (msginfo->subject && 
-                   node == subject_table_lookup(summaryview->subject_table, 
-                                               msginfo->subject)) {
-                       gchar *s = msginfo->subject + (g_strncasecmp(msginfo->subject, "Re: ", 4) == 0 ? 4 : 0);
-                       g_hash_table_remove(summaryview->subject_table, s);
-               }                       
        }
 }
 
@@ -3267,24 +3387,25 @@ void summary_thread_build(SummaryView *summaryview)
 
                msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
 
+               parent = NULL;
+
                /* alfons - claws seems to prefer subject threading before
                 * inreplyto threading. we should look more deeply in this,
                 * because inreplyto should have precedence... */
                if (msginfo && msginfo->inreplyto) {
                        parent = g_hash_table_lookup(summaryview->msgid_table,
                                                     msginfo->inreplyto);
-                       if (parent && parent != node) {
-                               gtk_ctree_move(ctree, node, parent, NULL);
-                               gtk_ctree_expand(ctree, node);
-                       }
                }
-               else if (msginfo && msginfo->subject) {
-                       parent = g_hash_table_lookup
-                                       (summaryview->subject_table, msginfo->subject);
-                       if (parent && parent != node) {
-                               gtk_ctree_move(ctree, node, parent, NULL);
-                               gtk_ctree_expand(ctree, node);
-                       }
+
+               if (parent == NULL) {
+                       parent = subject_table_lookup
+                               (summaryview->subject_table,
+                                msginfo->subject);
+               }
+
+               if (parent && parent != node) {
+                       gtk_ctree_move(ctree, node, parent, NULL);
+                       gtk_ctree_expand(ctree, node);
                }
 
                node = next;
@@ -3432,9 +3553,65 @@ static void summary_unthread_for_exec_func(GtkCTree *ctree, GtkCTreeNode *node,
        }
 }
 
+void summary_processing(SummaryView *summaryview, GSList * mlist)
+{
+       GSList * processing_list;
+       FolderItem * folder_item;
+       GSList * cur;
+       gchar * id;
+       gchar * buf;
+
+       folder_item = summaryview->folder_item;
+       if (folder_item == NULL)
+               return;
+
+       processing_list = folder_item->prefs->processing;
+
+       if (processing_list == NULL)
+               return;
+
+       summary_lock(summaryview);
+       
+       buf = g_strdup_printf(_("Processing (%s)..."), folder_item->path);
+       debug_print(buf);
+       STATUSBAR_PUSH(summaryview->mainwin, buf);
+       g_free(buf);
+
+       main_window_cursor_wait(summaryview->mainwin);
+
+       summaryview->folder_table = g_hash_table_new(NULL, NULL);
+
+       for(cur = mlist ; cur != NULL ; cur = cur->next) {
+               MsgInfo * msginfo;
+
+               msginfo = (MsgInfo *) cur->data;
+               filter_msginfo_move_or_delete(processing_list, msginfo,
+                                             summaryview->folder_table);
+       }
+       
+       folder_item_scan_foreach(summaryview->folder_table);
+       folderview_update_item_foreach(summaryview->folder_table);
+       
+       g_hash_table_destroy(summaryview->folder_table);
+       summaryview->folder_table = NULL;
+       
+       if (prefs_common.immediate_exec) {
+               summary_unlock(summaryview);
+               summary_execute(summaryview);
+               summary_lock(summaryview);
+       } else
+               summary_status_show(summaryview);
+
+       debug_print(_("done.\n"));
+       STATUSBAR_POP(summaryview->mainwin);
+       main_window_cursor_normal(summaryview->mainwin);
+
+       summary_unlock(summaryview);
+}
+
 void summary_filter(SummaryView *summaryview)
 {
-       if (!prefs_common.fltlist && !prefs_filtering) {
+       if (!prefs_common.fltlist && !global_processing) {
                alertpanel_error(_("No filter rules defined."));
                return;
        }
@@ -3447,7 +3624,7 @@ void summary_filter(SummaryView *summaryview)
 
        gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
 
-       if (prefs_filtering == NULL) {
+       if (global_processing == NULL) {
                gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
                                        GTK_CTREE_FUNC(summary_filter_func),
                                        summaryview);
@@ -3494,7 +3671,7 @@ static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
        gchar *file;
        FolderItem *dest;
 
-       if (prefs_filtering == NULL) {
+       if (global_processing == NULL) {
                /* old filtering */
                file = procmsg_get_message_file_path(msginfo);
                dest = filter_get_dest_folder(prefs_common.fltlist, file);
@@ -3505,7 +3682,7 @@ static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
                        summary_move_row_to(summaryview, node, dest);
        }
        else
-               filter_msginfo_move_or_delete(prefs_filtering, msginfo,
+               filter_msginfo_move_or_delete(global_processing, msginfo,
                                              summaryview->folder_table);
 }
 
@@ -3699,41 +3876,30 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        GtkWidget *ctree;
        gint *col_pos = summaryview->col_pos;
        SummaryColumnState *col_state;
-       const gchar *titles[N_SUMMARY_COLS];
+       gchar *titles[N_SUMMARY_COLS];
        SummaryColumnType type;
        gint pos;
 
+       memset(titles, 0, sizeof(titles));
+
        col_state = prefs_summary_column_get_config();
        for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
                summaryview->col_state[pos] = col_state[pos];
                type = col_state[pos].type;
                col_pos[type] = pos;
-
-               switch (type) {
-               case S_COL_NUMBER:
-               case S_COL_DATE:
-               case S_COL_FROM:
-               case S_COL_SUBJECT:
-               case S_COL_SCORE:
-                       if (prefs_common.trans_hdr)
-                               titles[pos] = gettext(col_label[type]);
-                       else
-                               titles[pos] = col_label[type];
-                       break;
-               default:
-                       titles[pos] = gettext(col_label[type]);
-               }
        }
        col_state = summaryview->col_state;
 
        ctree = gtk_sctree_new_with_titles
-               (N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], (gchar **)titles);
+               (N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], titles);
 
        gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_EXTENDED);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MARK],
                                           GTK_JUSTIFY_CENTER);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_UNREAD],
                                           GTK_JUSTIFY_CENTER);
+       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
+                                          GTK_JUSTIFY_CENTER);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MIME],
                                           GTK_JUSTIFY_CENTER);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_SIZE],
@@ -3746,6 +3912,8 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                                   SUMMARY_COL_MARK_WIDTH);
        gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_UNREAD],
                                   SUMMARY_COL_UNREAD_WIDTH);
+       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
+                                  SUMMARY_COL_LOCKED_WIDTH);
        gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_MIME],
                                   SUMMARY_COL_MIME_WIDTH);
        gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_SUBJECT],
@@ -3795,6 +3963,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_FROM   , summary_from_clicked);
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SUBJECT, summary_subject_clicked);
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SCORE,   summary_score_clicked);
+       CLIST_BUTTON_SIGNAL_CONNECT(S_COL_LOCKED,  summary_locked_clicked);
 
 #undef CLIST_BUTTON_SIGNAL_CONNECT
 
@@ -4001,7 +4170,6 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
                break;
        case GDK_BackSpace:     /* Page up */
-       case GDK_Delete:
                textview_scroll_page(summaryview->messageview->textview, TRUE);
                break;
        case GDK_p:             /* Prev */
@@ -4035,6 +4203,7 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                summary_mark_as_unread(summaryview);
                break;
        case GDK_d:             /* Delete */
+       case GDK_Delete:
                RETURN_IF_LOCKED();
                BREAK_ON_MODIFIER_KEY();
                summary_delete(summaryview);
@@ -4153,6 +4322,15 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                        summary_status_show(summaryview);
                }
                break;
+       case S_COL_LOCKED:
+               if (MSG_IS_LOCKED(msginfo->flags)) {
+                       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_LOCKED);
+                       CHANGE_FLAGS(msginfo);
+                       summary_set_row_marks(summaryview, row);
+               }
+               else
+                       summary_lock_row(summaryview, row);
+               break;
        default:
                break;
        }
@@ -4234,6 +4412,9 @@ static void summary_reply_cb(SummaryView *summaryview, guint action,
                        g_slist_free(msginfo_list);
                }                       
                break;
+       case COMPOSE_BOUNCE:
+               compose_bounce(NULL, msginfo);
+               break;
        default:
                g_warning("summary_reply_cb(): invalid action: %d\n", action);
        }
@@ -4285,6 +4466,12 @@ static void summary_score_clicked(GtkWidget *button,
        summary_sort(summaryview, SORT_BY_SCORE);
 }
 
+static void summary_locked_clicked(GtkWidget *button,
+                                 SummaryView *summaryview)
+{
+       summary_sort(summaryview, SORT_BY_LOCKED);
+}
+
 static void summary_size_clicked(GtkWidget *button, SummaryView *summaryview)
 {
        summary_sort(summaryview, SORT_BY_SIZE);
@@ -4482,6 +4669,15 @@ static gint summary_cmp_by_score(GtkCList *clist,
                return summary_cmp_by_date(clist, ptr1, ptr2);
 }
 
+static gint summary_cmp_by_locked(GtkCList *clist,
+                                 gconstpointer ptr1, gconstpointer ptr2)
+{
+       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
+       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+
+       return MSG_IS_LOCKED(msginfo1->flags) - MSG_IS_LOCKED(msginfo2->flags);
+}
+
 static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpointer data)
 {
        SummaryView *summaryview = (SummaryView *) data;
@@ -4543,6 +4739,68 @@ static void summary_unignore_thread(SummaryView *summaryview)
 
        summary_status_show(summaryview);
 }
+
+
+static gboolean processing_apply_func(GNode *node, gpointer data)
+{
+       FolderItem *item;
+       GSList * processing;
+       SummaryView * summaryview = (SummaryView *) data;
+       
+       if (node == NULL)
+               return FALSE;
+
+       item = node->data;
+       /* prevent from the warning */
+       if (item->path == NULL)
+               return FALSE;
+       processing = item->prefs->processing;
+
+       if (processing != NULL) {
+               gchar * buf;
+               GSList * mlist;
+               GSList * cur;
+
+               buf = g_strdup_printf(_("Processing (%s)..."), item->path);
+               debug_print(buf);
+               STATUSBAR_PUSH(summaryview->mainwin, buf);
+               g_free(buf);
+
+               mlist = item->folder->get_msg_list(item->folder, item,
+                                                  TRUE);
+               
+               for(cur = mlist ; cur != NULL ; cur = cur->next) {
+                       MsgInfo * msginfo;
+                       
+                       msginfo = (MsgInfo *) cur->data;
+                       filter_msginfo_move_or_delete(processing, msginfo,
+                                                     NULL);
+                       procmsg_msginfo_free(msginfo);
+               }
+
+               g_slist_free(mlist);
+               
+               STATUSBAR_POP(summaryview->mainwin);
+       }
+
+
+       return FALSE;
+}
+
+void processing_apply(SummaryView * summaryview)
+{
+       GList * cur;
+
+       for (cur = folder_get_list() ; cur != NULL ; cur = g_list_next(cur)) {
+               Folder *folder;
+
+               folder = (Folder *) cur->data;
+               g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+                               processing_apply_func, summaryview);
+       }
+}
+
+
 /*
  * End of Source.
  */