sync with 0.9.5cvs4
authorPaul Mangan <paul@claws-mail.org>
Thu, 11 Sep 2003 08:09:42 +0000 (08:09 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 11 Sep 2003 08:09:42 +0000 (08:09 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.ac
src/summaryview.c

index 0ce25f5..638259e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-11
+
+       * src/summaryview.c: summary_key_pressed(): don't ignore delete key
+         even if the main window is locked.
+
 2003-09-10
 
        * src/action.c: improved synchronous action exit code (fixes long
index 6856299..98323ad 100644 (file)
@@ -1,3 +1,8 @@
+2003-09-11 [paul]      0.9.5claws3
+
+       * sync with 0.9.5cvs4
+               see ChangeLog 2003-09-11
+
 2003-09-11 [paul]      0.9.5claws2
 
        * sync with 0.9.5cvs2
index b13ce72..338b26c 100644 (file)
@@ -1,3 +1,8 @@
+2003-09-11
+
+       * src/summaryview.c: summary_key_pressed(): ¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤¬¥í¥Ã¥¯
+         ¤µ¤ì¤Æ¤¤¤Æ¤â delete ¥­¡¼¤ò̵»ë¤·¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
+
 2003-09-10
 
        * src/action.c: action ½ªÎ»¤Î¥³¡¼¥É¤ò²þÎÉ(RH9 ¤Ç action ½ªÎ»»þ¤Ë
index 257511d..3cba4fa 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=2
+EXTRA_VERSION=3
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
index 3dcb701..948da8c 100644 (file)
@@ -4427,9 +4427,6 @@ void summary_pass_key_press_event(SummaryView *summaryview, GdkEventKey *event)
 #define BREAK_ON_MODIFIER_KEY() \
        if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
 
-#define RETURN_IF_LOCKED() \
-       if (summaryview->mainwin->lock_count) return TRUE
-
 static gint summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                SummaryView *summaryview)
 {
@@ -4499,7 +4496,6 @@ static gint summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                summary_mark_as_unread(summaryview);
                break;
        case GDK_Delete:
-               RETURN_IF_LOCKED();
                BREAK_ON_MODIFIER_KEY();
                summary_delete(summaryview);
                break;