CVSROOT: /cvs/gnome
Module name: gnome-menus
Changes by: markmc 05/05/30 04:11:08
Modified files:
. : ChangeLog
libmenu : gmenu-tree.c
Log message:
2005-05-30 Mark McLoughlin <[EMAIL PROTECTED]>
Fix problem where menus and items mentioned in a <Layout>
after a <Merge type="menus"> or <Merge type="files">
Bug #305723
* libmenu/gmenu-tree.c:
(find_name_in_list): helper function.
(merge_subdirs), (merge_entries),
(merge_subdirs_and_entries): accept lists of menus or files
which appear after the merge and don't merge them.
(get_subdirs_from_layout_info),
(get_entries_from_layout_info): get a list of the menus or
files specified after a merge.
(process_layout_info): pass the exception lists to the
merge operations.
URL :
http://cvs.gnome.org/bonsai/cvsquery.cgi?branch=&dir=gnome-menus&who=markmc&date=explicit&mindate=2005-05-30%2004:10&maxdate=2005-05-30%2004:12
_______________________________________________
cvs-commits-list mailing list
cvs-commits-list@gnome.org
http://mail.gnome.org/mailman/listinfo/cvs-commits-list
