fix font issues in summaryview
[claws.git] / src / summaryview.c
index 177ece37ee0b408935d8c0e5cc2e683044a3039c..8e42f8f21a7e3ce293f08b197f6de4272087f5bf 100644 (file)
@@ -20,6 +20,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkwidget.h>
@@ -45,7 +46,6 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "intl.h"
 #include "main.h"
 #include "menu.h"
 #include "mainwindow.h"
@@ -404,10 +404,10 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/Cancel a news message"),  NULL, summary_cancel,   0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Mark"),                  NULL, NULL,             0, "<Branch>"},
-       {N_("/_Mark/_Mark"),            "<shift>asterisk", summary_mark,        0, NULL},
-       {N_("/_Mark/_Unmark"),          "U", summary_unmark,    0, NULL},
+       {N_("/_Mark/_Mark"),            NULL, summary_mark,     0, NULL},
+       {N_("/_Mark/_Unmark"),          NULL, summary_unmark,   0, NULL},
        {N_("/_Mark/---"),              NULL, NULL,             0, "<Separator>"},
-       {N_("/_Mark/Mark as unr_ead"),  "<shift>exclam", summary_mark_as_unread, 0, NULL},
+       {N_("/_Mark/Mark as unr_ead"),  NULL, summary_mark_as_unread, 0, NULL},
        {N_("/_Mark/Mark as rea_d"),    NULL, summary_mark_as_read, 0, NULL},
        {N_("/_Mark/Mark all read"),    NULL, summary_mark_all_read, 0, NULL},
        {N_("/_Mark/Ignore thread"),    NULL, summary_ignore_thread, 0, NULL},
@@ -538,7 +538,7 @@ SummaryView *summary_create(void)
        gtk_widget_show(scrolledwin);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
                                       GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_ALWAYS);
+                                      GTK_POLICY_AUTOMATIC);
        gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
        gtk_widget_set_size_request(vbox,
                             prefs_common.summaryview_width,
@@ -611,10 +611,9 @@ SummaryView *summary_create(void)
 
 void summary_init(SummaryView *summaryview)
 {
-       static GdkFont *boldfont = NULL;
-       static GdkFont *smallfont = NULL;
-       GtkStyle *style;
        GtkWidget *pixmap;
+       PangoFontDescription *font_desc;
+       gint size;
 
        gtk_widget_realize(summaryview->ctree);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MARK,
@@ -642,39 +641,21 @@ void summary_init(SummaryView *summaryview)
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
                         &gpgsignedxpm, &gpgsignedxpmmask);
 
-       if (!small_style) {
-               PangoFontDescription *font_desc = NULL;
+       font_desc = pango_font_description_from_string(NORMAL_FONT);
+       gtk_widget_modify_font(summaryview->ctree, font_desc);
+       pango_font_description_free(font_desc);
 
-               small_style = gtk_style_copy
-                       (gtk_widget_get_style(summaryview->ctree));
-               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;
-               small_deleted_style = gtk_style_copy(small_style);
-               small_deleted_style->fg[GTK_STATE_NORMAL] =
-                       summaryview->color_dim;
-       }
        if (!bold_style) {
-               PangoFontDescription *font_desc = NULL;
                bold_style = gtk_style_copy
                        (gtk_widget_get_style(summaryview->ctree));
-               if (BOLD_FONT)
-                       font_desc = pango_font_description_from_string
-                                               (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);
+                       pango_font_description_free(bold_style->font_desc);
                        bold_style->font_desc = font_desc;
                }
+               
+               pango_font_description_set_weight
+                               (bold_style->font_desc, PANGO_WEIGHT_BOLD);
                bold_marked_style = gtk_style_copy(bold_style);
                bold_marked_style->fg[GTK_STATE_NORMAL] =
                        summaryview->color_marked;
@@ -683,11 +664,14 @@ void summary_init(SummaryView *summaryview)
                        summaryview->color_dim;
        }
 
