sync with sylpheed 0.7.0cvs27
[claws.git] / src / summaryview.c
index 367b0029cf71dfb33ebdb569e6fbfdec49ecd866..e7ff22604390bc255aa3f1f259bcb43958db27f9 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -62,6 +62,7 @@
 #include "sourcewindow.h"
 #include "prefs_common.h"
 #include "prefs_summary_column.h"
+#include "prefs_filter.h"
 #include "account.h"
 #include "compose.h"
 #include "utils.h"
@@ -196,9 +197,10 @@ static void summary_set_header             (SummaryView            *summaryview,
 static void summary_display_msg                (SummaryView            *summaryview,
                                         GtkCTreeNode           *row,
                                         gboolean                new_window);
-static void summary_toggle_view                (SummaryView            *summaryview);
+
 static void summary_set_row_marks      (SummaryView            *summaryview,
                                         GtkCTreeNode           *row);
+static void summaryview_subject_filter_init (PrefsFolderItem    *prefs);
 
 /* message handling */
 static void summary_mark_row           (SummaryView            *summaryview,
@@ -265,10 +267,11 @@ static void summary_colorlabel_menu_create(SummaryView    *summaryview);
 
 static GtkWidget *summary_ctree_create (SummaryView    *summaryview);
 
+static void summary_toggle_view(SummaryView *summarview);
+
 /* callback functions */
-static void summary_toggle_pressed     (GtkWidget              *eventbox,
-                                        GdkEventButton         *event,
-                                        SummaryView            *summaryview);
+static void summary_toggle_view_cb     (GtkWidget      *widget,
+                                        gpointer       data);                                   
 static void summary_button_pressed     (GtkWidget              *ctree,
                                         GdkEventButton         *event,
                                         SummaryView            *summaryview);
@@ -448,8 +451,8 @@ SummaryView *summary_create(void)
        GtkWidget *statlabel_folder;
        GtkWidget *statlabel_select;
        GtkWidget *statlabel_msgs;
-       GtkWidget *toggle_eventbox;
-       GtkWidget *toggle_arrow;
+       GtkWidget *toggle_view_btn;
+       GtkWidget *toggle_view_arrow;
        GtkWidget *popupmenu;
        GtkItemFactory *popupfactory;
        gint n_entries;
@@ -485,14 +488,14 @@ SummaryView *summary_create(void)
        statlabel_select = gtk_label_new("");
        gtk_box_pack_start(GTK_BOX(hbox), statlabel_select, FALSE, FALSE, 16);
 
-       /* toggle view button */
-       toggle_eventbox = gtk_event_box_new();
-       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);
+       /* toggle view buttons */
+       toggle_view_btn = gtk_button_new();
+       gtk_box_pack_end(GTK_BOX(hbox), toggle_view_btn, FALSE, FALSE, 0);
+       gtk_button_set_relief(GTK_BUTTON(toggle_view_btn), GTK_RELIEF_NONE);
+       toggle_view_arrow=gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+       gtk_container_add(GTK_CONTAINER(toggle_view_btn), toggle_view_arrow);
+       gtk_signal_connect(GTK_OBJECT(toggle_view_btn), "clicked",
+                               GTK_SIGNAL_FUNC(summary_toggle_view_cb), summaryview);
 
        statlabel_msgs = gtk_label_new("");
        gtk_box_pack_end(GTK_BOX(hbox), statlabel_msgs, FALSE, FALSE, 4);
@@ -511,8 +514,8 @@ SummaryView *summary_create(void)
        summaryview->statlabel_folder = statlabel_folder;
        summaryview->statlabel_select = statlabel_select;
        summaryview->statlabel_msgs = statlabel_msgs;
-       summaryview->toggle_eventbox = toggle_eventbox;
-       summaryview->toggle_arrow = toggle_arrow;
+       summaryview->toggle_view_btn = toggle_view_btn;
+       summaryview->toggle_view_arrow = toggle_view_arrow;
        summaryview->popupmenu = popupmenu;
        summaryview->popupfactory = popupfactory;
        summaryview->msg_is_toggled_on = TRUE;
@@ -712,8 +715,21 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                        return FALSE;
                }
                folder_update_op_count();
-       } else
-               summary_write_cache(summaryview);
+       } else {
+               /* 
+                * CLAWS: summary_show() is responsible for updating the caches. 
+                * after filtering inc.c::inc_finished() forces the update of
+                * the cache by indirectly calling summary_show() (by re-selecting
+                * the currently selected mail folder).  
+                * this collides with the new filtering system that may have set 
+                * any message flag before calling summary_show(). 
+                * we can prevent this cache-write by checking the opened member
+                * of the folderview. if this is NULL, the folderview forced
+                * an update of the summary view.
+                */
+               if (summaryview->folderview->opened) 
+                       summary_write_cache(summaryview);
+       }       
         
        summaryview->folderview->opened = selected_node;
 
@@ -819,14 +835,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item,
                mlist = not_killed;
        }
 
-       if (item->prefs->enable_simplify_subject
-           && item->prefs->simplify_subject_regexp != NULL
-           && strlen(item->prefs->simplify_subject_regexp) != 0) {
-               summary_simplify_subject(summaryview, 
-                                        item->prefs->simplify_subject_regexp,
-                                        mlist);
-       }
-
        STATUSBAR_POP(summaryview->mainwin);
 
        /* set ctree and hash table from the msginfo list
@@ -1121,19 +1129,10 @@ void summary_select_prev_unread(SummaryView *summaryview)
 
 void summary_select_next_unread(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
+       GtkCTreeNode *node = summaryview->selected;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
-       node = summary_find_next_unread_msg(summaryview, summaryview->selected);
-
-       if (node) {
-               gtkut_ctree_expand_parent_all(ctree, node);
-               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
-               gtk_sctree_select(GTK_SCTREE(ctree), node);
-               if (summaryview->displayed == node)
-                       summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node, FALSE);
-       } else {
+       while ((node = summary_find_next_unread_msg(summaryview, node)) == NULL) {
                AlertValue val;
 
                switch (prefs_common.next_unread_msg_dialog) {
@@ -1141,7 +1140,7 @@ void summary_select_next_unread(SummaryView *summaryview)
                                val = alertpanel(_("No more unread messages"),
                                                 _("No unread message found. "
                                                   "Go to next folder?"),
-                                                _("Yes"), _("No"), NULL);
+                                                _("Yes"), _("Search again"), _("No"));
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_YES:
                                val = G_ALERTDEFAULT;
@@ -1161,7 +1160,20 @@ void summary_select_next_unread(SummaryView *summaryview)
                                                (GTK_OBJECT(ctree),
                                                 "key_press_event");
                        folderview_select_next_unread(summaryview->folderview);
-               }
+                       return;
+               } else if (val == G_ALERTALTERNATE)
+                       node = NULL;
+               else
+                       return;
+       }
+
+       if (node) {
+               gtkut_ctree_expand_parent_all(ctree, node);
+               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+               gtk_sctree_select(GTK_SCTREE(ctree), node);
+               if (summaryview->displayed == node)
+                       summaryview->displayed = NULL;
+               summary_display_msg(summaryview, node, FALSE);
        }
 }
 
@@ -1921,7 +1933,7 @@ void summary_sort(SummaryView *summaryview, SummarySortType type)
 
        summary_set_column_titles(summaryview);
 
-       gtk_ctree_sort_node(ctree, NULL);
+       gtk_ctree_sort_recursive(ctree, NULL);
 
        gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
        prefs_folder_item_set_config(summaryview->folder_item,
@@ -2012,6 +2024,8 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                        summaryview->important_score =
                                summaryview->folder_item->prefs->important_score;
        }
+
+       summaryview_subject_filter_init(summaryview->folder_item->prefs);
        
        if (summaryview->folder_item->threaded) {
                GNode *root, *gnode;
@@ -2194,6 +2208,8 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
        static gchar *from_name = NULL;
        static gchar col_number[11];
        static gchar col_score[11];
+       static gchar buf[BUFFSIZE];
+       PrefsFolderItem *prefs = summaryview->folder_item->prefs;
        gint *col_pos = summaryview->col_pos;
 
        text[col_pos[S_COL_MARK]]   = NULL;
@@ -2253,8 +2269,16 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
                }
        }
 
-       text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? msginfo->subject :
-               _("(No Subject)");
+       if (prefs->enable_simplify_subject 
+           && prefs->simplify_subject_preg != NULL )
+               text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? 
+                       string_remove_match(buf, BUFFSIZE, msginfo->subject, 
+                                       prefs->simplify_subject_preg) : 
+                       
+                       _("(No Subject)");
+       else 
+               text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? msginfo->subject :
+                       _("(No Subject)");
 }
 
 #define CHANGE_FLAGS(msginfo) \
@@ -2412,12 +2436,26 @@ void summary_step(SummaryView *summaryview, GtkScrollType type)
 }
 
 static void summary_toggle_view(SummaryView *summaryview)
+{
+       MainWindow *mainwin = summaryview->mainwin;
+       GtkItemFactory *ifactory;
+       
+       if (!mainwin) return;
+       
+       ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+       menu_toggle_toggle(ifactory, "/View/Expand Summary View");
+}
+
+void summary_toggle_view_real(SummaryView *summaryview)
 {
        MainWindow *mainwin = summaryview->mainwin;
        union CompositeWin *cwin = &mainwin->win;
        GtkWidget *vpaned = NULL;
        GtkWidget *container = NULL;
-
+       GtkWidget *toggle_view_btn;
+       GtkWidget *toggle_view_arrow;
+       GtkItemFactory *ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+       
        switch (mainwin->type) {
        case SEPARATE_NONE:
                vpaned = cwin->sep_none.vpaned;
@@ -2438,18 +2476,45 @@ static void summary_toggle_view(SummaryView *summaryview)
                gtk_widget_ref(vpaned);
                gtkut_container_remove(GTK_CONTAINER(container), vpaned);
                gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), container);
-               gtk_arrow_set(GTK_ARROW(summaryview->toggle_arrow),
-                             GTK_ARROW_UP, GTK_SHADOW_OUT);
+               
+               gtk_widget_destroy(summaryview->toggle_view_arrow);
+               gtk_widget_destroy(summaryview->toggle_view_btn);
+               
+               toggle_view_btn = gtk_button_new();
+               gtk_box_pack_end(GTK_BOX(summaryview->hbox), toggle_view_btn, FALSE, FALSE, 0);
+               gtk_box_reorder_child(GTK_BOX(summaryview->hbox), toggle_view_btn, 0);
+               gtk_button_set_relief(GTK_BUTTON(toggle_view_btn), GTK_RELIEF_NONE);
+               toggle_view_arrow=gtk_arrow_new(GTK_ARROW_UP, GTK_SHADOW_OUT);
+               gtk_container_add(GTK_CONTAINER(toggle_view_btn), toggle_view_arrow);
+               gtk_signal_connect(GTK_OBJECT(toggle_view_btn), "clicked",
+                                       GTK_SIGNAL_FUNC(summary_toggle_view_cb), summaryview);
+               gtk_widget_show_all(toggle_view_btn);
+               menu_set_sensitive(ifactory, "/View/Expand Message View", FALSE);
        } else {
                summaryview->msg_is_toggled_on = TRUE;
                gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), vpaned);
                gtk_container_add(GTK_CONTAINER(container), vpaned);
                gtk_widget_unref(vpaned);
-               gtk_arrow_set(GTK_ARROW(summaryview->toggle_arrow),
-                             GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+               
+               gtk_widget_destroy(summaryview->toggle_view_arrow);
+               gtk_widget_destroy(summaryview->toggle_view_btn);
+               
+               toggle_view_btn = gtk_button_new();
+               gtk_box_pack_end(GTK_BOX(summaryview->hbox), toggle_view_btn, FALSE, FALSE, 0);
+               gtk_box_reorder_child(GTK_BOX(summaryview->hbox), toggle_view_btn, 0);
+               gtk_button_set_relief(GTK_BUTTON(toggle_view_btn), GTK_RELIEF_NONE);
+               toggle_view_arrow=gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+               gtk_container_add(GTK_CONTAINER(toggle_view_btn), toggle_view_arrow);
+               gtk_signal_connect(GTK_OBJECT(toggle_view_btn), "clicked",
+                                       GTK_SIGNAL_FUNC(summary_toggle_view_cb), summaryview);
+               gtk_widget_show_all(toggle_view_btn);
+               menu_set_sensitive(ifactory, "/View/Expand Message View", TRUE);
        }
 
        gtk_widget_grab_focus(summaryview->ctree);
+       
+       summaryview->toggle_view_btn = toggle_view_btn;
+       summaryview->toggle_view_arrow = toggle_view_arrow;
 }
 
 static gboolean summary_search_unread_recursive(GtkCTree *ctree,
@@ -2611,10 +2676,10 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
 
 void summary_set_marks_selected(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+       for (cur = GTK_CLIST(summaryview->ctree)->selection; cur != NULL;
+            cur = cur->next)
                summary_set_row_marks(summaryview, GTK_CTREE_NODE(cur->data));
 }
 
@@ -3190,13 +3255,18 @@ void summary_save_as(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
+       gchar *filename = NULL;
        gchar *src, *dest;
 
        if (!summaryview->selected) return;
        msginfo = gtk_ctree_node_get_row_data(ctree, summaryview->selected);
        if (!msginfo) return;
 
-       dest = filesel_select_file(_("Save as"), NULL);
+       if (msginfo->subject) {
+               Xstrdup_a(filename, msginfo->subject, return);
+               subst_for_filename(filename);
+       }
+       dest = filesel_select_file(_("Save as"), filename);
        if (!dest) return;
        if (is_file_exist(dest)) {
                AlertValue aval;
@@ -3650,17 +3720,6 @@ static void summary_unthread_for_exec_func(GtkCTree *ctree, GtkCTreeNode *node,
        }
 }
 
-void summary_simplify_subject(SummaryView *summaryview, gchar * rexp,
-                             GSList * mlist)
-{
-       GSList * cur;
-       for(cur = mlist ; cur != NULL ; cur = cur->next) {
-               MsgInfo * msginfo = (MsgInfo *) cur->data;
-               string_remove_all_matches(msginfo->subject, rexp, 
-                                         REG_EXTENDED, 0);
-       }
-}
-
 void summary_processing(SummaryView *summaryview, GSList * mlist)
 {
        GSList * processing_list;
@@ -3760,8 +3819,6 @@ void summary_filter(SummaryView *summaryview)
 
                g_hash_table_destroy(summaryview->folder_table);
                summaryview->folder_table = NULL;
-
-               summary_show(summaryview, summaryview->folder_item, FALSE);
        }
 
        debug_print(_("done.\n"));
@@ -3769,6 +3826,20 @@ void summary_filter(SummaryView *summaryview)
        main_window_cursor_normal(summaryview->mainwin);
 
        summary_unlock(summaryview);
+
+       /* 
+        * CLAWS: summary_show() only valid after having a lock. ideally
+        * we want the lock to be context aware...  
+        */
+       if (global_processing) {
+               /*
+                * CLAWS: to prevent summary_show to write the cache,
+                * we force an update of the summaryview in a special way,
+                * like inc.c::inc_finished().
+                */
+               folderview_unselect(summaryview->folderview);
+               folderview_select(summaryview->folderview, summaryview->folder_item);
+       }               
 }
 
 static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
