[Commits] [SCM] claws branch, master, updated. 3.18.0-298-g7edd292d6

[paul at claws-mail.org]

The branch, master has been updated
       via  7edd292d6c795756b668eaec6f54030d6e4091a5 (commit)
      from  32bc9be42fcda9374267db361a204f64670c05b1 (commit)

Summary of changes:
 src/messageview.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)


- Log -----------------------------------------------------------------
commit 7edd292d6c795756b668eaec6f54030d6e4091a5
Author: paul <paul at claws-mail.org>
Date:   Fri Dec 3 15:01:01 2021 +0000

    in separate msgview Enter key opens currently selected msg
    
    also modify when to automatically show the next msg or not when moving/deleting current msg

diff --git a/src/messageview.c b/src/messageview.c
index cc8e0e739..44253b706 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2021 the Claws Mail team and 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
@@ -1855,6 +1855,13 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
 	if (event && (event->state & GDK_SHIFT_MASK) && event->keyval != GDK_KEY_space) 
 		return FALSE;
 
+	if (event && (event->keyval == GDK_KEY_KP_Enter || event->keyval ==  GDK_KEY_Return) &&
+	    messageview->window) {
+		MsgInfo *new_msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
+		messageview_show(messageview, new_msginfo, messageview->all_headers);
+		return FALSE;
+	}
+
 	return mimeview_pass_key_press_event(messageview->mimeview, event);
 }
 
@@ -2944,8 +2951,7 @@ static gboolean messageview_update_msg(gpointer source, gpointer data)
 		return FALSE;
 
 	if ((msginfo_update->flags & MSGINFO_UPDATE_DELETED) ||
-	    MSG_IS_DELETED(old_msginfo->flags))
-	{
+	    MSG_IS_DELETED(old_msginfo->flags)) {
 		if (messageview->new_window) {
 			if (old_msginfo->folder && old_msginfo->folder->total_msgs == 0) {
 				messageview_clear(messageview);
@@ -2954,20 +2960,19 @@ static gboolean messageview_update_msg(gpointer source, gpointer data)
 				return FALSE;
 			}
 			
-			if (!prefs_common.always_show_msg) {
-				messageview_clear(messageview);
-				textview_show_info(messageview->mimeview->textview,
-					MSG_IS_DELETED(old_msginfo->flags) ?
-					_("\n  Message has been deleted") :
-					_("\n  Message has been deleted or moved to another folder"));
+ 			if (!OPEN_SELECTED_ON_DELETEMOVE && !OPEN_SELECTED_ON_PREVNEXT) {
+ 				messageview_clear(messageview);
+  				textview_show_info(messageview->mimeview->textview,
+  					MSG_IS_DELETED(old_msginfo->flags) ?
+  					_("\n  Message has been deleted") :
+  					_("\n  Message has been deleted or moved to another folder"));
 			} else
 				messageview->update_needed = TRUE;
-
 		} else {
 			messageview_clear(messageview);
 			messageview_update(messageview, old_msginfo);
 		}
-	} 
+	}
 
 	return FALSE;
 }

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail