Don't update the message list when right-clicking on a folder.

After the folder's context menu closes the folder tree selection jumps
back to the folder whose contents are showing in the message list.
Suggested by Philippe LeCavalier on evolution-list.

2 files changed, 6 insertions, 2 deletions

diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 0bfa17c0cc..3e8bd9400b 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -1137,8 +1137,10 @@ e_shell_view_update_actions (EShellView *shell_view)
  * The #EShellView::update-actions signal is emitted just prior to
  * showing the menu to give @shell_view and any plugins that extend
  * @shell_view a chance to update the menu's actions.
+ *
+ * Returns: the popup menu being displayed
  **/
-void
+GtkWidget *
 e_shell_view_show_popup_menu (EShellView *shell_view,
                               const gchar *widget_path,
                               GdkEventButton *event)
@@ -1162,6 +1164,8 @@ e_shell_view_show_popup_menu (EShellView *shell_view,
 		gtk_menu_popup (
 			GTK_MENU (menu), NULL, NULL, NULL, NULL,
 			0, gtk_get_current_event_time ());
+
+	return menu;
 }
 
 /**
diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h
index cc40b761df..7b8fb13861 100644
--- a/shell/e-shell-view.h
+++ b/shell/e-shell-view.h
@@ -180,7 +180,7 @@ GKeyFile *	e_shell_view_get_state_key_file	(EShellView *shell_view);
 void		e_shell_view_set_state_dirty	(EShellView *shell_view);
 void		e_shell_view_execute_search	(EShellView *shell_view);
 void		e_shell_view_update_actions	(EShellView *shell_view);
-void		e_shell_view_show_popup_menu	(EShellView *shell_view,
+GtkWidget *	e_shell_view_show_popup_menu	(EShellView *shell_view,
 						 const gchar *widget_path,
 						 GdkEventButton *event);
 GalViewInstance *