@@ -3789,11 +3860,173 @@ static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
                    summaryview->folder_item != dest)
                        summary_move_row_to(summaryview, node, dest);
        }
-       else
+       else 
                filter_msginfo_move_or_delete(global_processing, msginfo,
                                              summaryview->folder_table);
 }
 
+void summary_filter_open(SummaryView *summaryview, PrefsFilterType type)
+{
+       static HeaderEntry hentry[] = {{"List-Id:",        NULL, FALSE},
+                                      {"X-ML-Name:",      NULL, FALSE},
+                                      {"X-List:",         NULL, FALSE},
+                                      {"X-Mailing-list:", NULL, FALSE},
+                                      {NULL,              NULL, FALSE}};
+       enum
+       {
+               H_LIST_ID        = 0,
+               H_X_ML_NAME      = 1,
+               H_X_LIST         = 2,
+               H_X_MAILING_LIST = 3
+       };
+
+       MsgInfo *msginfo;
+       gchar *header = NULL;
+       gchar *key = NULL;
+       FILE *fp;
+
+       if (!summaryview->selected) return;
+
+       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+                                             summaryview->selected);
+       if (!msginfo) return;
+
+       switch (type) {
+       case FILTER_BY_NONE:
+               break;
+       case FILTER_BY_AUTO:
+               if ((fp = procmsg_open_message(msginfo)) == NULL) return;
+               procheader_get_header_fields(fp, hentry);
+               fclose(fp);
+
+               if (hentry[H_LIST_ID].body != NULL) {
+                       header = "List-Id";
+                       Xstrdup_a(key, hentry[H_LIST_ID].body, );
+               } else if (hentry[H_X_ML_NAME].body != NULL) {
+                       header = "X-ML-Name";
+                       Xstrdup_a(key, hentry[H_X_ML_NAME].body, );
+               } else if (hentry[H_X_LIST].body != NULL) {
+                       header = "X-List";
+                       Xstrdup_a(key, hentry[H_X_LIST].body, );
+               } else if (hentry[H_X_MAILING_LIST].body != NULL) {
+                       header = "X-Mailing-list";
+                       Xstrdup_a(key, hentry[H_X_MAILING_LIST].body, );
+               } else if (msginfo->subject) {
+                       header = "Subject";
+                       key = msginfo->subject;
+               }
+
+               g_free(hentry[H_LIST_ID].body);
+               hentry[H_LIST_ID].body = NULL;
+               g_free(hentry[H_X_ML_NAME].body);
+               hentry[H_X_ML_NAME].body = NULL;
+               g_free(hentry[H_X_LIST].body);
+               hentry[H_X_LIST].body = NULL;
+               g_free(hentry[H_X_MAILING_LIST].body);
+               hentry[H_X_MAILING_LIST].body = NULL;
+
+               break;
+       case FILTER_BY_FROM:
+               header = "From";
+               key = msginfo->from;
+               break;
+       case FILTER_BY_TO:
+               header = "To";
+               key = msginfo->to;
+               break;
+       case FILTER_BY_SUBJECT:
+               header = "Subject";
+               key = msginfo->subject;
+               break;
+       default:
+               break;
+       }
+
+       prefs_filter_open(header, key);
+}
+
+void summary_reply(SummaryView *summaryview, ComposeMode mode)
+{
+       GtkWidget *widget;
+       MsgInfo *msginfo;
+       GList  *sel = GTK_CLIST(summaryview->ctree)->selection;
+
+       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+                                             summaryview->selected);
+       if (!msginfo) return;
+
+       switch (mode) {
+       case COMPOSE_REPLY:
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             FALSE, FALSE);
+               break;
+       case COMPOSE_REPLY_WITH_QUOTE:
+               compose_reply(msginfo, TRUE, FALSE, FALSE);
+               break;
+       case COMPOSE_REPLY_WITHOUT_QUOTE:
+               compose_reply(msginfo, FALSE, FALSE, FALSE);
+               break;
+       case COMPOSE_REPLY_TO_SENDER:
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             FALSE, TRUE);
+               break;
+       case COMPOSE_FOLLOWUP_AND_REPLY_TO:
+               compose_followup_and_reply_to(msginfo,
+                                             prefs_common.reply_with_quote,
+                                             FALSE, TRUE);
+               break;
+       case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
+               compose_reply(msginfo, TRUE, FALSE, TRUE);
+               break;
+       case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
+               compose_reply(msginfo, FALSE, FALSE, TRUE);
+               break;
+       case COMPOSE_REPLY_TO_ALL:
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             TRUE, TRUE);
+               break;
+       case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
+               compose_reply(msginfo, TRUE, TRUE, FALSE);
+               break;
+       case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
+               compose_reply(msginfo, FALSE, TRUE, FALSE);
+               break;
+       case COMPOSE_FORWARD:
+               if (prefs_common.forward_as_attachment) {
+                       summary_reply_cb(summaryview, COMPOSE_FORWARD_AS_ATTACH, widget);
+                       return;
+               } else {
+                       summary_reply_cb(summaryview, COMPOSE_FORWARD_INLINE, widget);
+                       return;
+               }
+               break;
+       case COMPOSE_FORWARD_INLINE:
+               if (!sel->next) {
+                       compose_forward(NULL, msginfo, FALSE);
+                       break;
+               }
+               /* if (sel->next) FALL THROUGH */
+       case COMPOSE_FORWARD_AS_ATTACH:
+               {
+                       GSList *msginfo_list = NULL;
+                       for ( ; sel != NULL; sel = sel->next)
+                               msginfo_list = g_slist_append(msginfo_list, 
+                                       gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+                                               GTK_CTREE_NODE(sel->data)));
+                       compose_forward_multiple(NULL, msginfo_list);
+                       g_slist_free(msginfo_list);
+               }                       
+               break;
+       case COMPOSE_BOUNCE:
+               compose_bounce(NULL, msginfo);
+               break;
+       default:
+               g_warning("summary_reply_cb(): invalid action: %d\n", mode);
+       }
+
+       summary_set_marks_selected(summaryview);
+}
+
 /* color label */
 
 #define N_COLOR_LABELS colorlabel_get_color_count()
