sync with 0.8.9cvs2
authorPaul Mangan <paul@claws-mail.org>
Thu, 30 Jan 2003 07:56:04 +0000 (07:56 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 30 Jan 2003 07:56:04 +0000 (07:56 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
src/summaryview.c

index 9a6eb3a..b0f5869 100644 (file)
--- 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
index 8ce36c1..294c10b 100644 (file)
@@ -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
index e9327b7..7d28495 100644 (file)
@@ -1,3 +1,8 @@
+2003-01-30
+
+       * src/summaryview.c: summary_status_show(): ºï½ü¤¢¤ë¤¤¤Ï°ÜÆ°»þ¤Ë
+         ¤¿¤Þ¤Ë¥¯¥é¥Ã¥·¥å¤¹¤ë¤Î¤ò½¤Àµ¡£
+
 2003-01-29
 
        * src/codeconv.c: conv_unreadable_eucjp(): EUC-JP ¤ÎÀµÅöÀ­¥Á¥§¥Ã¥¯
index 5dcd675..99c3957 100644 (file)
@@ -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
index 6852c7f..38d7570 100644 (file)
@@ -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: