GTK2 fixes
[claws.git] / src / summaryview.c
index f55298bc7dad4edd89fd7686ed6019250883c969..8c4eeec0ca44dc352e588d377797a3c78b7f78e3 100644 (file)
@@ -2,7 +2,7 @@
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
  * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software; you can redistributte it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
@@ -74,7 +74,6 @@
 #include "imap.h"
 #include "addressbook.h"
 #include "addr_compl.h"
-#include "scoring.h"
 #include "folder_item_prefs.h"
 #include "filtering.h"
 #include "string_match.h"
 #include "matcher_parser.h"
 #include "hooks.h"
 #include "description_window.h"
-#include "folder.h"
 
 #define SUMMARY_COL_MARK_WIDTH         10
 #define SUMMARY_COL_STATUS_WIDTH       13
 #define SUMMARY_COL_LOCKED_WIDTH       13
 #define SUMMARY_COL_MIME_WIDTH         11
 
-static GdkFont *boldfont;
-static GdkFont *smallfont;
 
 static GtkStyle *bold_style;
 static GtkStyle *bold_marked_style;
@@ -257,21 +253,22 @@ static GtkWidget *summary_ctree_create    (SummaryView    *summaryview);
 static gint summary_toggle_pressed     (GtkWidget              *eventbox,
                                         GdkEventButton         *event,
                                         SummaryView            *summaryview);
-static void summary_button_pressed     (GtkWidget              *ctree,
+static gboolean summary_button_pressed (GtkWidget              *ctree,
                                         GdkEventButton         *event,
                                         SummaryView            *summaryview);
-static void summary_button_released    (GtkWidget              *ctree,
+static gboolean summary_button_released        (GtkWidget              *ctree,
                                         GdkEventButton         *event,
                                         SummaryView            *summaryview);
-static gint summary_key_pressed                (GtkWidget              *ctree,
+static gboolean summary_key_pressed    (GtkWidget              *ctree,
                                         GdkEventKey            *event,
                                         SummaryView            *summaryview);
-static gint summary_searchbar_pressed  (GtkWidget              *ctree,
+static gboolean summary_searchbar_pressed
+                                       (GtkWidget              *ctree,
                                         GdkEventKey            *event,
                                         SummaryView            *summaryview);
-static void summary_searchbar_focus_evt        (GtkWidget              *ctree,
-                                        GdkEventFocus          *event,
-                                        SummaryView            *summaryview);
+static gboolean summary_searchbar_focus_evt    (GtkWidget              *ctree,
+                                                GdkEventFocus          *event,
+                                                SummaryView            *summaryview);
 static void summary_searchtype_changed (GtkMenuItem            *widget, 
                                         gpointer                data);
 static void summary_open_row           (GtkSCTree              *sctree,
@@ -306,6 +303,9 @@ static void summary_add_address_cb  (SummaryView            *summaryview,
 static void summary_create_filter_cb   (SummaryView            *summaryview,
                                         guint                   action,
                                         GtkWidget              *widget);
+static void summary_create_processing_cb(SummaryView           *summaryview,
+                                        guint                   action,
+                                        GtkWidget              *widget);
 
 static void summary_mark_clicked       (GtkWidget              *button,
                                         SummaryView            *summaryview);
@@ -445,6 +445,15 @@ static GtkItemFactoryEntry summary_popup_entries[] =
                                        NULL, summary_create_filter_cb, FILTER_BY_TO, NULL},
        {N_("/Create f_ilter rule/by _Subject"),
                                        NULL, summary_create_filter_cb, FILTER_BY_SUBJECT, NULL},
+       {N_("/Create processing rule"), NULL, NULL,             0, "<Branch>"},
+       {N_("/Create processing rule/_Automatically"),
+                                       NULL, summary_create_processing_cb, FILTER_BY_AUTO, NULL},
+       {N_("/Create processing rule/by _From"),
+                                       NULL, summary_create_processing_cb, FILTER_BY_FROM, NULL},
+       {N_("/Create processing rule/by _To"),
+                                       NULL, summary_create_processing_cb, FILTER_BY_TO, NULL},
+       {N_("/Create processing rule/by _Subject"),
+                                       NULL, summary_create_processing_cb, FILTER_BY_SUBJECT, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_View"),                  NULL, NULL,             0, "<Branch>"},
        {N_("/_View/Open in new _window"),
@@ -479,8 +488,8 @@ static const gchar *const col_label[N_SUMMARY_COLS] = {
  */
 static gchar *search_descr_strings[] = {
        "a",     N_("all messages"),
-       "ag #",  N_("messages whose age is greather than #"),
-       "al #",  N_("messages whose age is greather than #"),
+       "ag #",  N_("messages whose age is greater than #"),
+       "al #",  N_("messages whose age is less than #"),
        "b S",   N_("messages which contain S in the message body"),
        "B S",   N_("messages which contain S in the whole message"),
        "c S",   N_("messages carbon-copied to S"),
@@ -510,6 +519,7 @@ static gchar *search_descr_strings[] = {
        "T",     N_("marked messages"),
        "U",     N_("unread messages"),
        "x S",   N_("messages which contain S in References header"),
+       "X cmd", N_("messages returning 0 when passed to command"),
        "y S",   N_("messages which contain S in X-Label header"),
         "",     "" ,
        "&",     N_("logical AND operator"),
@@ -589,9 +599,9 @@ SummaryView *summary_create(void)
        gtk_box_pack_end(GTK_BOX(hbox), toggle_eventbox, FALSE, FALSE, 4);
        toggle_arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
        gtk_container_add(GTK_CONTAINER(toggle_eventbox), toggle_arrow);
-       gtk_signal_connect(GTK_OBJECT(toggle_eventbox), "button_press_event",
-                          GTK_SIGNAL_FUNC(summary_toggle_pressed),
-                          summaryview);
+       g_signal_connect(G_OBJECT(toggle_eventbox), "button_press_event",
+                        G_CALLBACK(summary_toggle_pressed),
+                        summaryview);
        
        
        statlabel_msgs = gtk_label_new("");
@@ -605,7 +615,7 @@ SummaryView *summary_create(void)
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_ALWAYS);
        gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
-       gtk_widget_set_usize(vbox,
+       gtk_widget_set_size_request(vbox,
                             prefs_common.summaryview_width,
                             prefs_common.summaryview_height);
 
@@ -630,21 +640,21 @@ SummaryView *summary_create(void)
 
        search_type = gtk_menu_new();
        MENUITEM_ADD (search_type, menuitem, _("Subject"), S_SEARCH_SUBJECT);
-       gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
-                          GTK_SIGNAL_FUNC(summary_searchtype_changed),
-                          summaryview);
+       g_signal_connect(G_OBJECT(menuitem), "activate",
+                        G_CALLBACK(summary_searchtype_changed),
+                        summaryview);
        MENUITEM_ADD (search_type, menuitem, _("From"), S_SEARCH_FROM);
-       gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
-                          GTK_SIGNAL_FUNC(summary_searchtype_changed),
-                          summaryview);
+       g_signal_connect(G_OBJECT(menuitem), "activate",
+                        G_CALLBACK(summary_searchtype_changed),
+                        summaryview);
        MENUITEM_ADD (search_type, menuitem, _("To"), S_SEARCH_TO);
-       gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
-                          GTK_SIGNAL_FUNC(summary_searchtype_changed),
-                          summaryview);
+       g_signal_connect(G_OBJECT(menuitem), "activate",
+                        G_CALLBACK(summary_searchtype_changed),
+                        summaryview);
        MENUITEM_ADD (search_type, menuitem, _("Extended"), S_SEARCH_EXTENDED);
-       gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
-                          GTK_SIGNAL_FUNC(summary_searchtype_changed),
-                          summaryview);
+       g_signal_connect(G_OBJECT(menuitem), "activate",
+                        G_CALLBACK(summary_searchtype_changed),
+                        summaryview);
 
        gtk_option_menu_set_menu(GTK_OPTION_MENU(search_type_opt), search_type);
        
@@ -658,27 +668,27 @@ SummaryView *summary_create(void)
        
        gtkut_button_set_create(&search_hbbox, &search_description, _("Extended Symbols"),
                                NULL, NULL, NULL, NULL);
-       gtk_signal_connect(GTK_OBJECT(search_description), "clicked",
-                          GTK_SIGNAL_FUNC(search_description_cb), NULL);
+       g_signal_connect(G_OBJECT(search_description), "clicked",
+                        G_CALLBACK(search_description_cb), NULL);
        gtk_box_pack_start(GTK_BOX(hbox_search), search_hbbox, FALSE, FALSE, 2);
                                
        gtk_widget_show(search_string);
        gtk_widget_show(hbox_search);
 
-       gtk_signal_connect(GTK_OBJECT(search_string), "key_press_event",
-                          GTK_SIGNAL_FUNC(summary_searchbar_pressed),
-                          summaryview);
+       g_signal_connect(G_OBJECT(search_string), "key_press_event",
+                        G_CALLBACK(summary_searchbar_pressed),
+                        summaryview);
 
-       gtk_signal_connect(GTK_OBJECT(search_string), "focus_in_event",
-                          GTK_SIGNAL_FUNC(summary_searchbar_focus_evt),
-                          summaryview);
+       g_signal_connect(G_OBJECT(search_string), "focus_in_event",
+                        G_CALLBACK(summary_searchbar_focus_evt),
+                        summaryview);
 
-       gtk_signal_connect(GTK_OBJECT(search_string), "focus_out_event",
-                          GTK_SIGNAL_FUNC(summary_searchbar_focus_evt),
-                          summaryview);
+       g_signal_connect(G_OBJECT(search_string), "focus_out_event",
+                        G_CALLBACK(summary_searchbar_focus_evt),
+                        summaryview);
 
-       gtk_signal_connect (GTK_OBJECT(toggle_search), "toggled",
-                        GTK_SIGNAL_FUNC(tog_searchbar_cb), summaryview);
+       g_signal_connect (G_OBJECT(toggle_search), "toggled",
+                         G_CALLBACK(tog_searchbar_cb), summaryview);
 
        /* create popup menu */
        n_entries = sizeof(summary_popup_entries) /
@@ -722,9 +732,12 @@ SummaryView *summary_create(void)
 
 void summary_init(SummaryView *summaryview)
 {
+       static GdkFont *boldfont = NULL;
+       static GdkFont *smallfont = NULL;
        GtkStyle *style;
        GtkWidget *pixmap;
 
+       gtk_widget_realize(summaryview->ctree);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MARK,
                         &markxpm, &markxpmmask);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_DELETED,
@@ -751,11 +764,18 @@ void summary_init(SummaryView *summaryview)
                         &gpgsignedxpm, &gpgsignedxpmmask);
 
        if (!small_style) {
+               PangoFontDescription *font_desc = NULL;
+
                small_style = gtk_style_copy
                        (gtk_widget_get_style(summaryview->ctree));
-               if (!smallfont)
-                       smallfont = gtkut_font_load(SMALL_FONT);
-               small_style->font = smallfont;
+               if (SMALL_FONT)
+                       font_desc = pango_font_description_from_string
+                                               (SMALL_FONT);
+               if (font_desc) {
+                       if (small_style->font_desc)
+                               pango_font_description_free(small_style->font_desc);
+                       small_style->font_desc = font_desc;
+               }
                small_marked_style = gtk_style_copy(small_style);
                small_marked_style->fg[GTK_STATE_NORMAL] =
                        summaryview->color_marked;
@@ -764,11 +784,18 @@ void summary_init(SummaryView *summaryview)
                        summaryview->color_dim;
        }
        if (!bold_style) {
+               PangoFontDescription *font_desc = NULL;
                bold_style = gtk_style_copy
                        (gtk_widget_get_style(summaryview->ctree));
-               if (!boldfont)
-                       boldfont = gtkut_font_load(BOLD_FONT);
-               bold_style->font = boldfont;
+               if (BOLD_FONT)
+                       font_desc = pango_font_description_from_string
+                                               (BOLD_FONT);
+               if (font_desc) {
+                       if (bold_style->font_desc)
+                               pango_font_description_free
+                                       (bold_style->font_desc);
+                       bold_style->font_desc = font_desc;
+               }
                bold_marked_style = gtk_style_copy(bold_style);
                bold_marked_style->fg[GTK_STATE_NORMAL] =
                        summaryview->color_marked;
@@ -779,7 +806,6 @@ void summary_init(SummaryView *summaryview)
 
        style = gtk_style_copy(gtk_widget_get_style
                                (summaryview->statlabel_folder));
-
        gtk_widget_set_style(summaryview->statlabel_folder, style);
        gtk_widget_set_style(summaryview->statlabel_select, style);
        gtk_widget_set_style(summaryview->statlabel_msgs, style);
@@ -809,6 +835,7 @@ void summary_init(SummaryView *summaryview)
 
 }
 
+#if 0
 GtkCTreeNode * summary_find_next_important_score(SummaryView *summaryview,
                                                 GtkCTreeNode *current_node)
 {
@@ -870,6 +897,7 @@ GtkCTreeNode * summary_find_prev_important_score(SummaryView *summaryview,
        else
                return best_node;
 }
+#endif
 
 #define CURRENTLY_DISPLAYED(m) \
 ( (m->msgnum == displayed_msgnum) \
@@ -885,6 +913,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        guint selected_msgnum = 0;
        guint displayed_msgnum = 0;
        GSList *cur;
+        GSList *not_killed;
 
        if (summary_is_locked(summaryview)) return FALSE;
 
@@ -932,16 +961,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        summary_clear_list(summaryview);
        summary_set_column_titles(summaryview);
-       if (!is_refresh)
-               messageview_clear(summaryview->messageview);
 
        buf = NULL;
        if (!item || !item->path || !item->parent || item->no_select) {
                g_free(buf);
                debug_print("empty folder\n\n");
                summary_set_hide_read_msgs_menu(summaryview, FALSE);
-               if (is_refresh)
-                       messageview_clear(summaryview->messageview);
                summary_clear_all(summaryview);
                summaryview->folder_item = item;
                gtk_clist_thaw(GTK_CLIST(ctree));
@@ -951,6 +976,9 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        }
        g_free(buf);
 
+       if (!is_refresh)
+               messageview_clear(summaryview->messageview);
+
        summaryview->folder_item = item;
        item->opened = TRUE;
 
@@ -971,19 +999,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        BY OTHER PROGRAMS TO THE FOLDER
 */
        mlist = folder_item_get_msg_list(item);
-#if 0
-       summary_processing(summaryview, mlist);
-#endif
-       for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
-               MsgInfo * msginfo = (MsgInfo *) cur->data;
-
-               msginfo->score = score_message(global_scoring, msginfo);
-               if (msginfo->score != MAX_SCORE &&
-                   msginfo->score != MIN_SCORE) {
-                       msginfo->score += score_message(item->prefs->scoring,
-                                                       msginfo);
-               }
-       }
 
        if (summaryview->folder_item->hide_read_msgs) {
                GSList *not_killed;
@@ -1010,10 +1025,10 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        if (strlen(gtk_entry_get_text(GTK_ENTRY(summaryview->search_string))) > 0) {
                GSList *not_killed;
-               gint search_type = GPOINTER_TO_INT(gtk_object_get_user_data(
+               gint search_type = GPOINTER_TO_INT(g_object_get_data(
                                   GTK_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
-                                  GTK_MENU(summaryview->search_type))))));
-               gchar *search_string = gtk_entry_get_text(GTK_ENTRY(summaryview->search_string));
+                                  GTK_MENU(summaryview->search_type)))), MENU_VAL_ID));
+               const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(summaryview->search_string));
                gchar *searched_header = NULL;
                MatcherList * tmp_list = NULL;
                
@@ -1069,7 +1084,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                g_slist_free(mlist);
                mlist = not_killed;
        }
