From e0d3bea8e3354a538c60262577f4a9f5474638bf Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Thu, 11 Sep 2003 23:07:06 +0000 Subject: If the right_click_row_path is not NULL (i.e. a menu is being popped up 2003-09-11 Ettore Perazzoli * 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 [#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(). svn path=/trunk/; revision=22541 --- shell/e-storage-set-view.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'shell/e-storage-set-view.c') diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index 5ec5a9d46b..392cff712c 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -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) { -- cgit v1.2.3