-       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);
+       font_desc = pango_font_description_new();
+       size = pango_font_description_get_size
+               (summaryview->statlabel_folder->style->font_desc);
+       pango_font_description_set_size(font_desc, size * PANGO_SCALE_SMALL);
+       gtk_widget_modify_font(summaryview->statlabel_folder, font_desc);
+       gtk_widget_modify_font(summaryview->statlabel_select, font_desc);
+       gtk_widget_modify_font(summaryview->statlabel_msgs, font_desc);
+       pango_font_description_free(font_desc);
 
        pixmap = stock_pixmap_widget(summaryview->hbox_l, STOCK_PIXMAP_DIR_OPEN);
        gtk_box_pack_start(GTK_BOX(summaryview->hbox_l), pixmap, FALSE, FALSE, 4);
@@ -780,7 +764,7 @@ GtkCTreeNode * summary_find_prev_important_score(SummaryView *summaryview,
 
 #define CURRENTLY_DISPLAYED(m) \
 ( (m->msgnum == displayed_msgnum) \
-  && (!g_strcasecmp(m->folder->name,item->name)) )
+  && (!g_ascii_strcasecmp(m->folder->name,item->name)) )
 
 gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 {
@@ -800,13 +784,9 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        summary_lock(summaryview);
 
        if (!prefs_common.summary_quicksearch_sticky
+        && !prefs_common.summary_quicksearch_recurse
         && !quicksearch_is_running(summaryview->quicksearch)) {
-               FolderItemUpdateData source;
                quicksearch_set(summaryview->quicksearch, prefs_common.summary_quicksearch_type, "");
-
-               source.item = item;
-               source.update_flags = F_ITEM_UPDATE_ICON;
-               hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);                             
        }
 
        /* STATUSBAR_POP(summaryview->mainwin); */
@@ -823,14 +803,16 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        if (summaryview->mainwin->lock_count == 0 &&
            (summaryview->moved > 0 || summaryview->copied > 0)) {
                AlertValue val;
+               gboolean changed = FALSE;
 
                val = alertpanel(_("Process mark"),
                                 _("Some marks are left. Process it?"),
-                                _("Yes"), _("No"), _("Cancel"));
+                                GTK_STOCK_YES, GTK_STOCK_NO, GTK_STOCK_CANCEL);
                if (G_ALERTDEFAULT == val) {
                        summary_unlock(summaryview);
                        summary_execute(summaryview);
                        summary_lock(summaryview);
+                       changed = TRUE;
                } else if (G_ALERTALTERNATE == val) {
                        /* DO NOTHING */
                } else {
@@ -838,7 +820,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                        inc_unlock();
                        return FALSE;
                }
-               folder_update_op_count();
+               if (changed || !quicksearch_is_active(summaryview->quicksearch))
+                       folder_update_op_count();
        }
        
        gtk_clist_freeze(GTK_CLIST(ctree));
@@ -856,6 +839,15 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                gtk_clist_thaw(GTK_CLIST(ctree));
                summary_unlock(summaryview);
                inc_unlock();
+               if (item && quicksearch_is_running(summaryview->quicksearch)) {
+                       main_window_cursor_wait(summaryview->mainwin);
+                       quicksearch_reset_cur_folder_item(summaryview->quicksearch);
+                       if (quicksearch_is_active(summaryview->quicksearch))
+                               quicksearch_search_subfolders(summaryview->quicksearch, 
+                                             summaryview->folderview,
+                                             summaryview->folder_item);
+                       main_window_cursor_normal(summaryview->mainwin);
+               }                       
                return TRUE;
        }
        g_free(buf);
@@ -917,7 +909,18 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                        else
                                procmsg_msginfo_free(msginfo);
                }
-
+               
+               if (quicksearch_is_running(summaryview->quicksearch)) {
+                       /* only scan subfolders when quicksearch changed,
+                        * not when search is the same and folder changed */
+                       main_window_cursor_wait(summaryview->mainwin);
+                       quicksearch_reset_cur_folder_item(summaryview->quicksearch);
+                       quicksearch_search_subfolders(summaryview->quicksearch, 
+                                             summaryview->folderview,
+                                             summaryview->folder_item);
+                       main_window_cursor_normal(summaryview->mainwin);
+               }
+               
                g_slist_free(mlist);
                mlist = not_killed;
        }
@@ -961,10 +964,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
           create the thread */
        summary_set_ctree_from_list(summaryview, mlist);
 