-       
+
+#if 0  
        if ((global_scoring || item->prefs->scoring)) {
                GSList *not_killed;
                gint kill_score;
@@ -1089,12 +1105,23 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                g_slist_free(mlist);
                mlist = not_killed;
        }
+#endif
+        not_killed = NULL;
+        for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
+                MsgInfo * msginfo = (MsgInfo *) cur->data;
+                
+                if (!msginfo->hidden)
+                        not_killed = g_slist_prepend(not_killed, msginfo);
+                else
+                        procmsg_msginfo_free(msginfo);
+        }
+        g_slist_free(mlist);
+        mlist = not_killed;
 
        STATUSBAR_POP(summaryview->mainwin);
 
-       /* set ctree and hash table from the msginfo list
-          creating thread, and count the number of messages */
-       
+       /* set ctree and hash table from the msginfo list, and
+          create the thread */
        summary_set_ctree_from_list(summaryview, mlist);
 
        g_slist_free(mlist);
@@ -1127,10 +1154,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                }
        } else {
                /* select first unread message */
+#if 0
                if (summaryview->sort_key == SORT_BY_SCORE)
                        node = summary_find_next_important_score(summaryview,
                                                                 NULL);
                else
+#endif
                node = summary_find_next_flagged_msg(summaryview, NULL,
                                                     MSG_UNREAD, FALSE);
                if (node == NULL && GTK_CLIST(ctree)->row_list != NULL) {
@@ -1142,7 +1171,9 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                if (prefs_common.open_unread_on_enter ||
                    prefs_common.always_show_msg) {
                        summary_unlock(summaryview);
-                       summary_select_node(summaryview, node, TRUE, TRUE);
+                       summary_select_node(summaryview, node, 
+                                           messageview_is_visible(summaryview->messageview), 
+                                           TRUE);
                        summary_lock(summaryview);
                } else
                        summary_select_node(summaryview, node, FALSE, TRUE);
@@ -1182,12 +1213,11 @@ void summary_clear_list(SummaryView *summaryview)
 
        summaryview->display_msg = FALSE;
 
-       summaryview->selected  = NULL;
+       summaryview->selected = NULL;
        summaryview->displayed = NULL;
-       summaryview->newmsgs   = summaryview->unread     = 0;
-       summaryview->messages  = summaryview->total_size = 0;
-       summaryview->deleted   = summaryview->moved      = 0;
-       summaryview->copied    = 0;
+       summaryview->total_size = 0;
+       summaryview->deleted = summaryview->moved = 0;
+       summaryview->copied = 0;
        if (summaryview->msgid_table) {
                g_hash_table_destroy(summaryview->msgid_table);
                summaryview->msgid_table = NULL;
@@ -1212,6 +1242,7 @@ void summary_clear_list(SummaryView *summaryview)
 
 void summary_clear_all(SummaryView *summaryview)
 {
+       messageview_clear(summaryview->messageview);
        summary_clear_list(summaryview);
        summary_set_menu_sensitive(summaryview);
        toolbar_main_set_sensitive(summaryview->mainwin);
@@ -1254,15 +1285,32 @@ SummarySelection summary_get_selection_type(SummaryView *summaryview)
 GSList *summary_get_selected_msg_list(SummaryView *summaryview)
 {
        GSList *mlist = NULL;
-       GList *row_list;
        GList *cur;
        MsgInfo *msginfo;
 
-       row_list = GTK_CLIST(summaryview->ctree)->selection;
-       for (cur = row_list; cur != NULL; cur = cur->next) {
-               msginfo = gtk_ctree_node_get_row_data
-                       (GTK_CTREE(summaryview->ctree),
-                        GTK_CTREE_NODE(cur->data));
+       for (cur = GTK_CLIST(summaryview->ctree)->selection; cur != NULL;
+            cur = cur->next) {
+               msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(cur->data);
+               mlist = g_slist_prepend(mlist, msginfo);
+       }
+
+       mlist = g_slist_reverse(mlist);
+
+       return mlist;
+}
+
+GSList *summary_get_msg_list(SummaryView *summaryview)
+{
+       GSList *mlist = NULL;
+       GtkCTree *ctree;
+       GtkCTreeNode *node;
+       MsgInfo *msginfo;
+
+       ctree = GTK_CTREE(summaryview->ctree);
+
+       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+            node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
+               msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
                mlist = g_slist_prepend(mlist, msginfo);
        }
 
@@ -1274,91 +1322,76 @@ GSList *summary_get_selected_msg_list(SummaryView *summaryview)
 static void summary_set_menu_sensitive(SummaryView *summaryview)
 {
        GtkItemFactory *ifactory = summaryview->popupfactory;
-       SummarySelection selection;
+       SensitiveCond state;
+       gboolean sensitive;
        GtkWidget *menuitem;
-       gboolean sens;
+       gint i;
+
+       static const struct {
+               gchar *const entry;
+               SensitiveCond cond;
+       } entry[] = {
+               {"/Reply"                       , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Reply to"                    , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Reply to/all"                , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Reply to/sender"             , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Reply to/mailing list"       , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Follow-up and reply to"      , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
+
+               {"/Forward"                     , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+               {"/Redirect"                    , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+
+               {"/Re-edit"                     , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
+
+               {"/Move..."                     , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+               {"/Copy..."                     , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Delete"                      , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+               {"/Cancel a news message"       , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
+               {"/Execute"                     , M_DELAY_EXEC},
+
+               {"/Mark"                        , M_TARGET_EXIST},
+               {"/Mark/Mark"                   , M_TARGET_EXIST},
+               {"/Mark/Unmark"                 , M_TARGET_EXIST},
+               {"/Mark/Mark as unread"         , M_TARGET_EXIST},
+               {"/Mark/Mark all read"          , M_TARGET_EXIST},
+               {"/Mark/Ignore thread"          , M_TARGET_EXIST},
+               {"/Mark/Lock"                   , M_TARGET_EXIST},
+               {"/Mark/Unlock"                 , M_TARGET_EXIST},
+               {"/Color label"                 , M_TARGET_EXIST},
+
+               {"/Add sender to address book"  , M_SINGLE_TARGET_EXIST},
+               {"/Create filter rule"          , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+               {"/Create processing rule"      , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+
+               {"/View"                        , M_SINGLE_TARGET_EXIST},
+               {"/View/Open in new window"     , M_SINGLE_TARGET_EXIST},
+               {"/View/Source"                 , M_SINGLE_TARGET_EXIST},
+               {"/View/All header"             , M_SINGLE_TARGET_EXIST},
+
+               {"/Save as..."                  , M_TARGET_EXIST|M_UNLOCKED},
+               {"/Print..."                    , M_TARGET_EXIST|M_UNLOCKED},
+
+               {"/Select thread"               , M_SINGLE_TARGET_EXIST},
+               {"/Select all"                  , M_TARGET_EXIST},
+
+               {NULL, 0}
+       };
 
-       selection = summary_get_selection_type(summaryview);
        main_window_set_menu_sensitive(summaryview->mainwin);
 
-       if (selection == SUMMARY_NONE) {
-               GtkWidget *submenu;
+       state = main_window_get_current_state(summaryview->mainwin);
 
-               submenu = gtk_item_factory_get_widget
-                       (summaryview->popupfactory, "/Mark");
-               menu_set_insensitive_all(GTK_MENU_SHELL(submenu));
-               menu_set_insensitive_all
-                       (GTK_MENU_SHELL(summaryview->popupmenu));
-               return;
+       for (i = 0; entry[i].entry != NULL; i++) {
+               sensitive = ((entry[i].cond & state) == entry[i].cond);
+               menu_set_sensitive(ifactory, entry[i].entry, sensitive);
        }
 
-       if (FOLDER_TYPE(summaryview->folder_item->folder) != F_NEWS)
-               menu_set_sensitive(ifactory, "/Move...", TRUE);
-       else
-               menu_set_sensitive(ifactory, "/Move...", FALSE);
-
-#if 0
-       menu_set_sensitive(ifactory, "/Delete", TRUE);
-#endif
-       menu_set_sensitive(ifactory, "/Copy...", TRUE);
-       menu_set_sensitive(ifactory, "/Execute", TRUE);
-
-       menu_set_sensitive(ifactory, "/Mark", TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Mark",   TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Unmark", TRUE);
-
-       menu_set_sensitive(ifactory, "/Mark/Mark as unread", TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Mark as read",   TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Mark all read", TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Ignore thread",   TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Unignore thread", TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Lock", TRUE);
-       menu_set_sensitive(ifactory, "/Mark/Unlock", TRUE);
-
-       menu_set_sensitive(ifactory, "/Color label", TRUE);
-
-       sens = (selection == SUMMARY_SELECTED_MULTIPLE) ? FALSE : TRUE;
-       menu_set_sensitive(ifactory, "/Reply",                    sens);
-       menu_set_sensitive(ifactory, "/Reply to",                 sens);
-       menu_set_sensitive(ifactory, "/Reply to/all",             sens);
-       menu_set_sensitive(ifactory, "/Reply to/sender",          sens);
-       menu_set_sensitive(ifactory, "/Reply to/mailing list",    sens);
-       menu_set_sensitive(ifactory, "/Forward",                  TRUE);
-       menu_set_sensitive(ifactory, "/Redirect",                 sens);
-
-       menu_set_sensitive(ifactory, "/Add sender to address book", sens);
-       menu_set_sensitive(ifactory, "/Create filter rule",         sens);
-
-       menu_set_sensitive(ifactory, "/View", sens);
-       menu_set_sensitive(ifactory, "/View/Open in new window", sens);
-       menu_set_sensitive(ifactory, "/View/Source", sens);
-       menu_set_sensitive(ifactory, "/View/All header", sens);
-       if (summaryview->folder_item->stype == F_OUTBOX ||
-           summaryview->folder_item->stype == F_DRAFT  ||
-           summaryview->folder_item->stype == F_QUEUE)
-               menu_set_sensitive(ifactory, "/Re-edit", sens);
-       else
-               menu_set_sensitive(ifactory, "/Re-edit", FALSE);
-
-       menu_set_sensitive(ifactory, "/Save as...", TRUE);
-       menu_set_sensitive(ifactory, "/Print...",   TRUE);
-
-       menu_set_sensitive(ifactory, "/Select all", TRUE);
-       menu_set_sensitive(ifactory, "/Select thread", sens);
-       if (summaryview->folder_item->folder->account)
-               sens = summaryview->folder_item->folder->account->protocol
-                       == A_NNTP;
-       else
-               sens = FALSE;
-       menu_set_sensitive(ifactory, "/Follow-up and reply to", sens);
-       menu_set_sensitive(ifactory, "/Cancel a news message", sens);
-       menu_set_sensitive(ifactory, "/Delete", !sens);
 
        summary_lock(summaryview);
        menuitem = gtk_item_factory_get_widget(ifactory, "/View/All header");
        gtk_check_menu_item_set_active
                (GTK_CHECK_MENU_ITEM(menuitem),
-                summaryview->messageview->textview->show_all_headers);
+                summaryview->messageview->mimeview->textview->show_all_headers);
        summary_unlock(summaryview);
 }
 
@@ -1435,10 +1468,7 @@ void summary_select_next_unread(SummaryView *summaryview)
                        }
 
                        if (val == G_ALERTDEFAULT) {
-                               if (gtk_signal_n_emissions_by_name
-                                       (GTK_OBJECT(ctree), "key_press_event") > 0)
-                                               gtk_signal_emit_stop_by_name
-                                                       (GTK_OBJECT(ctree),
+                               gtk_signal_emit_stop_by_name(GTK_OBJECT(ctree),
                                                         "key_press_event");
                                folderview_select_next_unread(summaryview->folderview);
                                return;
@@ -1490,12 +1520,15 @@ void summary_select_next_new(SummaryView *summaryview)
                                   "Go to next folder?"),
                                 _("Yes"), _("Search again"), _("No"));
                if (val == G_ALERTDEFAULT) {
+#warning FIXME_GTK2
+#if 0
                        if (gtk_signal_n_emissions_by_name
                                (GTK_OBJECT(ctree), "key_press_event") > 0)
                                        gtk_signal_emit_stop_by_name
                                                (GTK_OBJECT(ctree),
                                                 "key_press_event");
                        folderview_select_next_unread(summaryview->folderview);
+#endif
                        return;
                } else if (val == G_ALERTALTERNATE)
                        node = NULL;
@@ -1873,13 +1906,10 @@ static void summary_set_marks_func(GtkCTree *ctree, GtkCTreeNode *node,
 
        msginfo = gtk_ctree_node_get_row_data(ctree, node);
 
-       if (MSG_IS_NEWS(msginfo->flags))
+       if (msginfo->folder && msginfo->folder->folder &&
+           msginfo->folder->folder->klass->type == F_NEWS)
                news_flag_crosspost(msginfo);
 
-       if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-               summaryview->newmsgs++;
-       if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-               summaryview->unread++;
        if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
        && procmsg_msg_has_marked_parent(msginfo))
                summaryview->unreadmarked++;
@@ -1887,7 +1917,6 @@ static void summary_set_marks_func(GtkCTree *ctree, GtkCTreeNode *node,
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted++;
 
-       summaryview->messages++;
        summaryview->total_size += msginfo->size;
 
        summary_set_row_marks(summaryview, node);
@@ -1899,18 +1928,13 @@ static void summary_update_status(SummaryView *summaryview)
        GtkCTreeNode *node;
        MsgInfo *msginfo;
 
-       summaryview->newmsgs = summaryview->unread =
-       summaryview->messages = summaryview->total_size =
+       summaryview->total_size =
        summaryview->deleted = summaryview->moved = summaryview->copied = 0;
 
        for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
             node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
 
-               if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-                       summaryview->newmsgs++;
-               if (MSG_IS_UNREAD(msginfo->flags)&& !MSG_IS_IGNORE_THREAD(msginfo->flags))
-                       summaryview->unread++;
                if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
                && procmsg_msg_has_marked_parent(msginfo))
                        summaryview->unreadmarked++;
@@ -1920,7 +1944,6 @@ static void summary_update_status(SummaryView *summaryview)
                        summaryview->moved++;
                if (MSG_IS_COPY(msginfo->flags))
                        summaryview->copied++;
-               summaryview->messages++;
                summaryview->total_size += msginfo->size;
        }
 }
@@ -1939,9 +1962,9 @@ static void summary_status_show(SummaryView *summaryview)
        gchar *name;
 
        if (!summaryview->folder_item) {
-               gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), "");
-               gtk_label_set(GTK_LABEL(summaryview->statlabel_select), "");
-               gtk_label_set(GTK_LABEL(summaryview->statlabel_msgs),   "");
+               gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), "");
+               gtk_label_set_text(GTK_LABEL(summaryview->statlabel_select), "");
+               gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs),   "");
                return;
        }
 
@@ -1959,7 +1982,7 @@ static void summary_status_show(SummaryView *summaryview)
        }
 
        name = folder_item_get_name(summaryview->folder_item);
-       gtk_label_set(GTK_LABEL(summaryview->statlabel_folder), name);
+       gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), name);
        g_free(name);
 
        if (summaryview->deleted)
@@ -1998,7 +2021,7 @@ static void summary_status_show(SummaryView *summaryview)
                
        str = g_strconcat(n_selected ? itos(n_selected) : "",
                                        itstr, sel, spc, del, mv, cp, NULL);
-       gtk_label_set(GTK_LABEL(summaryview->statlabel_select), str);
+       gtk_label_set_text(GTK_LABEL(summaryview->statlabel_select), str);
        g_free(str);
        g_free(sel);
        g_free(del);
@@ -2007,12 +2030,12 @@ static void summary_status_show(SummaryView *summaryview)
        g_free(itstr);
 
        str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
-                             summaryview->newmsgs,
-                             summaryview->unread,
-                             summaryview->messages,
-                             to_human_readable(summaryview->total_size));
 
-       gtk_label_set(GTK_LABEL(summaryview->statlabel_msgs), str);
+                                     summaryview->folder_item->new_msgs,
+                                     summaryview->folder_item->unread_msgs,
+                                     summaryview->folder_item->total_msgs,
+                                     to_human_readable(summaryview->total_size));
+       gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
        g_free(str);
 }
 