@@ -4151,12 +4384,11 @@ void summary_set_column_order(SummaryView *summaryview)
 
 /* callback functions */
 
-static void summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
-                                  SummaryView *summaryview)
+static void summary_toggle_view_cb(GtkWidget *button,
+                                  gpointer data)
 {
-       if (!event)
-               return;
-
+       SummaryView *summaryview = (SummaryView *) data;
+       
        if (!summaryview->msg_is_toggled_on && summaryview->selected)
                summary_display_msg(summaryview, summaryview->selected, FALSE);
        else
@@ -4197,69 +4429,16 @@ void summary_pass_key_press_event(SummaryView *summaryview, GdkEventKey *event)
 #define RETURN_IF_LOCKED() \
        if (summaryview->mainwin->lock_count) return
 
-#define KEY_PRESS_EVENT_STOP() \
-       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"); \
-       }
-
 static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(widget);
        GtkCTreeNode *node;
-       FolderItem *to_folder;
 
        if (summary_is_locked(summaryview)) return;
        if (!event) return;
 
        switch (event->keyval) {
-       case GDK_g:             /* Go */
-       case GDK_G:
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
-               to_folder = foldersel_folder_sel(NULL, NULL);
-               if (to_folder) {
-                       debug_print(_("Go to %s\n"), to_folder->path);
-                       folderview_select(summaryview->folderview, to_folder);
-               }
-               return;
-       case GDK_w:             /* Write new message */
-               BREAK_ON_MODIFIER_KEY();
-               if (summaryview->folder_item) {
-                       PrefsAccount *ac;
-                       ac = summaryview->folder_item->folder->account;
-                       if (ac && ac->protocol == A_NNTP)
-                               compose_new_with_recipient
-                                       (ac, summaryview->folder_item->path);
-                       else
-                               compose_new_with_folderitem(ac, summaryview->folder_item);
-               } else
-                       compose_new(NULL);
-               return;
-       case GDK_D:             /* Empty trash */
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
-               main_window_empty_trash(summaryview->mainwin, TRUE);
-               return;
-       case GDK_Q:             /* Quit */
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-
-               if (prefs_common.confirm_on_exit) {
-                       if (alertpanel(_("Exit"), _("Exit this program?"),
-                                      _("OK"), _("Cancel"), NULL)
-                                      == G_ALERTDEFAULT) {
-                               manage_window_focus_in
-                                       (summaryview->mainwin->window,
-                                        NULL, NULL);
-                               app_will_exit(NULL, summaryview->mainwin);
-                       }
-               }
-               return;
        case GDK_Left:          /* Move focus */
        case GDK_Escape:
                gtk_widget_grab_focus(summaryview->folderview->ctree);
@@ -4287,29 +4466,9 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                          FALSE))
                        summary_select_next_unread(summaryview);
                break;