-       g_slist_free(mlist);
 
-       if (summaryview->sort_key != SORT_BY_NONE)
-               summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type);
+       g_slist_free(mlist);
 
        gtk_clist_thaw(GTK_CLIST(ctree));
 
@@ -1248,9 +1249,16 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
 void summary_select_prev_unread(SummaryView *summaryview)
 {
        GtkCTreeNode *node;
+       gboolean skip_cur = FALSE;
+
+       if (summaryview->displayed 
+       &&  summaryview->selected == summaryview->displayed) {
+               debug_print("skipping current\n");
+               skip_cur = TRUE;
+       }
 
        node = summary_find_prev_flagged_msg
-               (summaryview, summaryview->selected, MSG_UNREAD, FALSE);
+               (summaryview, summaryview->selected, MSG_UNREAD, skip_cur);
 
        if (!node) {
                AlertValue val = 0;
@@ -1260,7 +1268,7 @@ void summary_select_prev_unread(SummaryView *summaryview)
                                val = alertpanel(_("No more unread messages"),
                                                 _("No unread message found. "
                                                   "Search from the end?"),
-                                                _("Yes"), _("No"), NULL);
+                                                GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_YES:
                                val = G_ALERTDEFAULT;
@@ -1287,9 +1295,17 @@ void summary_select_next_unread(SummaryView *summaryview)
 {
        GtkCTreeNode *node = summaryview->selected;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       gboolean skip_cur = FALSE;
+       
+       if (summaryview->displayed 
+       &&  summaryview->selected == summaryview->displayed) {
+               debug_print("skipping cur\n");
+               skip_cur = TRUE;
+       }
+
 
        node = summary_find_next_flagged_msg
-               (summaryview, node, MSG_UNREAD, FALSE);
+               (summaryview, node, MSG_UNREAD, skip_cur);
        
        if (node)
                summary_select_node(summaryview, node, TRUE, FALSE);
@@ -1304,7 +1320,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);
+                                                        GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                                        break;
                                case NEXTUNREADMSGDIALOG_ASSUME_YES:
                                        val = G_ALERTDEFAULT;
@@ -1344,7 +1360,7 @@ void summary_select_prev_new(SummaryView *summaryview)
                val = alertpanel(_("No more new messages"),
                                 _("No new message found. "
                                   "Search from the end?"),
-                                _("Yes"), _("No"), NULL);
+                                GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,
                                                     MSG_NEW, FALSE);
@@ -1368,7 +1384,8 @@ void summary_select_next_new(SummaryView *summaryview)
                val = alertpanel(_("No more new messages"),
                                 _("No new message found. "
                                   "Go to next folder?"),
-                                _("Yes"), _("Search again"), _("No"));
+                                GTK_STOCK_YES, _("Search again"),
+                                GTK_STOCK_NO);
                if (val == G_ALERTDEFAULT) {
                        g_signal_stop_emission_by_name(G_OBJECT(ctree),"key_press_event");
                        folderview_select_next_unread(summaryview->folderview);
@@ -1396,7 +1413,7 @@ void summary_select_prev_marked(SummaryView *summaryview)
                val = alertpanel(_("No more marked messages"),
                                 _("No marked message found. "
                                   "Search from the end?"),
-                                _("Yes"), _("No"), NULL);
+                                GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,
                                                     MSG_MARKED, TRUE);
@@ -1421,7 +1438,7 @@ void summary_select_next_marked(SummaryView *summaryview)
                val = alertpanel(_("No more marked messages"),
                                 _("No marked message found. "
                                   "Search from the beginning?"),
-                                _("Yes"), _("No"), NULL);
+                                GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_next_flagged_msg(summaryview, NULL,
                                                     MSG_MARKED, TRUE);
@@ -1446,7 +1463,7 @@ void summary_select_prev_labeled(SummaryView *summaryview)
                val = alertpanel(_("No more labeled messages"),
                                 _("No labeled message found. "
                                   "Search from the end?"),
-                                _("Yes"), _("No"), NULL);
+                                GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,
                                                     MSG_CLABEL_FLAG_MASK, TRUE);
