CVSROOT:        /cvs/gnome
Module name:    gnome-menus
Changes by:     markmc  05/04/04 05:57:00

Modified files:
        .              : ChangeLog 
        libmenu        : menu-tree.c 

Log message:
2005-04-04  Mark McLoughlin  <[EMAIL PROTECTED]>

Implement support for <Merge>, <Separator> etc. in
<DefaultLayout> and fix nasty infinite recursion bug
with <Merge type="all"/>

* libmenu/menu-tree.c:
(collect_layout_info), (process_layout): keep track
of the default layout info nodes too.
(merge_subdirs_and_entries): nullify subdirs and entries
list pointers after concatenating them.
(get_layout_info): use the default layout from the
nearest ancestor which has it set if we have no explicit
layout info.
(process_layout_info): free the layout and default layout
info lists once processed.

URL : 
http://cvs.gnome.org/bonsai/cvsquery.cgi?branch=&dir=gnome-menus&who=markmc&date=explicit&mindate=2005-04-04%2005:56&maxdate=2005-04-04%2005:58

_______________________________________________
cvs-commits-list mailing list
cvs-commits-list@gnome.org
http://mail.gnome.org/mailman/listinfo/cvs-commits-list

Reply via email to