-       case GDK_n:             /* Next */
-       case GDK_N:
-               BREAK_ON_MODIFIER_KEY();
-               summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
-               break;
        case GDK_BackSpace:     /* Page up */
                textview_scroll_page(summaryview->messageview->textview, TRUE);
                break;
-       case GDK_p:             /* Prev */
-       case GDK_P:
-               BREAK_ON_MODIFIER_KEY();
-               summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
-               break;
-       case GDK_v:             /* Toggle summary mode / message mode */
-       case GDK_V:
-               BREAK_ON_MODIFIER_KEY();
-
-               if (!summaryview->msg_is_toggled_on && summaryview->selected)
-                       summary_display_msg(summaryview,
-                                           summaryview->selected, FALSE);
-               else
-                       summary_toggle_view(summaryview);
-               break;
        case GDK_Return:        /* Scroll up/down one line */
                if (summaryview->displayed != summaryview->selected) {
                        summary_display_msg(summaryview,
@@ -4319,71 +4478,16 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                textview_scroll_one_line(summaryview->messageview->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_d:             /* Delete */
        case GDK_Delete:
                RETURN_IF_LOCKED();
                BREAK_ON_MODIFIER_KEY();
                summary_delete(summaryview);
                break;
-       case GDK_u:             /* Unmark */
-       case GDK_U:
-               BREAK_ON_MODIFIER_KEY();
-               summary_unmark(summaryview);
-               break;
-       case GDK_o:             /* Move */
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-               summary_move_to(summaryview);
-               break;
-       case GDK_O:             /* Copy */
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-               summary_copy_to(summaryview);
-               break;
-       case GDK_x:             /* Execute */
-       case GDK_X:
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
-               summary_execute(summaryview);
-               break;
-       case GDK_a:             /* Reply to the message */
-               BREAK_ON_MODIFIER_KEY();
-               summary_reply_cb(summaryview,
-                                COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL);
-               break;
-       case GDK_A:             /* Reply to the message with quotation */
-               BREAK_ON_MODIFIER_KEY();
-               summary_reply_cb(summaryview,
-                                COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL);
-               break;
-       case GDK_f:             /* Forward the message */
-               BREAK_ON_MODIFIER_KEY();
-               summary_reply_cb(summaryview, COMPOSE_FORWARD, NULL);
-               break;
-       case GDK_F:
-               BREAK_ON_MODIFIER_KEY();
-               summary_reply_cb(summaryview, COMPOSE_FORWARD_AS_ATTACH, NULL);
-               break;
-       case GDK_y:             /* Save the message */
-               BREAK_ON_MODIFIER_KEY();
-               summary_save_as(summaryview);
-               break;
        default:
                break;
        }
 }
 
-#undef BREAK_ON_MODIFIER_KEY
-#undef RETURN_IF_LOCKED
-#undef KEY_PRESS_EVENT_STOP
-
 static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
 {
        if (summaryview->folder_item->stype == F_OUTBOX ||
@@ -4415,6 +4519,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        summary_status_show(summaryview);
        summary_set_menu_sensitive(summaryview);
+       main_window_set_toolbar_sensitive(summaryview->mainwin);
 
        if (GTK_CLIST(ctree)->selection &&
             GTK_CLIST(ctree)->selection->next) {
@@ -4477,83 +4582,7 @@ static void summary_col_resized(GtkCList *clist, gint column, gint width,
 static void summary_reply_cb(SummaryView *summaryview, guint action,
                             GtkWidget *widget)
 {
-       MsgInfo *msginfo;
-       GList  *sel = GTK_CLIST(summaryview->ctree)->selection;
-
-       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
-                                             summaryview->selected);
-       if (!msginfo) return;
-
-       switch ((ComposeMode)action) {
-       case COMPOSE_REPLY:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, FALSE);
-               break;
-       case COMPOSE_REPLY_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, FALSE);
-               break;
-       case COMPOSE_REPLY_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, FALSE);
-               break;
-       case COMPOSE_REPLY_TO_SENDER:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, TRUE);
-               break;
-       case COMPOSE_FOLLOWUP_AND_REPLY_TO:
-               compose_followup_and_reply_to(msginfo,
-                                             prefs_common.reply_with_quote,
-                                             FALSE, TRUE);
-               break;
-       case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, TRUE);
-               break;
-       case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, TRUE);
-               break;
-       case COMPOSE_REPLY_TO_ALL:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             TRUE, TRUE);
-               break;
-       case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, TRUE, FALSE);
-               break;
-       case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, TRUE, FALSE);
-               break;
-       case COMPOSE_FORWARD:
-               if (prefs_common.forward_as_attachment) {
-                       summary_reply_cb(summaryview, COMPOSE_FORWARD_AS_ATTACH, widget);
-                       return;
-               } else {
-                       summary_reply_cb(summaryview, COMPOSE_FORWARD_INLINE, widget);
-                       return;
-               }
-               break;
-       case COMPOSE_FORWARD_INLINE:
-               if (!sel->next) {
-                       compose_forward(NULL, msginfo, FALSE);
-                       break;
-               }
-               /* if (sel->next) FALL THROUGH */
-       case COMPOSE_FORWARD_AS_ATTACH:
-               {
-                       GSList *msginfo_list = NULL;
-                       for ( ; sel != NULL; sel = sel->next)
-                               msginfo_list = g_slist_append(msginfo_list, 
-                                       gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
-                                               GTK_CTREE_NODE(sel->data)));
-                       compose_forward_multiple(NULL, msginfo_list);
-                       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);
-       }
-
-       summary_set_marks_selected(summaryview);
+       summary_reply(summaryview, (ComposeMode)action);
 }
 
 static void summary_execute_cb(SummaryView *summaryview, guint action,
@@ -4949,13 +4978,45 @@ static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
        GtkWidget *widget;
  
        widget = gtk_item_factory_get_item(gtk_item_factory_from_widget(summaryview->mainwin->menubar),
-                                          "/Summary/Hide read messages");
+                                          "/View/Hide read messages");
        gtk_object_set_data(GTK_OBJECT(widget), "dont_toggle",
                            GINT_TO_POINTER(1));
        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);
        gtk_object_set_data(GTK_OBJECT(widget), "dont_toggle",
                            GINT_TO_POINTER(0));
 }