@@ -1471,7 +1488,7 @@ void summary_select_next_labeled(SummaryView *summaryview)
                val = alertpanel(_("No more labeled messages"),
                                 _("No labeled message found. "
                                   "Search from the beginning?"),
-                                _("Yes"), _("No"), NULL);
+                                GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_next_flagged_msg(summaryview, NULL,
                                                     MSG_CLABEL_FLAG_MASK, TRUE);
@@ -2060,6 +2077,9 @@ void summary_sort(SummaryView *summaryview,
 
                main_window_cursor_normal(summaryview->mainwin);
 
+               if (summaryview->threaded)
+                       summary_thread_init(summaryview);
+
                debug_print("done.\n");
                STATUSBAR_POP(summaryview->mainwin);
        }
@@ -2145,8 +2165,6 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                }
 
                g_node_destroy(root);
-
-               summary_thread_init(summaryview);
        } else {
                gchar *text[N_SUMMARY_COLS];
                cur = mlist;
@@ -2194,6 +2212,8 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                debug_print("\tsubject hash table size = %d\n",
                            g_hash_table_size(subject_table));
        }
+
+       summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type);
 }
 
 static gchar *summary_complete_address(const gchar *addr)
@@ -2305,13 +2325,52 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row)
        summary_display_msg_full(summaryview, row, FALSE, FALSE);
 }
 
+static void msginfo_mark_as_read (SummaryView *summaryview, MsgInfo *msginfo,
+                                     GtkCTreeNode *row)
+{
+       g_return_if_fail(summaryview != NULL);
+       g_return_if_fail(msginfo != NULL);
+       g_return_if_fail(row != NULL);
+
+       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(summaryview->ctree));
+               summary_status_show(summaryview);
+       }
+}
+
+typedef struct  {
+       MsgInfo *msginfo;
+       SummaryView *summaryview;
+       GtkCTreeNode *row;
+} MarkAsReadData;
+
+static int msginfo_mark_as_read_timeout(void *data)
+{
+       MarkAsReadData *mdata = (MarkAsReadData *)data;
+       if (!mdata)
+               return FALSE;
+       
+       if (mdata->msginfo == summary_get_selected_msg(mdata->summaryview))
+               msginfo_mark_as_read(mdata->summaryview, mdata->msginfo,
+                                    mdata->row); 
+
+       g_free(mdata);
+
+       return FALSE;   
+}
+
 static void summary_display_msg_full(SummaryView *summaryview,
                                     GtkCTreeNode *row,
                                     gboolean new_window, gboolean all_headers)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
-       MsgFlags flags;
        gint val;
 
        if (!new_window) {
@@ -2351,19 +2410,16 @@ static void summary_display_msg_full(SummaryView *summaryview,
                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;
+       if (val == 0) {
+               if (prefs_common.mark_as_read_delay) {
+                       MarkAsReadData *data = g_new0(MarkAsReadData, 1);
+                       data->summaryview = summaryview;
+                       data->msginfo = msginfo;
+                       data->row = row;
+                       gtk_timeout_add(prefs_common.mark_as_read_delay * 1000,
+                               msginfo_mark_as_read_timeout, data);
+               } else if (new_window || !prefs_common.mark_as_read_on_new_window) {
+                       msginfo_mark_as_read(summaryview, msginfo, row);
                }
        }
 
@@ -2712,8 +2768,12 @@ void summary_mark(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
+       folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_mark_row(summaryview, GTK_CTREE_NODE(cur->data));
+       folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
 
        /* summary_step(summaryview, GTK_SCROLL_STEP_FORWARD); */
        summary_status_show(summaryview);
@@ -2746,11 +2806,13 @@ void summary_mark_as_read(SummaryView *summaryview)
        GList *cur;
 
        folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_mark_row_as_read(summaryview,
                                         GTK_CTREE_NODE(cur->data));
        folder_item_update_thaw();
-       
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
        summary_status_show(summaryview);
 }
 
@@ -2760,10 +2822,12 @@ void summary_msgs_lock(SummaryView *summaryview)
        GList *cur;
 
        folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_lock_row(summaryview,
                                         GTK_CTREE_NODE(cur->data));
        folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
        
        summary_status_show(summaryview);
 }
@@ -2774,10 +2838,12 @@ void summary_msgs_unlock(SummaryView *summaryview)
        GList *cur;
 
        folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_unlock_row(summaryview,
                                   GTK_CTREE_NODE(cur->data));
        folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
        
        summary_status_show(summaryview);
 }
@@ -2793,6 +2859,11 @@ void summary_mark_all_read(SummaryView *summaryview)
        for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
             node = gtkut_ctree_node_next(ctree, node))
                summary_mark_row_as_read(summaryview, node);
+       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
+            node = gtkut_ctree_node_next(ctree, node)) {
+               if (!GTK_CTREE_ROW(node)->expanded)
+                       summary_set_row_marks(summaryview, node);
+       }
        folder_item_update_thaw();
        gtk_clist_thaw(clist);
 
@@ -2829,10 +2900,12 @@ void summary_mark_as_unread(SummaryView *summaryview)
        GList *cur;
 
        folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_mark_row_as_unread(summaryview,
                                           GTK_CTREE_NODE(cur->data));
        folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
        
        summary_status_show(summaryview);
 }
@@ -2867,7 +2940,7 @@ static gboolean check_permission(SummaryView *summaryview, MsgInfo * msginfo)
                                        g_strdup_printf("%s",
                                                        account->address);
                        
-                       if (g_strcasecmp(from_name, msginfo->from) == 0) {
+                       if (g_utf8_collate(from_name, msginfo->from) == 0) {
                                g_free(from_name);
                                found = TRUE;
                                break;
@@ -2966,7 +3039,7 @@ void summary_delete(SummaryView *summaryview)
 
                aval = alertpanel(_("Delete message(s)"),
                                  _("Do you really want to delete message(s) from the trash?"),
-                                 _("Yes"), _("No"), NULL);
+                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (aval != G_ALERTDEFAULT) return;
 
                for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
@@ -2981,12 +3054,14 @@ void summary_delete(SummaryView *summaryview)
 
        /* next code sets current row focus right. We need to find a row
         * that is not deleted. */
-       folder_item_update_freeze();     
+       folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree)); 
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next) {
                sel_last = GTK_CTREE_NODE(cur->data);
                summary_delete_row(summaryview, sel_last);
        }
        folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
 
        node = summary_find_next_msg(summaryview, sel_last);
        if (!node)
@@ -3032,9 +3107,15 @@ void summary_unmark(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
+       folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree)); 
+
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_unmark_row(summaryview, GTK_CTREE_NODE(cur->data));
 
+       folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
        summary_status_show(summaryview);
 }
 
@@ -3077,15 +3158,21 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
        if (summary_is_locked(summaryview)) return;
 
        if (summaryview->folder_item == to_folder) {
-               alertpanel_notice(_("Destination is same as current folder."));
+               alertpanel_error(_("Destination is same as current folder."));
                return;
        }
 
+       folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree)); 
+
        for (cur = GTK_CLIST(summaryview->ctree)->selection;
             cur != NULL; cur = cur->next)
                summary_move_row_to
                        (summaryview, GTK_CTREE_NODE(cur->data), to_folder);
 
+       folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
        summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
 
        if (prefs_common.immediate_exec)
@@ -3153,16 +3240,22 @@ void summary_copy_selected_to(SummaryView *summaryview, FolderItem *to_folder)
        if (summary_is_locked(summaryview)) return;
 
        if (summaryview->folder_item == to_folder) {
-               alertpanel_notice
+               alertpanel_error
                        (_("Destination to copy is same as current folder."));
                return;
        }
 
+       folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree)); 
+
        for (cur = GTK_CLIST(summaryview->ctree)->selection;
             cur != NULL; cur = cur->next)
                summary_copy_row_to
                        (summaryview, GTK_CTREE_NODE(cur->data), to_folder);
 
+       folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
        summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
 
        if (prefs_common.immediate_exec)
@@ -3248,6 +3341,7 @@ void summary_save_as(SummaryView *summaryview)
        MsgInfo *msginfo;
        gchar *filename = NULL;
        gchar *src, *dest;
+       gchar *tmp;
 
        AlertValue aval = 0;
 
