** Fix for bug #494320

2007-11-13  Ondrej Jirman  <megous@megous.com>

	** Fix for bug #494320

	* e-popup.c: (e_popup_create_menu): Add support for redefining
	existing menu items.


svn path=/trunk/; revision=34530
This commit is contained in:
Ondrej Jirman
2007-11-13 18:36:02 +00:00
committed by Milan Crha
parent 303194b97a
commit 11cf7790eb
2 changed files with 13 additions and 0 deletions

View File

@ -1,3 +1,10 @@
2007-11-13 Ondrej Jirman <megous@megous.com>
** Fix for bug #494320
* e-popup.c: (e_popup_create_menu): Add support for redefining
existing menu items.
2007-11-05 Milan Crha <mcrha@redhat.com>
** Fix for bug #492692

View File

@ -507,9 +507,15 @@ e_popup_create_menu(EPopup *emp, EPopupTarget *target, guint32 mask)
/* create tree structure */
for (i=0;i<items->len;i++) {
struct _item_node *inode = items->pdata[i], *pnode;
struct _item_node *nextnode = (i + 1 < items->len) ? items->pdata[i+1] : NULL;
struct _EPopupItem *item = inode->item;
const char *tmp;
if (nextnode && !strcmp (nextnode->item->path, item->path)) {
d(printf ("skipping item %s\n", item->path));
continue;
}
g_string_truncate(ppath, 0);
tmp = strrchr(item->path, '/');
if (tmp) {