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-shortcuts.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'shell/e-shortcuts.c') 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 -- cgit