@@ -3264,37 +3358,37 @@ void summary_save_as(SummaryView *summaryview)
                gchar *oldstr = filename;
                filename = conv_codeset_strdup(filename,
                                               CS_UTF_8,
-                                              conv_get_current_charset_str());
+                                              conv_get_locale_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);
+               dest = filesel_select_file_save(_("Save as"), filename);
                g_free(filename);
        } else
-               dest = filesel_select_file(_("Save as"), filename);
+               dest = filesel_select_file_save(_("Save as"), filename);
        filename = NULL;
        if (!dest) return;
        if (is_file_exist(dest)) {
                aval = alertpanel(_("Append or Overwrite"),
                                  _("Append or overwrite existing file?"),
-                                 _("Append"), _("Overwrite"), _("Cancel"));
+                                 _("Append"), _("Overwrite"),
+                                 GTK_STOCK_CANCEL);
                if (aval != 0 && aval != 1)
                        return;
        }
 
        src = procmsg_get_message_file(msginfo);
+       tmp = g_path_get_basename(dest);
+
        if ( aval==0 ) { /* append */
                if (append_file(src, dest, TRUE) < 0) 
-                       alertpanel_error(_("Can't save the file `%s'."),
-                                        g_basename(dest));
+                       alertpanel_error(_("Can't save the file `%s'."), tmp);
        } else { /* overwrite */
                if (copy_file(src, dest, TRUE) < 0)
-                       alertpanel_error(_("Can't save the file `%s'."),
-                                        g_basename(dest));
+                       alertpanel_error(_("Can't save the file `%s'."), tmp);
        }
        g_free(src);
-
        
        /*
         * If two or more msgs are selected,
@@ -3307,11 +3401,12 @@ void summary_save_as(SummaryView *summaryview)
                        if (!msginfo) break;
                        src = procmsg_get_message_file(msginfo);
                        if (append_file(src, dest, TRUE) < 0)
-                               alertpanel_error(_("Can't save the file `%s'."),
-                                                g_basename(dest));
+                               alertpanel_error(_("Can't save the file `%s'."), tmp);
                }
                g_free(src);
        }
+       g_free(dest);
+       g_free(tmp);
 }
 
 void summary_print(SummaryView *summaryview)
@@ -3365,11 +3460,13 @@ gboolean summary_execute(SummaryView *summaryview)
                summary_unthread_for_exec(summaryview);
 
        folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        summary_execute_move(summaryview);
        summary_execute_copy(summaryview);
        summary_execute_delete(summaryview);
        folder_item_update_thaw();
-
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+       
        node = GTK_CTREE_NODE(clist->row_list);
        for (; node != NULL; node = next) {
                next = gtkut_ctree_node_next(ctree, node);
@@ -3600,7 +3697,6 @@ void summary_thread_build(SummaryView *summaryview)
 
                if (parent && parent != node) {
                        gtk_ctree_move(ctree, node, parent, NULL);
-                       gtk_ctree_expand(ctree, node);
                }
 
                node = next;
@@ -3610,8 +3706,6 @@ void summary_thread_build(SummaryView *summaryview)
 
        while (node) {
                next = GTK_CTREE_NODE_NEXT(node);
-               if (!summaryview->thread_collapsed)
-                       gtk_ctree_expand(ctree, node);
                if (prefs_common.bold_unread &&
                    GTK_CTREE_ROW(node)->children)
                        summary_set_row_marks(summaryview, node);
@@ -3643,7 +3737,7 @@ static void summary_thread_init(SummaryView *summaryview)
                while (node) {
                        next = GTK_CTREE_ROW(node)->sibling;
                        if (GTK_CTREE_ROW(node)->children)
-                               gtk_ctree_expand(ctree, node);
+                               gtk_ctree_expand_recursive(ctree, node);
                        node = next;
                }
        } else if (prefs_common.bold_unread) {
@@ -3994,10 +4088,12 @@ void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
 
        main_window_cursor_wait(summaryview->mainwin);
        folder_item_update_freeze();
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                summary_set_row_colorlabel(summaryview,
                                           GTK_CTREE_NODE(cur->data), labelcolor);
        folder_item_update_thaw();
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
        main_window_cursor_normal(summaryview->mainwin);
 }
 
@@ -4176,7 +4272,7 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
        gtk_ctree_set_expander_style(GTK_CTREE(ctree),
                                     GTK_CTREE_EXPANDER_TRIANGLE);
 #endif
-       gtk_ctree_set_indent(GTK_CTREE(ctree), 16);
+       gtk_ctree_set_indent(GTK_CTREE(ctree), 12);
        g_object_set_data(G_OBJECT(ctree), "user_data", summaryview);
 
        for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
@@ -4292,12 +4388,12 @@ static gboolean summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        if (!event) return FALSE;
 
        if (event->button == 3) {
-               summaryview->display_msg = TRUE;
+               summaryview->display_msg = messageview_is_visible(summaryview->messageview);
                /* right clicked */
                gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL,
                               NULL, NULL, event->button, event->time);
        } else if (event->button == 2) {
-               summaryview->display_msg = TRUE;
+               summaryview->display_msg = messageview_is_visible(summaryview->messageview);
        } else if (event->button == 1) {
                if (!prefs_common.emulate_emacs &&
                    messageview_is_visible(summaryview->messageview))
@@ -4329,10 +4425,14 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        MessageView *messageview;
        TextView *textview;
        GtkAdjustment *adj;
+       gboolean mod_pressed;
 
        if (summary_is_locked(summaryview)) return TRUE;
        if (!event) return TRUE;
 
+       if (quicksearch_has_focus(summaryview->quicksearch))
+               return FALSE;
+
        switch (event->keyval) {
        case GDK_Left:          /* Move focus */
                adj = gtk_scrolled_window_get_hadjustment
@@ -4347,9 +4447,12 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        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);
+                       do {
+                               next = (event->keyval == GDK_Down)
+                                       ? gtkut_ctree_node_next(ctree, next ? next:node)
+                                       : gtkut_ctree_node_prev(ctree, next ? next:node);
+                       } while (next && !gtk_ctree_is_viewable(ctree, next));
+
                        if (next) {
                                gtk_sctree_select_with_state
                                        (GTK_SCTREE(ctree), next, event->state);
@@ -4357,11 +4460,29 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                /* Deprecated - what are the non-deprecated equivalents? */
                                if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL)
                                        gtk_ctree_node_moveto(GTK_CTREE(ctree), next, 0, 0, 0);
-                                       
-                               return TRUE;
+                               summaryview->selected = next;
                        }
                }
