aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/headerview.c3
-rw-r--r--src/summaryview.c9
3 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a705c7af..ddaaa4c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-15
+
+ * src/summaryview.c: summary_key_pressed(): fixed a bug that Return,
+ Space and Delete key are ignored when multiple messages were
+ selected.
+ * src/headerview.c: added missing gtk/gtkimage.h include.
+
2005-05-13
* version 1.9.10
diff --git a/src/headerview.c b/src/headerview.c
index 6e4ed219..67452e65 100644
--- a/src/headerview.c
+++ b/src/headerview.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -32,6 +32,7 @@
#include <gtk/gtkvbox.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkpixmap.h>
+#include <gtk/gtkimage.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
diff --git a/src/summaryview.c b/src/summaryview.c
index bf5574f9..aee43efe 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4032,7 +4032,8 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
break;
}
- if (!summaryview->selected)
+ if (!summaryview->selected &&
+ gtk_tree_selection_count_selected_rows(summaryview->selection) == 0)
return FALSE;
messageview = summaryview->messageview;
@@ -4048,7 +4049,8 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
switch (event->keyval) {
case GDK_space: /* Page down or go to the next */
- if (!gtkut_tree_row_reference_equal(summaryview->displayed,
+ if (summaryview->selected &&
+ !gtkut_tree_row_reference_equal(summaryview->displayed,
summaryview->selected)) {
summary_display_msg_selected(summaryview, FALSE, FALSE);
} else if (mod_pressed) {
@@ -4063,7 +4065,8 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
textview_scroll_page(textview, TRUE);
return TRUE;
case GDK_Return: /* Scroll up/down one line */
- if (!gtkut_tree_row_reference_equal(summaryview->displayed,
+ if (summaryview->selected &&
+ !gtkut_tree_row_reference_equal(summaryview->displayed,
summaryview->selected)) {
summary_display_msg_selected(summaryview, FALSE, FALSE);
} else