From 677ac2d43d63d5da71ab69d6508d9287bca3d648 Mon Sep 17 00:00:00 2001
From: Paul Mangan <paul@claws-mail.org>
Date: Tue, 3 Sep 2002 07:47:27 +0000
Subject: [PATCH] sync with 0.8.2cvs8

---
 ChangeLog         | 12 ++++++++++++
 ChangeLog.claws   |  5 +++++
 ChangeLog.jp      | 11 +++++++++++
 configure.in      |  2 +-
 src/news.c        |  4 ----
 src/summaryview.c | 19 ++++++++++++++-----
 src/textview.c    |  4 ++++
 7 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8aa0ff510..af526ad5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2002-09-03
+
+	* src/textview.c: textview_key_pressed(): pass GDK_Delete event to
+	  SummaryView.
+	* src/summaryview.c: summary_key_pressed(): scroll correct TextView
+	  on MIME mode.
+
+2002-09-02
+
+	* src/news.c: news_scan_group(): fixed wrong message number
+	  calculation.
+
 2002-08-30
 
 	* major refactoring for POP3.
diff --git a/ChangeLog.claws b/ChangeLog.claws
index ff284dd2c..cef7b4d86 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-09-03 [paul]	0.8.2claws24
+
+	* sync with 0.8.2cvs8
+		see ChangeLog 2002-09-02 and 2002-09-03
+
 2002-09-03 [darko]	0.8.2claws23
 
 	* src/folderview.c
diff --git a/ChangeLog.jp b/ChangeLog.jp
index acb22f6db..9d3337a06 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,14 @@
+2002-09-03
+
+	* src/textview.c: textview_key_pressed(): GDK_Delete ¥¤¥Ù¥ó¥È¤ò
+	  SummaryView ¤ËÅϤ¹¤è¤¦¤Ë¤·¤¿¡£
+	* src/summaryview.c: summary_key_pressed(): MIME ¥â¡¼¥É¤Î¤È¤­¤Ë
+	  Àµ¤·¤¤ TextView ¤ò¥¹¥¯¥í¡¼¥ë¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
+2002-09-02
+
+	* src/news.c: news_scan_group(): ¸í¤Ã¤¿¥á¥Ã¥»¡¼¥¸¿ô·×»»¤ò½¤Àµ¡£
+
 2002-08-30
 
 	* ¼çÍ×¤Ê POP3 ¤Î¥ê¥Õ¥¡¥¯¥¿¥ê¥ó¥°¡£
diff --git a/configure.in b/configure.in
index 113153447..4b8391fc7 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws23
+EXTRA_VERSION=claws24
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/news.c b/src/news.c
index 9bcc3c7f8..e50ef1798 100644
--- a/src/news.c
+++ b/src/news.c
@@ -424,10 +424,6 @@ gint news_scan_group(Folder *folder, FolderItem *item)
 	else {
 		if (min < first)
 			min = first;
-		else if (first < min) {
-			num -= min - first;
-			first = min;
-		}
 
 		if (last < max)
 			max = last;
diff --git a/src/summaryview.c b/src/summaryview.c
index 98c22d340..7d590c120 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4456,6 +4456,8 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
 {
 	GtkCTree *ctree = GTK_CTREE(widget);
 	GtkCTreeNode *node;
+	MessageView *messageview;
+	TextView *textview;
 
 	if (summary_is_locked(summaryview)) return;
 	if (!event) return;
@@ -4477,6 +4479,14 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
 			return;
 	}
 
+	messageview = summaryview->messageview;
+	if (messageview->type == MVIEW_MIME &&
+	    gtk_notebook_get_current_page
+		(GTK_NOTEBOOK(messageview->mimeview->notebook)) == 1)
+		textview = messageview->mimeview->textview;
+	else
+		textview = messageview->textview;
+
 	switch (event->keyval) {
 	case GDK_space:		/* Page down or go to the next */
 		if (summaryview->displayed != summaryview->selected) {
@@ -4484,12 +4494,11 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
 					    summaryview->selected);
 			break;
 		}
-		if (!textview_scroll_page(summaryview->messageview->textview,
-					  FALSE))
+		if (!textview_scroll_page(textview, FALSE))
 			summary_select_next_unread(summaryview);
 		break;
 	case GDK_BackSpace:	/* Page up */
-		textview_scroll_page(summaryview->messageview->textview, TRUE);
+		textview_scroll_page(textview, TRUE);
 		break;
 	case GDK_Return:	/* Scroll up/down one line */
 		if (summaryview->displayed != summaryview->selected) {
@@ -4497,8 +4506,8 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
 					    summaryview->selected);
 			break;
 		}
-		textview_scroll_one_line(summaryview->messageview->textview,
-					 (event->state & GDK_MOD1_MASK) != 0);
+		textview_scroll_one_line
+			(textview, (event->state & GDK_MOD1_MASK) != 0);
 		break;
 	case GDK_asterisk:	/* Mark */
 		summary_mark(summaryview);
diff --git a/src/textview.c b/src/textview.c
index 4de3d1347..cc9a05010 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -1661,6 +1661,10 @@ static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
 		textview_scroll_one_line(textview,
 					 (event->state & GDK_MOD1_MASK) != 0);
 		break;
+	case GDK_Delete:
+		if (summaryview)
+			summary_pass_key_press_event(summaryview, event);
+		break;
 	case GDK_n:
 	case GDK_N:
 	case GDK_p:
-- 
2.25.1