2005-07-04 [colin] 1.9.12cvs18
authorColin Leroy <colin@colino.net>
Mon, 4 Jul 2005 21:00:33 +0000 (21:00 +0000)
committerColin Leroy <colin@colino.net>
Mon, 4 Jul 2005 21:00:33 +0000 (21:00 +0000)
* src/summaryview.c
Fix always_show_msg pref

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/summaryview.c

index b8becc29bbfd63719fc26ed1dca734cdd362dd56..88d2848f7f18ddd413ee049cccde41ab3ad2c803 100644 (file)
@@ -1,3 +1,8 @@
+2005-07-04 [colin]     1.9.12cvs18
+
+       * src/summaryview.c
+               Fix always_show_msg pref
+
 2005-07-04 [paul]      1.9.12cvs17
 
        sync with main (forgotten in last commit)
index 3d5dce799f076f9d30d96ee8fad7fc71c63335b7..6085ce014a4e9c13c8b4230e122960908d5999a5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.25.2.13 -r 1.25.2.14 src/stock_pixmap.c;  ) > 1.9.12cvs15.patchset
 ( cvs diff -u -r 1.382.2.139 -r 1.382.2.140 src/compose.c;  cvs diff -u -r 1.18.2.8 -r 1.18.2.9 src/jpilot.c;  cvs diff -u -r 1.47.2.21 -r 1.47.2.22 src/procheader.c;  cvs diff -u -r 1.14.2.2 -r 1.14.2.3 src/vcard.c;  ) > 1.9.12cvs16.patchset
 ( cvs diff -u -r 1.36.2.35 -r 1.36.2.36 src/common/utils.c;  cvs diff -u -r 1.20.2.18 -r 1.20.2.19 src/common/utils.h;  ) > 1.9.12cvs17.patchset
+( cvs diff -u -r 1.395.2.90 -r 1.395.2.91 src/summaryview.c;  ) > 1.9.12cvs18.patchset
index c7fc7b36cd0a657c8268198929624b67b4153a0c..155c38d9d92afdd3853a1f8553a1a7e374b437c8 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 268490edb186edf6d8bc52b4fb95cbba3ca120e5..61e44a2d7872385ab9401503e2646290791ab3bf 100644 (file)
@@ -1031,7 +1031,9 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                            TRUE);
                        summary_lock(summaryview);
                } else {
-                       summary_select_node(summaryview, node, FALSE, TRUE);
+                       summary_unlock(summaryview);
+                       summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
+                       summary_lock(summaryview);
                }
        }
 
@@ -1052,6 +1054,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
 #undef CURRENTLY_DISPLAYED
 
+
 void summary_clear_list(SummaryView *summaryview)
 {
        GtkCList *clist = GTK_CLIST(summaryview->ctree);
@@ -2541,7 +2544,6 @@ gboolean summary_step(SummaryView *summaryview, GtkScrollType type)
        GtkCTreeNode *node;
 
        if (summary_is_locked(summaryview)) return FALSE;
-
        if (type == GTK_SCROLL_STEP_FORWARD) {
                node = gtkut_ctree_node_next(ctree, summaryview->selected);
                if (node)
@@ -3111,7 +3113,7 @@ void summary_delete(SummaryView *summaryview)
        if (!node)
                node = summary_find_prev_msg(summaryview, sel_last);
 
-       summary_select_node(summaryview, node, FALSE, FALSE);
+       summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
        
        if (prefs_common.immediate_exec || item->stype == F_TRASH) {
                summary_execute(summaryview);
@@ -3242,7 +3244,7 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
                GtkCTreeNode *node = gtk_ctree_node_nth (GTK_CTREE(summaryview->ctree), 
                                                         GTK_CLIST(summaryview->ctree)->rows - 1);
                if (node)
-                       summary_select_node(summaryview, node, TRUE, TRUE);
+                       summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
        }
 
 }
@@ -3570,10 +3572,12 @@ gboolean summary_execute(SummaryView *summaryview)
        }
 
        if (new_selected) {
+               summary_unlock(summaryview);
                gtk_sctree_select
                        (GTK_SCTREE(ctree),
                         summaryview->displayed ? summaryview->displayed
                         : new_selected);
+               summary_lock(summaryview);
        }
 
        if (summaryview->threaded) {
@@ -4628,8 +4632,9 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        MsgInfo *msginfo;
        gboolean marked_unread = FALSE;
 
-       if (summary_is_locked(summaryview))
+       if (summary_is_locked(summaryview)) {
                return;
+       }
 
        summary_status_show(summaryview);