@@ -2069,7 +2092,7 @@ static void summary_set_column_titles(SummaryView *summaryview)
                }
 
                if (type == S_COL_MIME) {
-                       label = gtk_pixmap_new(clipxpm, clipxpmmask);
+                       label = gtk_image_new_from_pixmap(clipxpm, clipxpmmask);
                        gtk_widget_show(label);
                        gtk_clist_set_column_widget(clist, pos, label);
                        continue;
@@ -2163,8 +2186,7 @@ void summary_sort(SummaryView *summaryview,
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_locked;
                break;
        case SORT_BY_NONE:
-               cmp_func = NULL;
-               return;
+               break;
        default:
                return;
        }
@@ -2174,6 +2196,11 @@ void summary_sort(SummaryView *summaryview,
 
        summary_set_column_titles(summaryview);
        summary_set_menu_sensitive(summaryview);
+
+       /* allow fallback to don't sort */
+       if (summaryview->sort_key == SORT_BY_NONE)
+               return;
+
        if(cmp_func != NULL) {
                debug_print("Sorting summary...");
                STATUSBAR_PUSH(summaryview->mainwin, _("Sorting summary..."));
@@ -2438,7 +2465,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
        MsgFlags flags;
-       gchar *filename;
+       gint val;
 
        if (!new_window) {
                if (summaryview->displayed == row)
@@ -2457,37 +2484,11 @@ static void summary_display_msg_full(SummaryView *summaryview,
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
-       filename = procmsg_get_message_file(msginfo);
-       if (!filename) {
-               summary_unlock(summaryview);
-               return;
-       }
-       g_free(filename);
-
-       if (new_window || !prefs_common.mark_as_read_on_new_window) {
-               if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-                       summaryview->newmsgs--;
-               if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-                       summaryview->unread--;
-               if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags) 
-               && procmsg_msg_has_marked_parent(msginfo))
-                       summaryview->unreadmarked--;
-               if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
-                       procmsg_msginfo_unset_flags
-                               (msginfo, MSG_NEW | MSG_UNREAD, 0);
-                       summary_set_row_marks(summaryview, row);
-                       gtk_clist_thaw(GTK_CLIST(ctree));
-                       summary_status_show(summaryview);
-                       
-                       flags = msginfo->flags;
-               }
-       }
-
        if (new_window) {
                MessageView *msgview;
 
                msgview = messageview_create_with_new_window(summaryview->mainwin);
-               messageview_show(msgview, msginfo, all_headers);
+               val = messageview_show(msgview, msginfo, all_headers);
        } else {
                MessageView *msgview;
 
@@ -2496,17 +2497,29 @@ static void summary_display_msg_full(SummaryView *summaryview,
                summaryview->displayed = row;
                if (!messageview_is_visible(msgview))
                        main_window_toggle_message_view(summaryview->mainwin);
-               messageview_show(msgview, msginfo, all_headers);
-               if (msgview->type == MVIEW_TEXT ||
-                   (msgview->type == MVIEW_MIME &&
-                    (GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL ||
-                     gtk_notebook_get_current_page
-                       (GTK_NOTEBOOK(msgview->mimeview->notebook)) == 0)))
+               val = messageview_show(msgview, msginfo, all_headers);
+               if (GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL)
                        gtk_widget_grab_focus(summaryview->ctree);
                GTK_EVENTS_FLUSH();
                gtkut_ctree_node_move_if_on_the_edge(ctree, row);
        }
 
+       if (val == 0 &&
+           (new_window || !prefs_common.mark_as_read_on_new_window)) {
+               if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags) 
+               && procmsg_msg_has_marked_parent(msginfo))
+                       summaryview->unreadmarked--;
+               if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
+                       procmsg_msginfo_unset_flags
+                               (msginfo, MSG_NEW | MSG_UNREAD, 0);
+                       summary_set_row_marks(summaryview, row);
+                       gtk_clist_thaw(GTK_CLIST(ctree));
+                       summary_status_show(summaryview);
+                       
+                       flags = msginfo->flags;
+               }
+       }
+
        summary_set_menu_sensitive(summaryview);
        toolbar_main_set_sensitive(summaryview->mainwin);
 
