sync with 0.8.2cvs8

diff --git a/ChangeLog b/ChangeLog
index 8aa0ff510c80063e2ecf678e7fd0c036791c9b89..af526ad5d1211b86d346242ede57067f965aabe2 100644 (file)
--- 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 ff284dd2c11c435a503cfb825bc398e90fc6285f..cef7b4d867fc79629992088822421b3e5e3625e6 100644 (file)
--- 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 acb22f6db2a6003f27a6a7f6fea11027d23821af..9d3337a06a83619e91a151753a73dafdfbe5cc8e 100644 (file)
--- 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 1131534474224ca5c4d14d6a8874d4666073d195..4b8391fc7a5a721aa4b78c7fbc0c3eae9e34bcfe 100644 (file)
--- 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 9bcc3c7f8953009c7285dd17ab0cc570621660c2..e50ef1798b3b1b3568c55071e0fdbb7e4e3d4896 100644 (file)
--- 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 98c22d34081ee1141aeaf3185450fe0d27b5281f..7d590c120613c4647c039a63fd22736c8de9cccd 100644 (file)
--- 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 4de3d134742dfc835f83a4e872b94866aa74e606..cc9a05010ab1b1bd9834dc79440ab2e16158eb01 100644 (file)
--- 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: