[evolution-patches] Shell hang fix (#48388)

[Ettore Perazzoli <ettore ximian com>]

I am not 100% sure this is the actual fix, since I could only reproduce
once...  However this seems the only possible explanation, and the patch
should do no harm.

-- Ettore

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1286.2.6
diff -u -p -r1.1286.2.6 ChangeLog
--- ChangeLog	30 Jul 2003 13:57:14 -0000	1.1286.2.6
+++ ChangeLog	11 Sep 2003 19:41:15 -0000
@@ -1,3 +1,18 @@
+2003-09-11  Ettore Perazzoli  <ettore ximian com>
+
+	* e-storage-set-view.c (impl_right_click): If the
+	right_click_row_path is not NULL (i.e. a menu is being popped up
+	already), don't pop up the menu again.  [#48388]
+
+2003-09-11  Ettore Perazzoli  <ettore ximian com>
+
+	[#47875, thanks to Calvin Liu for figuring this out.]
+
+	* e-shortcuts.c (e_shortcuts_add_default_shortcuts): Use the
+	group_num arg, so it gets added to the proper group.
+	(e_shortcuts_add_default_group): Pass the actual group number to
+	e_shortcuts_add_default_shortcuts().
+
 2003-07-17  Dan Winship  <danw ximian com>
 
 	* e-shell-user-creatable-items-handler.c (free_menu_items): free
Index: e-storage-set-view.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-storage-set-view.c,v
retrieving revision 1.188
diff -u -p -r1.188 e-storage-set-view.c
--- e-storage-set-view.c	18 May 2003 00:48:03 -0000	1.188
+++ e-storage-set-view.c	11 Sep 2003 19:41:15 -0000
@@ -1257,9 +1257,10 @@ impl_right_click (ETree *etree,
 	storage_set_view = E_STORAGE_SET_VIEW (etree);
 	priv = storage_set_view->priv;
 
-	/* This should never happen, but you never know with ETree.  */
+	/* Avoid recursion which would lock up the event loop (#48388).  */
 	if (priv->right_click_row_path != NULL)
-		g_free (priv->right_click_row_path);
+		return TRUE;
+
 	priv->right_click_row_path = g_strdup (e_tree_memory_node_get_data (E_TREE_MEMORY(priv->etree_model), path));
 
 	if (priv->ui_container) {