aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@ximian.com>2003-09-12 07:07:06 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-09-12 07:07:06 +0800
commite0d3bea8e3354a538c60262577f4a9f5474638bf (patch)
tree38513feb71c877bf66f9abbc35e7c1732793e085
parent526550693f707a6765698b82289202b270b870e3 (diff)
downloadgsoc2013-evolution-e0d3bea8e3354a538c60262577f4a9f5474638bf.tar.gz
gsoc2013-evolution-e0d3bea8e3354a538c60262577f4a9f5474638bf.tar.zst
gsoc2013-evolution-e0d3bea8e3354a538c60262577f4a9f5474638bf.zip
If the right_click_row_path is not NULL (i.e. a menu is being popped up
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(). svn path=/trunk/; revision=22541
-rw-r--r--shell/ChangeLog15
-rw-r--r--shell/e-shortcuts.c12
-rw-r--r--shell/e-storage-set-view.c5
3 files changed, 24 insertions, 8 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 9682a525b4..055a2837b9 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -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-09-11 Hans Petter Jansson <hpj@ximian.com>
* Makefile.am (evolution_LDADD): libical-evolution.la -> libical.la
diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c
index 5def82dcdb..697f50fe90 100644
--- a/shell/e-shortcuts.c
+++ b/shell/e-shortcuts.c
@@ -1079,12 +1079,12 @@ void
e_shortcuts_add_default_shortcuts (EShortcuts *shortcuts,
int group_num)
{
- e_shortcuts_add_shortcut (shortcuts, 0, -1, E_SUMMARY_URI, _("Summary"), 0, "summary", NULL);
+ e_shortcuts_add_shortcut (shortcuts, group_num, -1, E_SUMMARY_URI, _("Summary"), 0, "summary", NULL);
- e_shortcuts_add_shortcut (shortcuts, 0, -1, "default:mail", _("Inbox"), 0, "mail", "inbox");
- e_shortcuts_add_shortcut (shortcuts, 0, -1, "default:calendar", _("Calendar"), 0, "calendar", NULL);
- e_shortcuts_add_shortcut (shortcuts, 0, -1, "default:tasks", _("Tasks"), 0, "tasks", NULL);
- e_shortcuts_add_shortcut (shortcuts, 0, -1, "default:contacts", _("Contacts"), 0, "contacts", NULL);
+ e_shortcuts_add_shortcut (shortcuts, group_num, -1, "default:mail", _("Inbox"), 0, "mail", "inbox");
+ e_shortcuts_add_shortcut (shortcuts, group_num, -1, "default:calendar", _("Calendar"), 0, "calendar", NULL);
+ e_shortcuts_add_shortcut (shortcuts, group_num, -1, "default:tasks", _("Tasks"), 0, "tasks", NULL);
+ e_shortcuts_add_shortcut (shortcuts, group_num, -1, "default:contacts", _("Contacts"), 0, "contacts", NULL);
}
void
@@ -1095,7 +1095,7 @@ e_shortcuts_add_default_group (EShortcuts *shortcuts)
e_shortcuts_add_group (shortcuts, -1, _("Shortcuts"));
- e_shortcuts_add_default_shortcuts (shortcuts, -1);
+ e_shortcuts_add_default_shortcuts (shortcuts, e_shortcuts_get_num_groups (shortcuts) - 1);
}
void
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) {