callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If the right_click_row_path is not NULL (i.e. a menu is being popped up

Browse Source 
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
This commit is contained in:
Ettore Perazzoli
2003-09-11 23:07:06 +00:00
committed by Ettore Perazzoli
parent 526550693f
commit e0d3bea8e3
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
shell/ChangeLog
View File

@ -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

12
shell/e-shortcuts.c
View File

@ -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

5
shell/e-storage-set-view.c
View File

@ -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) {