+static void summaryview_subject_filter_init(PrefsFolderItem *prefs)
+{
+       int err;
+       gchar buf[BUFFSIZE];
+       if (prefs->enable_simplify_subject) {
+               if (prefs->simplify_subject_regexp && 
+                               *prefs->simplify_subject_regexp != 0x00) {
+
+                       if (!prefs->simplify_subject_preg) 
+                               prefs->simplify_subject_preg = g_new(regex_t, 1);
+                       else
+                               regfree(prefs->simplify_subject_preg);
+
+                       err = string_match_precompile(prefs->simplify_subject_regexp, 
+                                       prefs->simplify_subject_preg, REG_EXTENDED);
+                       if (err) {
+                               regerror(err, prefs->simplify_subject_preg, buf, BUFFSIZE);
+                               alertpanel_error(_("Regular expression (regexp) error:\n%s"), buf);
+                               g_free(prefs->simplify_subject_preg);
+                               prefs->simplify_subject_preg = NULL;
+                       }
+               } else {
+                       if (prefs->simplify_subject_preg) {
+                               regfree(prefs->simplify_subject_preg);
+                               g_free(prefs->simplify_subject_preg);
+                               prefs->simplify_subject_preg = NULL;
+                       }
+               }
+       }
+}
+
+
 /*
  * End of Source.
  */