From dfbb021651125925e770efa31f22bc492d18a32a Mon Sep 17 00:00:00 2001
From: Paul Mangan <paul@claws-mail.org>
Date: Thu, 30 Jan 2003 07:56:04 +0000
Subject: [PATCH 1/1] sync with 0.8.9cvs2

---
 ChangeLog         |  5 +++++
 ChangeLog.claws   |  5 +++++
 ChangeLog.jp      |  5 +++++
 configure.ac      |  2 +-
 src/summaryview.c | 11 ++++++++---
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9a6eb3a49..b0f58691c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-30
+
+	* src/summaryview.c: summary_status_show(): fixed a occasional crash
+	  on deleting or moving.
+
 2003-01-29
 
 	* src/codeconv.c: conv_unreadable_eucjp(): made the validity check
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8ce36c18b..294c10b15 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-01-30 [paul]	0.8.9claws21
+
+	* sync with 0.8.9cvs2
+		see ChangeLog 2003-01-30
+
 2003-01-29 [paul]	0.8.9claws20
 
 	* sync with 0.8.9cvs1
diff --git a/ChangeLog.jp b/ChangeLog.jp
index e9327b72b..7d28495dc 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,8 @@
+2003-01-30
+
+	* src/summaryview.c: summary_status_show(): ºï½ü¤¢¤ë¤¤¤Ï°ÜÆ°»þ¤Ë
+	  ¤¿¤Þ¤Ë¥¯¥é¥Ã¥·¥å¤¹¤ë¤Î¤ò½¤Àµ¡£
+
 2003-01-29
 
 	* src/codeconv.c: conv_unreadable_eucjp(): EUC-JP ¤ÎÀµÅöÀ­¥Á¥§¥Ã¥¯
diff --git a/configure.ac b/configure.ac
index 5dcd67546..99c395761 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws20
+EXTRA_VERSION=claws21
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/summaryview.c b/src/summaryview.c
index 6852c7f24..38d7570da 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1920,8 +1920,12 @@ static void summary_status_show(SummaryView *summaryview)
 		msginfo = gtk_ctree_node_get_row_data
 			(GTK_CTREE(summaryview->ctree),
 			 GTK_CTREE_NODE(cur->data));
-		sel_size += msginfo->size;
-		n_selected++;
+		if (!msginfo)
+			g_warning("summary_status_show(): msginfo == NULL\n");
+		else {
+			sel_size += msginfo->size;
+			n_selected++;
+		}
 	}
 
 	if (summaryview->folder_item->folder->type == F_NEWS) {
@@ -4755,7 +4759,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
 	summary_status_show(summaryview);
 
 	if (GTK_CLIST(ctree)->selection &&
-	     GTK_CLIST(ctree)->selection->next) {
+	    GTK_CLIST(ctree)->selection->next) {
 		summaryview->display_msg = FALSE;
 		summary_set_menu_sensitive(summaryview);
 		toolbar_main_set_sensitive(summaryview->mainwin);
@@ -4765,6 +4769,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
 	summaryview->selected = row;
 
 	msginfo = gtk_ctree_node_get_row_data(ctree, row);
+	g_return_if_fail(msginfo != NULL);
 
 	switch (column < 0 ? column : summaryview->col_state[column].type) {
 	case S_COL_MARK:
-- 
2.25.1