2005-07-19 [colin] 1.9.12cvs81

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index 61e44a2d7872385ab9401503e2646290791ab3bf..9dc4205a5e4cd70def54004841aa05ecab386b23 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -888,13 +888,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        main_window_cursor_wait(summaryview->mainwin);
 
-/*
-       mlist = item->folder->get_msg_list(item->folder, item, !update_cache);
-
-       !!! NEW !!!
-       USE LIST FROM CACHE, WILL NOT DISPLAY ANY MESSAGES DROPED
-       BY OTHER PROGRAMS TO THE FOLDER
-*/
        mlist = folder_item_get_msg_list(item);
 
        if (summaryview->folder_item->hide_read_msgs) {
@@ -1291,7 +1284,7 @@ void summary_select_prev_unread(SummaryView *summaryview)
                        case NEXTUNREADMSGDIALOG_ALWAYS:
                                val = alertpanel(_("No more unread messages"),
                                                 _("No unread message found. "
-                                                  "Search from the end?"),
+                                                  "_Search from the end?"),
                                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_YES:
@@ -1384,7 +1377,7 @@ void summary_select_prev_new(SummaryView *summaryview)
 
                val = alertpanel(_("No more new messages"),
                                 _("No new message found. "
-                                  "Search from the end?"),
+                                  "_Search from the end?"),
                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,
@@ -1409,7 +1402,7 @@ void summary_select_next_new(SummaryView *summaryview)
                val = alertpanel(_("No more new messages"),
                                 _("No new message found. "
                                   "Go to next folder?"),
-                                GTK_STOCK_YES, _("Search again"),
+                                GTK_STOCK_YES, _("_Search again"),
                                 GTK_STOCK_NO);
                if (val == G_ALERTDEFAULT) {
                        g_signal_stop_emission_by_name(G_OBJECT(ctree),"key_press_event");
@@ -1437,7 +1430,7 @@ void summary_select_prev_marked(SummaryView *summaryview)
 
                val = alertpanel(_("No more marked messages"),
                                 _("No marked message found. "
-                                  "Search from the end?"),
+                                  "_Search from the end?"),
                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,
@@ -1462,7 +1455,7 @@ void summary_select_next_marked(SummaryView *summaryview)
 
                val = alertpanel(_("No more marked messages"),
                                 _("No marked message found. "
-                                  "Search from the beginning?"),
+                                  "_Search from the beginning?"),
                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_next_flagged_msg(summaryview, NULL,
@@ -1487,7 +1480,7 @@ void summary_select_prev_labeled(SummaryView *summaryview)
 
                val = alertpanel(_("No more labeled messages"),
                                 _("No labeled message found. "
-                                  "Search from the end?"),
+                                  "_Search from the end?"),
                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,
@@ -1512,7 +1505,7 @@ void summary_select_next_labeled(SummaryView *summaryview)
 
                val = alertpanel(_("No more labeled messages"),
                                 _("No labeled message found. "
-                                  "Search from the beginning?"),
+                                  "_Search from the beginning?"),
                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_next_flagged_msg(summaryview, NULL,
@@ -2764,7 +2757,6 @@ static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->moved--;
        if (MSG_IS_COPY(msginfo->flags))
                summaryview->copied--;
-       procmsg_update_unread_children (msginfo, TRUE);
 
        procmsg_msginfo_set_to_folder(msginfo, NULL);
        procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
@@ -3020,7 +3012,6 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->moved--;
        if (MSG_IS_COPY(msginfo->flags))
                summaryview->copied--;
-       procmsg_update_unread_children (msginfo, FALSE);
 
        procmsg_msginfo_set_to_folder(msginfo, NULL);
        procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, MSG_MOVE | MSG_COPY);
@@ -3154,7 +3145,6 @@ static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->moved--;
        if (MSG_IS_COPY(msginfo->flags))
                summaryview->copied--;
-       procmsg_update_unread_children (msginfo, FALSE);
 
        procmsg_msginfo_set_to_folder(msginfo, NULL);
        procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE | MSG_COPY);
@@ -3433,10 +3423,10 @@ void summary_save_as(SummaryView *summaryview)
 
        if ( aval==0 ) { /* append */
                if (append_file(src, dest, TRUE) < 0) 
-                       alertpanel_error(_("Can't save the file `%s'."), tmp);
+                       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'."), tmp);
+                       alertpanel_error(_("Can't save the file '%s'."), tmp);
        }
        g_free(src);
        
@@ -3451,7 +3441,7 @@ 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'."), tmp);
+                               alertpanel_error(_("Can't save the file '%s'."), tmp);
                }
                g_free(src);
        }
@@ -3477,12 +3467,12 @@ void summary_print(SummaryView *summaryview)
 #ifndef USE_GNOMEPRINT
        cmdline = input_dialog(_("Print"),
                               _("Enter the print command line:\n"
-                                "(`%s' will be replaced with file name)"),
+                                "('%s' will be replaced with file name)"),
                               prefs_common.print_cmd);
        if (!cmdline) return;
        if (!(p = strchr(cmdline, '%')) || *(p + 1) != 's' ||
            strchr(p + 2, '%')) {
-               alertpanel_error(_("Print command line is invalid:\n`%s'"),
+               alertpanel_error(_("Print command line is invalid:\n'%s'"),
                                 cmdline);
                g_free(cmdline);
                return;
@@ -3538,7 +3528,6 @@ 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);
@@ -3581,8 +3570,10 @@ gboolean summary_execute(SummaryView *summaryview)
        }
 
        if (summaryview->threaded) {
+               gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
                summary_thread_build(summaryview);
                summary_thread_init(summaryview);
+               gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
        }
 
        summaryview->selected = clist->selection ?
@@ -3600,8 +3591,6 @@ gboolean summary_execute(SummaryView *summaryview)
 
        gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
 
-       gtk_clist_thaw(clist);
-
        summary_unlock(summaryview);
        return TRUE;
 }