@@ -2536,9 +2549,12 @@ void summary_redisplay_msg(SummaryView *summaryview)
 void summary_open_msg(SummaryView *summaryview)
 {
        if (!summaryview->selected) return;
-
+       
+       /* CLAWS: if separate message view, don't open a new window
+        * but rather use the current separated message view */
        summary_display_msg_full(summaryview, summaryview->selected,
-                                TRUE, FALSE);
+                                prefs_common.sep_msg ? FALSE : TRUE, 
+                                FALSE);
 }
 
 void summary_view_source(SummaryView * summaryview)
@@ -2595,8 +2611,8 @@ void summary_step(SummaryView *summaryview, GtkScrollType type)
        if (messageview_is_visible(summaryview->messageview))
                summaryview->display_msg = TRUE;
 
-       gtk_signal_emit_by_name(GTK_OBJECT(ctree), "scroll_vertical",
-                               type, 0.0);
+       g_signal_emit_by_name(G_OBJECT(ctree), "scroll_vertical",
+                             type, 0.0);
 
        if (GTK_CLIST(ctree)->selection)
                gtk_sctree_set_anchor_row
@@ -2730,14 +2746,15 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                }
                        gtk_ctree_node_set_foreground
                                (ctree, row, &summaryview->color_marked);
-       }
-       else if ((global_scoring ||
+#if 0
+       else if ((global_scoring ||
                  summaryview->folder_item->prefs->scoring) &&
                 (msginfo->score >= summaryview->important_score) &&
                 (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);
+#endif
        } else {
                gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], NULL);
        }
