[Commits] [SCM] claws branch, master, updated. 3.17.3-180-gfb814c0

[ticho at claws-mail.org]

The branch, master has been updated
       via  fb814c00c65c5a37ac91d0397f6fa65f1ca3e227 (commit)
      from  11a1c49cdbcc5dcafa5fdadfb47adc1588c164e6 (commit)

Summary of changes:
 src/summaryview.c |   15 +++++++++++++++
 1 file changed, 15 insertions(+)


- Log -----------------------------------------------------------------
commit fb814c00c65c5a37ac91d0397f6fa65f1ca3e227
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Tue May 14 23:20:08 2019 +0200

    Return summaryview cursor to selected mail when popup menu is done
    
    Fixes bug #3838: Canceled right-click on message
    list leaves UI in inconsistent state

diff --git a/src/summaryview.c b/src/summaryview.c
index d03d1b7..40d5514 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -532,6 +532,19 @@ GtkWidget *summary_get_main_widget(SummaryView *summaryview)
 		summary_update_msg, (gpointer) summaryview);	\
 }
 
+static void popup_menu_selection_done(GtkMenuShell *shell, gpointer user_data)
+{
+	SummaryView *summaryview = (SummaryView *)user_data;
+
+	cm_return_if_fail(summaryview != NULL);
+
+	/* If a message is displayed, place cursor back on the message. */
+	if (summaryview->displayed != NULL &&
+			summaryview->displayed != summaryview->selected) {
+		gtk_sctree_select(GTK_SCTREE(summaryview->ctree), summaryview->displayed);
+	}
+}
+
 SummaryView *summary_create(MainWindow *mainwin)
 {
 	SummaryView *summaryview;
@@ -2772,6 +2785,8 @@ static void summary_status_show(SummaryView *summaryview)
 					      n_new, n_unread, n_total,
 					      to_human_readable((goffset)n_size));
 
+	g_signal_connect(G_OBJECT(summaryview->popupmenu), "selection-done",
+			G_CALLBACK(popup_menu_selection_done), summaryview);
 
 		gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
 		g_free(str);

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


hooks/post-receive
-- 
Claws Mail