fixed sorting bug when flags changed.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@576 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 13 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index ab10afdb..a2dd8bc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-09-13
 
+	* src/summaryview.c: summary_set_row(): don't reset S_COL_TDATE
+	  (fixes sorting bug when flags changed).
+
+2005-09-13
+
 	* COPYING: updated GPL (changed the address of FSF).
 	* COPYING.LIB: added LGPL.
 
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 0d1d1c05..b83b6e82 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
 2005-09-13
 
+	* src/summaryview.c: summary_set_row(): S_COL_TDATE をリセットしない
+	  ようにした(フラグ変更時のソートのバグを修正)。
+
+2005-09-13
+
 	* COPYING: GPL を更新(FSF の住所を変更)。
 	* COPYING.LIB: LGPL を追加。
 
diff --git a/src/summaryview.c b/src/summaryview.c
index b0e7d2a1..8fbab49e 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1903,7 +1903,6 @@ static void summary_set_row(SummaryView *summaryview, GtkTreeIter *iter,
 			   S_COL_MSG_INFO, msginfo,
 
 			   S_COL_LABEL, color_val,
-			   S_COL_TDATE, 0,
 			   S_COL_TO, NULL,
 
 			   S_COL_FOREGROUND, foreground,
@@ -3352,29 +3351,18 @@ void summary_thread_build(SummaryView *summaryview)
 		if (node) {
 			GNode *cur;
 			GtkTreeIter child;
+			guint tdate;
 
 			for (cur = node->children; cur != NULL;
 			     cur = cur->next) {
 				summary_insert_gnode(summaryview, store, &child,
 						     &iter, NULL, cur);
 			}
-		} else
-			gtk_tree_store_remove(store, &iter);
-	}
 
-	valid = gtk_tree_model_get_iter_first(model, &next);
-	while (valid) {
-		guint tdate;
-
-		iter = next;
-		valid = gtk_tree_model_iter_next(model, &next);
-
-		gtk_tree_model_get(model, &iter, S_COL_MSG_INFO, &msginfo, -1);
-		node = g_hash_table_lookup(node_table, msginfo);
-		if (node) {
 			tdate = procmsg_get_thread_date(node);
 			gtk_tree_store_set(store, &iter, S_COL_TDATE, tdate, -1);
-		}
+		} else
+			gtk_tree_store_remove(store, &iter);
 	}
 
 	if (sort_key != SORT_BY_NONE)
@@ -3646,7 +3634,6 @@ static void summary_modify_threads(SummaryView *summaryview)
 	}
 
 	valid = gtk_tree_model_get_iter_first(model, &next);
-
 	while (valid) {
 		iter = next;
 		valid = gtk_tree_model_iter_next(model, &next);