@@ -2765,7 +2782,7 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
        } else {
                gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MIME], NULL);
        }
-        if (!style)
+       if (!style)
                style = small_style;
 
        gtk_ctree_node_set_row_style(ctree, row, style);
@@ -2865,10 +2882,6 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
        if(!(MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
                return;
 
-       if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-               summaryview->newmsgs--;
-       if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-               summaryview->unread--;
        if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
        && procmsg_msg_has_marked_parent(msginfo))
                summaryview->unreadmarked--;
@@ -2951,9 +2964,6 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
                summaryview->deleted--;
        }
 
-       if (!MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
-               summaryview->unread++;
-
        if (!MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
        && procmsg_msg_has_marked_parent(msginfo))
                summaryview->unreadmarked++;
@@ -3099,9 +3109,6 @@ void summary_delete(SummaryView *summaryview)
        GtkCTreeNode *node;
 
        if (!item) return;
-#if 0
-       if (!item || item->folder->type == F_NEWS) return;
-#endif
 
        if (summary_is_locked(summaryview)) return;
 
@@ -3176,10 +3183,12 @@ static void summary_delete_duplicated_func(GtkCTree *ctree, GtkCTreeNode *node,
                                           SummaryView *summaryview)
 {
        GtkCTreeNode *found;
-       MsgInfo *msginfo = GTK_CTREE_ROW(node)->row.data;
+       MsgInfo *msginfo;
        MsgInfo *dup_msginfo;
+
+       msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
        
-       if (!msginfo->msgid || !*msginfo->msgid) return;
+       if (!msginfo || !msginfo->msgid || !*msginfo->msgid) return;
 
        found = g_hash_table_lookup(summaryview->msgid_table, msginfo->msgid);
        
@@ -3387,7 +3396,9 @@ void summary_add_address(SummaryView *summaryview)
 
 void summary_select_all(SummaryView *summaryview)
 {
-       if (summaryview->messages >= 500) {
+       if (!summaryview->folder_item) return;
+
+       if (summaryview->folder_item->total_msgs >= 500) {
                STATUSBAR_PUSH(summaryview->mainwin,
                               _("Selecting all messages..."));
                main_window_cursor_wait(summaryview->mainwin);
@@ -3395,7 +3406,7 @@ void summary_select_all(SummaryView *summaryview)
 
        gtk_clist_select_all(GTK_CLIST(summaryview->ctree));
 
-       if (summaryview->messages >= 500) {
+       if (summaryview->folder_item->total_msgs >= 500) {
                STATUSBAR_POP(summaryview->mainwin);
                main_window_cursor_normal(summaryview->mainwin);
        }
@@ -3444,7 +3455,21 @@ void summary_save_as(SummaryView *summaryview)
                Xstrdup_a(filename, msginfo->subject, return);
                subst_for_filename(filename);
        }
-       dest = filesel_select_file(_("Save as"), filename);
+       if (g_getenv ("G_BROKEN_FILENAMES") &&
+           filename && g_utf8_validate(filename, -1, NULL)) {
+               gchar *oldstr = filename;
+               filename = conv_codeset_strdup(filename,
+                                              CS_UTF_8,
+                                              conv_get_current_charset_str());
+               if (!filename) {
+                       g_warning("summary_save_as(): faild to convert character set.");
+                       filename = g_strdup(oldstr);
+               }
+               dest = filesel_select_file(_("Save as"), filename);
+               g_free(filename);
+       } else
+               dest = filesel_select_file(_("Save as"), filename);
+       filename = NULL;
        if (!dest) return;
        if (is_file_exist(dest)) {
                aval = alertpanel(_("Append or Overwrite"),
@@ -3627,7 +3652,7 @@ static void summary_execute_move_func(GtkCTree *ctree, GtkCTreeNode *node,
 
        if (msginfo && MSG_IS_MOVE(msginfo->flags) && msginfo->to_folder) {
                summaryview->mlist =
-                       g_slist_append(summaryview->mlist, msginfo);
+                       g_slist_prepend(summaryview->mlist, msginfo);
                gtk_ctree_node_set_row_data(ctree, node, NULL);
 
                if (msginfo->msgid && *msginfo->msgid &&
@@ -3647,6 +3672,7 @@ static void summary_execute_copy(SummaryView *summaryview)
                                summaryview);
 
        if (summaryview->mlist) {
+               summaryview->mlist = g_slist_reverse(summaryview->mlist);
                procmsg_copy_messages(summaryview->mlist);
 
                g_slist_free(summaryview->mlist);
@@ -3664,7 +3690,7 @@ static void summary_execute_copy_func(GtkCTree *ctree, GtkCTreeNode *node,
 
        if (msginfo && MSG_IS_COPY(msginfo->flags) && msginfo->to_folder) {
                summaryview->mlist =
-                       g_slist_append(summaryview->mlist, msginfo);
+                       g_slist_prepend(summaryview->mlist, msginfo);
 
                procmsg_msginfo_unset_flags(msginfo, 0, MSG_COPY);
                summary_set_row_marks(summaryview, node);
@@ -3689,7 +3715,7 @@ static void summary_execute_delete(SummaryView *summaryview)
                folder_item_remove_msgs(summaryview->folder_item,
                                        summaryview->mlist);
        else
-               folder_item_move_msgs_with_dest(trash, summaryview->mlist);
+               folder_item_move_msgs(trash, summaryview->mlist);
 
        for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
                procmsg_msginfo_free((MsgInfo *)cur->data);
@@ -3742,8 +3768,8 @@ void summary_thread_build(SummaryView *summaryview)
        STATUSBAR_PUSH(summaryview->mainwin, _("Building threads..."));
        main_window_cursor_wait(summaryview->mainwin);
 
-       gtk_signal_handler_block_by_func(GTK_OBJECT(ctree),
-                                        summary_tree_expanded, summaryview);
+       g_signal_handlers_block_by_func(G_OBJECT(ctree),
+                                      G_CALLBACK(summary_tree_expanded), summaryview);
        gtk_clist_freeze(GTK_CLIST(ctree));
 
        node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
@@ -3791,8 +3817,8 @@ void summary_thread_build(SummaryView *summaryview)
        gtkut_ctree_set_focus_row(ctree, summaryview->selected);
 
        gtk_clist_thaw(GTK_CLIST(ctree));
-       gtk_signal_handler_unblock_by_func(GTK_OBJECT(ctree),
-                                          summary_tree_expanded, summaryview);
+       g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
+                                        G_CALLBACK(summary_tree_expanded), summaryview);
 
        debug_print("done.\n");
        STATUSBAR_POP(summaryview->mainwin);
@@ -3840,8 +3866,8 @@ void summary_unthread(SummaryView *summaryview)
        STATUSBAR_PUSH(summaryview->mainwin, _("Unthreading..."));
        main_window_cursor_wait(summaryview->mainwin);
        
-       gtk_signal_handler_block_by_func(GTK_OBJECT(ctree),
-                                        summary_tree_collapsed, summaryview);
+       g_signal_handlers_block_by_func(G_OBJECT(ctree),
+                                       summary_tree_collapsed, summaryview);
        gtk_clist_freeze(GTK_CLIST(ctree));
 
        for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
@@ -3860,8 +3886,8 @@ void summary_unthread(SummaryView *summaryview)
        gtk_sctree_sort_recursive(ctree, NULL); 
 
        gtk_clist_thaw(GTK_CLIST(ctree));
-       gtk_signal_handler_unblock_by_func(GTK_OBJECT(ctree),
-                                          summary_tree_collapsed, summaryview);
+       g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
+                                          G_CALLBACK(summary_tree_collapsed), summaryview);
 
        debug_print("done.\n");
        STATUSBAR_POP(summaryview->mainwin);
@@ -3969,7 +3995,7 @@ void summary_collapse_threads(SummaryView *summaryview)
 
 void summary_filter(SummaryView *summaryview)
 {
-       if (!global_processing) {
+       if (!filtering_rules) {
                alertpanel_error(_("No filter rules defined."));
                return;
        }
@@ -3984,7 +4010,7 @@ void summary_filter(SummaryView *summaryview)
 
        gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
 
-       if (global_processing == NULL) {
+       if (filtering_rules == NULL) {
                gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
                                        GTK_CTREE_FUNC(summary_filter_func),
                                        summaryview);
@@ -4017,7 +4043,7 @@ void summary_filter(SummaryView *summaryview)
         * CLAWS: summary_show() only valid after having a lock. ideally
         * we want the lock to be context aware...  
         */
-       if (global_processing) {
+       if (filtering_rules) {
                summary_show(summaryview, summaryview->folder_item);
        }               
 }
@@ -4027,26 +4053,51 @@ static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
 {
        MsgInfo *msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
 
-       filter_message_by_msginfo(global_processing, msginfo);
+       filter_message_by_msginfo(filtering_rules, msginfo);
 }
 
-void summary_filter_open(SummaryView *summaryview, PrefsFilterType type)
+void summary_msginfo_filter_open(FolderItem * item, MsgInfo *msginfo,
+                                PrefsFilterType type, gint processing_rule)
 {
-       MsgInfo *msginfo;
        gchar *header = NULL;
        gchar *key = NULL;
 
+       procmsg_get_filter_keyword(msginfo, &header, &key, type);
+       
+       if (processing_rule) {
+               if (item == NULL)
+                       prefs_filtering_open(&pre_global_processing,
+                                            _("Processing rules to apply before folder rules"),
+                                            header, key);
+               else
+                       prefs_filtering_open(&item->prefs->processing,
+                                            _("Processing configuration"),
+                                            header, key);
+       }
+       else {
+               prefs_filtering_open(&filtering_rules,
+                                    _("Filtering configuration"),
+                                      header, key);
+       }
+       
+       g_free(header);
+       g_free(key);
+}
+
+void summary_filter_open(SummaryView *summaryview, PrefsFilterType type,
+                        gint processing_rule)
+{
+       MsgInfo *msginfo;
+       FolderItem * item;
+       
        if (!summaryview->selected) return;
 
        msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
                                              summaryview->selected);
        if (!msginfo) return;
-
-       procmsg_get_filter_keyword(msginfo, &header, &key, type);
-       prefs_filtering_open(NULL, header, key);
-
-       g_free(header);
-       g_free(key);
+       
+       item = summaryview->folder_item;
+       summary_msginfo_filter_open(item, msginfo, type, processing_rule);
 }
 
 /* color label */
@@ -4059,11 +4110,11 @@ static void summary_colorlabel_menu_item_activate_cb(GtkWidget *widget,
        guint color = GPOINTER_TO_UINT(data);
        SummaryView *summaryview;
 
-       summaryview = gtk_object_get_data(GTK_OBJECT(widget), "summaryview");
+       summaryview = g_object_get_data(G_OBJECT(widget), "summaryview");
        g_return_if_fail(summaryview != NULL);
 
        /* "dont_toggle" state set? */
-       if (gtk_object_get_data(GTK_OBJECT(summaryview->colorlabel_menu),
+       if (g_object_get_data(G_OBJECT(summaryview->colorlabel_menu),
                                "dont_toggle"))
                return;
 
@@ -4158,13 +4209,13 @@ static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item
 
        /* NOTE: don't return prematurely because we set the "dont_toggle"
         * state for check menu items */
-       gtk_object_set_data(GTK_OBJECT(menu), "dont_toggle",
-                           GINT_TO_POINTER(1));
+       g_object_set_data(G_OBJECT(menu), "dont_toggle",
+                         GINT_TO_POINTER(1));
 
        /* clear items. get item pointers. */
        for (n = 0, cur = 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_set_active
                                (GTK_CHECK_MENU_ITEM(cur->data), FALSE);
                        items[n] = GTK_CHECK_MENU_ITEM(cur->data);
                        n++;
@@ -4184,7 +4235,7 @@ static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item
                        if (msginfo) {
                                clabel = MSG_GET_COLORLABEL_VALUE(msginfo->flags);
                                if (!items[clabel]->active)
-                                       gtk_check_menu_item_set_state
+                                       gtk_check_menu_item_set_active
                                                (items[clabel], TRUE);
                        }
                }
@@ -4192,8 +4243,8 @@ static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item
                g_warning("invalid number of color elements (%d)\n", n);
 
        /* reset "dont_toggle" state */
-       gtk_object_set_data(GTK_OBJECT(menu), "dont_toggle",
-                           GINT_TO_POINTER(0));
+       g_object_set_data(G_OBJECT(menu), "dont_toggle",
+                         GINT_TO_POINTER(0));
 }
 
 static void summary_colorlabel_menu_create(SummaryView *summaryview)
@@ -4205,8 +4256,8 @@ static void summary_colorlabel_menu_create(SummaryView *summaryview)
 
        label_menuitem = gtk_item_factory_get_item(summaryview->popupfactory,
                                                   "/Color label");
-       gtk_signal_connect(GTK_OBJECT(label_menuitem), "activate",
-                          GTK_SIGNAL_FUNC(summary_colorlabel_menu_item_activate_item_cb),
+       g_signal_connect(G_OBJECT(label_menuitem), "activate",
+                        G_CALLBACK(summary_colorlabel_menu_item_activate_item_cb),
                           summaryview);
        gtk_widget_show(label_menuitem);
 
@@ -4218,26 +4269,26 @@ static void summary_colorlabel_menu_create(SummaryView *summaryview)
         * can always get back the SummaryView pointer. */
 
        item = gtk_check_menu_item_new_with_label(_("None"));
-       gtk_menu_append(GTK_MENU(menu), item);
-       gtk_signal_connect(GTK_OBJECT(item), "activate",
-                          GTK_SIGNAL_FUNC(summary_colorlabel_menu_item_activate_cb),
+       gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+       g_signal_connect(G_OBJECT(item), "activate",
+                        G_CALLBACK(summary_colorlabel_menu_item_activate_cb),
                           GUINT_TO_POINTER(0));
-       gtk_object_set_data(GTK_OBJECT(item), "summaryview", summaryview);
+       g_object_set_data(G_OBJECT(item), "summaryview", summaryview);
        gtk_widget_show(item);
 
        item = gtk_menu_item_new();
-       gtk_menu_append(GTK_MENU(menu), item);
+       gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
        gtk_widget_show(item);
 
        /* create pixmap/label menu items */
        for (i = 0; i < N_COLOR_LABELS; i++) {
                item = colorlabel_create_check_color_menu_item(i);
-               gtk_menu_append(GTK_MENU(menu), item);
-               gtk_signal_connect(GTK_OBJECT(item), "activate",
-                                  GTK_SIGNAL_FUNC(summary_colorlabel_menu_item_activate_cb),
-                                  GUINT_TO_POINTER(i + 1));
-               gtk_object_set_data(GTK_OBJECT(item), "summaryview",
-                                   summaryview);
+               gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+               g_signal_connect(G_OBJECT(item), "activate",
+                                G_CALLBACK(summary_colorlabel_menu_item_activate_cb),
+                                GUINT_TO_POINTER(i + 1));
+               g_object_set_data(G_OBJECT(item), "summaryview",
+                                 summaryview);
                gtk_widget_show(item);
        }
 
@@ -4312,7 +4363,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                                     GTK_CTREE_EXPANDER_TRIANGLE);
 #endif
        gtk_ctree_set_indent(GTK_CTREE(ctree), 16);
-       gtk_object_set_user_data(GTK_OBJECT(ctree), summaryview);
+       g_object_set_data(G_OBJECT(ctree), "user_data", summaryview);
 
        for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
                GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[pos].button,
@@ -4323,10 +4374,10 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
 
        /* connect signal to the buttons for sorting */
 #define CLIST_BUTTON_SIGNAL_CONNECT(col, func) \
-       gtk_signal_connect \
-               (GTK_OBJECT(GTK_CLIST(ctree)->column[col_pos[col]].button), \
+       g_signal_connect \
+               (G_OBJECT(GTK_CLIST(ctree)->column[col_pos[col]].button), \
                 "clicked", \
-                GTK_SIGNAL_FUNC(func), \
+                G_CALLBACK(func), \
                 summaryview)
 
        CLIST_BUTTON_SIGNAL_CONNECT(S_COL_MARK   , summary_mark_clicked);
@@ -4342,34 +4393,34 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
 
 #undef CLIST_BUTTON_SIGNAL_CONNECT
 
-       gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
-                          GTK_SIGNAL_FUNC(summary_selected), summaryview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "button_press_event",
-                          GTK_SIGNAL_FUNC(summary_button_pressed),
-                          summaryview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "button_release_event",
-                          GTK_SIGNAL_FUNC(summary_button_released),
-                          summaryview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "key_press_event",
-                          GTK_SIGNAL_FUNC(summary_key_pressed), summaryview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "resize_column",
-                          GTK_SIGNAL_FUNC(summary_col_resized), summaryview);
-        gtk_signal_connect(GTK_OBJECT(ctree), "open_row",
-                          GTK_SIGNAL_FUNC(summary_open_row), summaryview);
-
-       gtk_signal_connect_after(GTK_OBJECT(ctree), "tree_expand",
-                                GTK_SIGNAL_FUNC(summary_tree_expanded),
-                                summaryview);
-       gtk_signal_connect_after(GTK_OBJECT(ctree), "tree_collapse",
-                                GTK_SIGNAL_FUNC(summary_tree_collapsed),
-                                summaryview);
-
-       gtk_signal_connect(GTK_OBJECT(ctree), "start_drag",
-                          GTK_SIGNAL_FUNC(summary_start_drag),
-                          summaryview);
-       gtk_signal_connect(GTK_OBJECT(ctree), "drag_data_get",
-                          GTK_SIGNAL_FUNC(summary_drag_data_get),
-                          summaryview);
+       g_signal_connect(G_OBJECT(ctree), "tree_select_row",
+                        G_CALLBACK(summary_selected), summaryview);
+       g_signal_connect(G_OBJECT(ctree), "button_press_event",
+                        G_CALLBACK(summary_button_pressed),
+                        summaryview);
+       g_signal_connect(G_OBJECT(ctree), "button_release_event",
+                        G_CALLBACK(summary_button_released),
+                        summaryview);
+       g_signal_connect(G_OBJECT(ctree), "key_press_event",
+                        G_CALLBACK(summary_key_pressed), summaryview);
+       g_signal_connect(G_OBJECT(ctree), "resize_column",
+                        G_CALLBACK(summary_col_resized), summaryview);
+        g_signal_connect(G_OBJECT(ctree), "open_row",
+                        G_CALLBACK(summary_open_row), summaryview);
+
+       g_signal_connect_after(G_OBJECT(ctree), "tree_expand",
+                              G_CALLBACK(summary_tree_expanded),
+                              summaryview);
+       g_signal_connect_after(G_OBJECT(ctree), "tree_collapse",
+                              G_CALLBACK(summary_tree_collapsed),
+                              summaryview);
+
+       g_signal_connect(G_OBJECT(ctree), "start_drag",
+                        G_CALLBACK(summary_start_drag),
+                        summaryview);
+       g_signal_connect(G_OBJECT(ctree), "drag_data_get",
+                        G_CALLBACK(summary_drag_data_get),
+                        summaryview);
 
        return ctree;
 }
@@ -4389,7 +4440,7 @@ void summary_set_column_order(SummaryView *summaryview)
        gtk_widget_destroy(summaryview->ctree);
 
        summaryview->ctree = ctree = summary_ctree_create(summaryview);
-       pixmap = gtk_pixmap_new(clipxpm, clipxpmmask);
+       pixmap = gtk_image_new_from_pixmap(clipxpm, clipxpmmask);
        gtk_clist_set_column_widget(GTK_CLIST(ctree),
                                    summaryview->col_pos[S_COL_MIME], pixmap);
        gtk_widget_show(pixmap);
@@ -4421,10 +4472,10 @@ static gint summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
        return TRUE;
 }
 
-static void summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
-                                  SummaryView *summaryview)
+static gboolean summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
+                                      SummaryView *summaryview)
 {
-       if (!event) return;
+       if (!event) return FALSE;
 
        if (event->button == 3) {
                summaryview->display_msg = TRUE;
@@ -4438,11 +4489,14 @@ static void summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                    messageview_is_visible(summaryview->messageview))
                        summaryview->display_msg = TRUE;
        }
+
+       return FALSE;
 }
 
-static void summary_button_released(GtkWidget *ctree, GdkEventButton *event,
-                                   SummaryView *summaryview)
+static gboolean summary_button_released(GtkWidget *ctree, GdkEventButton *event,
+                                       SummaryView *summaryview)
 {
+       return FALSE;
 }
 
 void summary_pass_key_press_event(SummaryView *summaryview, GdkEventKey *event)
@@ -4453,10 +4507,7 @@ void summary_pass_key_press_event(SummaryView *summaryview, GdkEventKey *event)
 #define BREAK_ON_MODIFIER_KEY() \
        if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
 
-#define RETURN_IF_LOCKED() \
-       if (summaryview->mainwin->lock_count) return
-
-static gint summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
+static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(widget);
@@ -4472,6 +4523,19 @@ static gint summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_Escape:
                gtk_widget_grab_focus(summaryview->folderview->ctree);
                return TRUE;
+       case GDK_Up:
+       case GDK_Down:
+               if ((node = summaryview->selected) != NULL) {
+                       GtkCTreeNode *next = NULL;
+                       next = (event->keyval == GDK_Down)
+                                       ? gtkut_ctree_node_next(ctree, node)
+                                       : gtkut_ctree_node_prev(ctree, node);
+                       if (next) {
+                               gtk_sctree_select(GTK_SCTREE(ctree), next);
+                               return TRUE;
+                       }
+               }
+               break;
        default:
                break;
        }
@@ -4485,22 +4549,21 @@ static gint summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        }
 
        messageview = summaryview->messageview;
-       if (messageview->type == MVIEW_MIME &&
-           gtk_notebook_get_current_page
-               (GTK_NOTEBOOK(messageview->mimeview->notebook)) == 1)
-               textview = messageview->mimeview->textview;
-       else
-               textview = messageview->textview;
+       textview = messageview->mimeview->textview;
 
        switch (event->keyval) {
        case GDK_space:         /* Page down or go to the next */
-               if (summaryview->displayed != summaryview->selected) {
-                       summary_display_msg(summaryview,
-                                           summaryview->selected);
-                       break;
-               }
-               if (!textview_scroll_page(textview, FALSE))
-                       summary_select_next_unread(summaryview);
+               if (event->state & GDK_SHIFT_MASK) 
+                       textview_scroll_page(textview, TRUE);
+               else {
+                       if (summaryview->displayed != summaryview->selected) {
+                               summary_display_msg(summaryview,
+                                                   summaryview->selected);
+                               break;
+                       }
+                       if (!textview_scroll_page(textview, FALSE))
+                               summary_select_next_unread(summaryview);
+               }                               
                break;
        case GDK_BackSpace:     /* Page up */
                textview_scroll_page(textview, TRUE);
@@ -4514,14 +4577,7 @@ static gint summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                textview_scroll_one_line
                        (textview, (event->state & GDK_MOD1_MASK) != 0);
                break;
-       case GDK_asterisk:      /* Mark */
-               summary_mark(summaryview);
-               break;
-       case GDK_exclam:        /* Mark as unread */
-               summary_mark_as_unread(summaryview);
-               break;
        case GDK_Delete:
-               RETURN_IF_LOCKED();
                BREAK_ON_MODIFIER_KEY();
                summary_delete(summaryview);
                break;
@@ -4531,33 +4587,35 @@ static gint summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        return TRUE;
 }
 
-static gint summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
-                               SummaryView *summaryview)
+static gboolean summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
+                                         SummaryView *summaryview)
 {
        if (event != NULL && event->keyval == GDK_Return)
                summary_show(summaryview, summaryview->folder_item);
-       return TRUE;            
+       return FALSE;
 }
 
-static void summary_searchbar_focus_evt(GtkWidget *widget, GdkEventFocus *event,
+static gboolean summary_searchbar_focus_evt(GtkWidget *widget, GdkEventFocus *event,
                                SummaryView *summaryview)
 {
        if (event != NULL && event->in)
-               gtk_signal_handler_block_by_func(GTK_OBJECT(summaryview->mainwin->window), 
-                                                GTK_SIGNAL_FUNC(mainwindow_key_pressed),
-                                                summaryview->mainwin);
+               g_signal_handlers_block_by_func(G_OBJECT(summaryview->mainwin->window), 
+                                               G_CALLBACK(mainwindow_key_pressed),
+                                               summaryview->mainwin);
        else
-               gtk_signal_handler_unblock_by_func(GTK_OBJECT(summaryview->mainwin->window), 
-                                                  GTK_SIGNAL_FUNC(mainwindow_key_pressed),
-                                                  summaryview->mainwin);
+               g_signal_handlers_unblock_by_func(G_OBJECT(summaryview->mainwin->window), 
+                                                 G_CALLBACK(mainwindow_key_pressed),
+                                                 summaryview->mainwin);
+
+       return FALSE;
 }
 
 static void summary_searchtype_changed(GtkMenuItem *widget, gpointer data)
 {
        SummaryView *sw = (SummaryView *)data;
-       prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(gtk_object_get_user_data(
+       prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(g_object_get_data(
                                   GTK_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
-                                  GTK_MENU(sw->search_type))))));
+                                  GTK_MENU(sw->search_type)))), MENU_VAL_ID));
 
        /* Show extended search description button, only when Extended is selected */
        if (prefs_common.summary_quicksearch_type == S_SEARCH_EXTENDED) {
@@ -4574,31 +4632,12 @@ static void tog_searchbar_cb(GtkWidget *w, gpointer data)
 {
        SummaryView *summaryview = (SummaryView *)data;
        GtkWidget *hbox= summaryview->hbox_search;
-       GtkAllocation size = hbox->allocation;
-       GtkAllocation msgview_size = summaryview->messageview->vbox->allocation;
-       GtkAllocation parent_size = summaryview->vbox->allocation;
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) {
                prefs_common.show_searchbar = TRUE;
                gtk_widget_show(hbox);
-               if (!prefs_common.sep_msg && messageview_is_visible(summaryview->messageview)
-               &&  msgview_size.height > 1 && parent_size.height > 1) {
-                       gtk_widget_set_usize(GTK_WIDGET(summaryview->messageview->vbox),
-                                               -1,msgview_size.height - size.height - SUMMARY_VBOX_SPACING);
-                       gtk_widget_set_usize(GTK_WIDGET(summaryview->vbox),
-                                               -1,parent_size.height + size.height + SUMMARY_VBOX_SPACING);
-                       gtk_paned_set_position(GTK_PANED(summaryview->vbox->parent),-1);
-               }
        } else {
                prefs_common.show_searchbar = FALSE;
                gtk_widget_hide(hbox);
-               if (!prefs_common.sep_msg && messageview_is_visible(summaryview->messageview)
-               &&  msgview_size.height > 1 && parent_size.height > 1) {
-                       gtk_widget_set_usize(GTK_WIDGET(summaryview->messageview->vbox),
-                                               -1,msgview_size.height + size.height + SUMMARY_VBOX_SPACING);
-                       gtk_widget_set_usize(GTK_WIDGET(summaryview->vbox),
-                                               -1,parent_size.height - size.height - SUMMARY_VBOX_SPACING);
-                       gtk_paned_set_position(GTK_PANED(summaryview->vbox->parent),-1);
-               }
        }
 }
 
@@ -4648,10 +4687,15 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        switch (column < 0 ? column : summaryview->col_state[column].type) {
        case S_COL_MARK:
-               if (MSG_IS_MARKED(msginfo->flags)) {
-                       summary_unmark_row(summaryview, row);
-               } else
-                       summary_mark_row(summaryview, row);
+               if (!MSG_IS_DELETED(msginfo->flags) &&
+                   !MSG_IS_MOVE(msginfo->flags) &&
+                   !MSG_IS_COPY(msginfo->flags)) {
+                       if (MSG_IS_MARKED(msginfo->flags)) {
+                               summary_unmark_row(summaryview, row);
+                       } else {
+                               summary_mark_row(summaryview, row);
+                       }
+               }
                break;
        case S_COL_STATUS:
                if (MSG_IS_UNREAD(msginfo->flags)) {
@@ -4768,7 +4812,13 @@ static void summary_add_address_cb(SummaryView *summaryview,
 static void summary_create_filter_cb(SummaryView *summaryview,
                                     guint action, GtkWidget *widget)
 {
-       summary_filter_open(summaryview, (PrefsFilterType)action);
+       summary_filter_open(summaryview, (PrefsFilterType)action, 0);
+}
+
+static void summary_create_processing_cb(SummaryView *summaryview,
+                                        guint action, GtkWidget *widget)
+{
+       summary_filter_open(summaryview, (PrefsFilterType)action, 1);
 }
 
 static void summary_sort_by_column_click(SummaryView *summaryview,
@@ -5039,9 +5089,15 @@ static void news_flag_crosspost(MsgInfo *msginfo)
        GString *line;
        gpointer key;
        gpointer value;
-       Folder *mff = msginfo->folder->folder;
+       Folder *mff;
 
-       if (mff->account->mark_crosspost_read && MSG_IS_NEWS(msginfo->flags)) {
+       g_return_if_fail(msginfo != NULL);
+       g_return_if_fail(msginfo->folder != NULL);
+       g_return_if_fail(msginfo->folder->folder != NULL);
+       mff = msginfo->folder->folder;
+       g_return_if_fail(mff->klass->type == F_NEWS);
+
+       if (mff->account->mark_crosspost_read) {
                line = g_string_sized_new(128);
                g_string_sprintf(line, "%s:%d", msginfo->folder->path, msginfo->msgnum);
                debug_print("nfcp: checking <%s>", line->str);
@@ -5067,10 +5123,6 @@ static void summary_ignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpoin
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
-       if (MSG_IS_NEW(msginfo->flags))
-               summaryview->newmsgs--;
-       if (MSG_IS_UNREAD(msginfo->flags))
-               summaryview->unread--;
        if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                summaryview->unreadmarked--;
 
@@ -5106,10 +5158,6 @@ static void summary_unignore_thread_func(GtkCTree *ctree, GtkCTreeNode *row, gpo
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
-       if (MSG_IS_NEW(msginfo->flags))
-               summaryview->newmsgs++;
-       if (MSG_IS_UNREAD(msginfo->flags))
-               summaryview->unread++;
        if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
                summaryview->unreadmarked++;
 
@@ -5353,6 +5401,7 @@ void summary_set_prefs_from_folderitem(SummaryView *summaryview, FolderItem *ite
        summaryview->thread_collapsed = item->thread_collapsed;
 
        /* Scoring */
+#if 0
        if (global_scoring || item->prefs->scoring) {
                summaryview->important_score = prefs_common.important_score;
                if (item->prefs->important_score >
@@ -5360,6 +5409,7 @@ void summary_set_prefs_from_folderitem(SummaryView *summaryview, FolderItem *ite
                        summaryview->important_score =
                                item->prefs->important_score;
        }
+#endif
 }
 
 void summary_save_prefs_to_folderitem(SummaryView *summaryview, FolderItem *item)
@@ -5382,10 +5432,12 @@ static gboolean summary_update_msg(gpointer source, gpointer data)
        g_return_val_if_fail(msginfo_update != NULL, TRUE);
        g_return_val_if_fail(summaryview != NULL, FALSE);
 
-       node = gtk_ctree_find_by_row_data(GTK_CTREE(summaryview->ctree), NULL, msginfo_update->msginfo);
-       
-       if (node) 
-               summary_set_row_marks(summaryview, node);
+       if (msginfo_update->flags & MSGINFO_UPDATE_FLAGS) {
+               node = gtk_ctree_find_by_row_data(GTK_CTREE(summaryview->ctree), NULL, msginfo_update->msginfo);
+
+               if (node) 
+                       summary_set_row_marks(summaryview, node);
+       }
 
        return FALSE;
 }