From 051af4ef8497f8c6a39d3a9d85f8c4baf5e149cc Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Fri, 10 Jun 2005 07:32:51 +0000
Subject: really fixed the crash bug.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@331 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog         |  5 +++++
 ChangeLog.ja      |  5 +++++
 src/summaryview.c | 32 +++++++++++++++++++++++++++-----
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 47eda0bc..087a66e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-10
+
+	* src/summaryview.c: summary_modify_node(): really fixed the crash
+	  bug (referred freed memory on sorting).
+
 2005-06-10
 
 	* src/summaryview.c: flush events before scrolling to selected.
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 3a089b6a..427b1134 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,8 @@
+2005-06-10
+
+	* src/summaryview.c: summary_modify_node(): クラッシュバグを本当に
+	  修正(ソート時に開放したメモリを参照していた)。
+
 2005-06-10
 
 	* src/summaryview.c: 選択部へスクロールする前にイベントをフラッシュ
diff --git a/src/summaryview.c b/src/summaryview.c
index 1e9f3587..c8ed68ae 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1918,6 +1918,25 @@ static void summary_insert_gnode(SummaryView *summaryview, GtkTreeStore *store,
 	}
 }
 
+static void summary_insert_gnode_before(SummaryView *summaryview,
+					GtkTreeStore *store,
+					GtkTreeIter *iter, GtkTreeIter *parent,
+					GtkTreeIter *sibling, GNode *gnode)
+{
+	MsgInfo *msginfo = (MsgInfo *)gnode->data;
+
+	gtk_tree_store_insert_before(store, iter, parent, sibling);
+
+	summary_set_row(summaryview, iter, msginfo);
+
+	for (gnode = gnode->children; gnode != NULL; gnode = gnode->next) {
+		GtkTreeIter child;
+
+		summary_insert_gnode_before(summaryview, store, &child, iter,
+					    NULL, gnode);
+	}
+}
+
 static void summary_set_tree_model_from_list(SummaryView *summaryview,
 					     GSList *mlist)
 {
@@ -3471,6 +3490,7 @@ static void summary_modify_node(SummaryView *summaryview, GtkTreeIter *iter,
 	MsgInfo *msginfo, *sel_msginfo = NULL;
 	GNode *root, *cur;
 	GtkTreeIter iter_, sibling;
+	GtkTreeIter *sibling_p = NULL;
 	GtkTreePath *path, *sel_path;
 	gboolean found = FALSE;
 
@@ -3498,9 +3518,14 @@ static void summary_modify_node(SummaryView *summaryview, GtkTreeIter *iter,
 	/* g_node_traverse(root, G_PRE_ORDER, G_TRAVERSE_ALL, -1, traverse, NULL); */
 
 	sibling = *iter;
+	if (gtk_tree_model_iter_next(model, &sibling))
+		sibling_p = &sibling;
+
+	gtk_tree_store_remove(GTK_TREE_STORE(model), iter);
+
 	for (cur = root->children; cur != NULL; cur = cur->next) {
-		summary_insert_gnode(summaryview, GTK_TREE_STORE(model),
-				     &iter_, NULL, &sibling, cur);
+		summary_insert_gnode_before(summaryview, GTK_TREE_STORE(model),
+					    &iter_, NULL, sibling_p, cur);
 		if (summaryview->folder_item->threaded &&
 		    prefs_common.expand_thread) {
 			path = gtk_tree_model_get_path(model, &iter_);
@@ -3514,13 +3539,10 @@ static void summary_modify_node(SummaryView *summaryview, GtkTreeIter *iter,
 				(model, selected, &iter_,
 				 S_COL_MSG_INFO, sel_msginfo);
 		}
-		sibling = iter_;
 	}
 
 	g_node_destroy(root);
 
-	gtk_tree_store_remove(GTK_TREE_STORE(model), iter);
-
 	summaryview->folder_item->cache_dirty = TRUE;
 }
 
-- 
cgit v1.2.3