-               break;
+               return TRUE;
+       case GDK_Home:
+       case GDK_End:
+               if ((node = summaryview->selected) != NULL) {
+                       GtkCTreeNode *next = NULL;
+                       next = (event->keyval == GDK_Home)
+                                       ? gtk_ctree_node_nth(ctree, 0)
+                                       : gtk_ctree_node_nth(ctree, 
+                                               g_list_length(GTK_CLIST(ctree)->row_list)-1);
+                       if (next) {
+                               gtk_sctree_select_with_state
+                                       (GTK_SCTREE(ctree), next, event->state);
+
+                               /* Deprecated - what are the non-deprecated equivalents? */
+                               if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL)
+                                       gtk_ctree_node_moveto(GTK_CTREE(ctree), next, 0, 0, 0);
+                               summaryview->selected = next;
+                       }
+               }
+               return TRUE;
        default:
                break;
        }
@@ -4387,9 +4508,16 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                                    summaryview->selected);
                                break;
                        }
-                       if (!textview_scroll_page(textview, FALSE))
-                               summary_select_next_unread(summaryview);
-               }                               
+                       mod_pressed = ((event->state & 
+                                       (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
+                       if (mod_pressed) {
+                               if (!textview_scroll_page(textview, TRUE))
+                                       summary_select_prev_unread(summaryview);
+                       } else {
+                               if (!textview_scroll_page(textview, FALSE))
+                                       summary_select_next_unread(summaryview);
+                       }                               
+               }
                break;
        case GDK_BackSpace:     /* Page up */
                textview_scroll_page(textview, TRUE);
@@ -4401,7 +4529,8 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                        break;
                }
                textview_scroll_one_line
-                       (textview, (event->state & GDK_MOD1_MASK) != 0);
+                       (textview, (event->state &
+                                   (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
                break;
        case GDK_Delete:
                BREAK_ON_MODIFIER_KEY();
@@ -4410,20 +4539,14 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        default:
                break;
        }
-       return TRUE;
+       return FALSE;
 }
 
 static void quicksearch_execute_cb(QuickSearch *quicksearch, gpointer data)
 {
        SummaryView *summaryview = data;
-       FolderItemUpdateData source;
 
        summary_show(summaryview, summaryview->folder_item);
-                   
-       source.item = summaryview->folder_item;
-       source.update_flags = F_ITEM_UPDATE_ICON;
-       hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);                             
-
 }
 
 static void tog_searchbar_cb(GtkWidget *w, gpointer data)
@@ -4574,17 +4697,12 @@ static void summary_reply_cb(SummaryView *summaryview, guint action,
 {
        MessageView *msgview = (MessageView*)summaryview->messageview;
        GSList *msginfo_list;
-       gchar *body;
 
        g_return_if_fail(msgview != NULL);
 
        msginfo_list = summary_get_selection(summaryview);
        g_return_if_fail(msginfo_list != NULL);
-
-       body = messageview_get_selection(msgview);
-
-       compose_reply_mode((ComposeMode)action, msginfo_list, body);
-       g_free(body);
+       compose_reply_from_messageview(msgview, msginfo_list, action);
        g_slist_free(msginfo_list);
 }
 
@@ -4711,7 +4829,7 @@ static void summary_drag_data_get(GtkWidget        *widget,
                                (ctree, GTK_CTREE_NODE(cur->data));
                        tmp2 = procmsg_get_message_file(msginfo);
                        if (!tmp2) continue;
-                       tmp1 = g_strconcat("file:/", tmp2, NULL);
+                       tmp1 = g_strconcat("file://", tmp2, NULL);
                        g_free(tmp2);
 
                        if (!mail_list) {
@@ -4783,7 +4901,7 @@ static gint func_name(GtkCList *clist,                                     \
        if (!msginfo2->var_name)                                         \
                return -1;                                               \
                                                                         \
-       return strcasecmp(msginfo1->var_name, msginfo2->var_name);       \
+       return g_utf8_collate(msginfo1->var_name, msginfo2->var_name);   \
 }
 
 CMP_FUNC_DEF(summary_cmp_by_to, to);
@@ -4825,7 +4943,7 @@ static gint summary_cmp_by_from(GtkCList *clist, gconstpointer ptr1,
        if (!str2)
                return -1;
  
-       return strcasecmp(str1, str2);
+       return g_utf8_collate(str1, str2);
 }
  
 static gint summary_cmp_by_simplified_subject
@@ -4932,14 +5050,15 @@ static void summary_ignore_thread(SummaryView *summaryview)
        GList *cur;
 
        folder_item_update_freeze();
-
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), 
                                        GTK_CTREE_FUNC(summary_ignore_thread_func), 
                                        summaryview);
 
        folder_item_update_thaw();
-
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+       
        summary_status_show(summaryview);
 }
 
@@ -4966,14 +5085,14 @@ static void summary_unignore_thread(SummaryView *summaryview)
        GList *cur;
 
        folder_item_update_freeze();
-
+       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
                gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), 
                                        GTK_CTREE_FUNC(summary_unignore_thread_func), 
                                        summaryview);
 
        folder_item_update_thaw();
-
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
        summary_status_show(summaryview);
 }
 
@@ -5272,3 +5391,18 @@ static void summary_find_answers (SummaryView *summaryview, MsgInfo *msg)
        if (node)
                summary_select_node(summaryview, node, TRUE, TRUE);
 }
+
+void summaryview_export_mbox_list(SummaryView *summaryview)
+{
+       GSList *list = summary_get_selected_msg_list(summaryview);
+       gchar *mbox = filesel_select_file_save(_("Export to mbox file"), NULL);
+       
+       if (mbox == NULL || list == NULL)
+               return;
+               
+       export_list_to_mbox(list, mbox);
+       
+       g_slist_free(list);
+       g_free(mbox);
+       
+}