CVSROOT:        /cvs/gnome
Module name:    gnome-menus
Changes by:     markmc  05/03/22 07:32:37

Modified files:
        .              : ChangeLog 
        libmenu        : menu-layout.c menu-layout.h menu-tree.c 
                         menu-util.c 

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

Implement support for new "type" argument to <MergeFile>

* libmenu/menu-layout.[ch]:
(menu_layout_node_root_get_basedir): add basedir accessor.
(menu_layout_node_merge_file_get_type),
(menu_layout_node_merge_file_set_type): add type accessors.
(start_menu_child_element): read the attribute.

* libmenu/menu-tree.c:
(load_merge_file): return a boolean indicating whether the
file was successfully loaded.
(load_merge_file_with_config_dir): load a merge file from a
config dir.
(compare_basedir_to_config_dir): check to see if a basedir
matches a given config dir.
(load_parent_merge_file): try to find the parent of the
current menu file and load it if found.
(resolve_merge_file): load the parent menu file if requested.

* libmenu/menu-util.c: (append_to_string): output the "type"
attribute on <MergeFile>

URL : 
http://cvs.gnome.org/bonsai/cvsquery.cgi?branch=&dir=gnome-menus&who=markmc&date=explicit&mindate=2005-03-22%2007:31&maxdate=2005-03-22%2007:33

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

Reply via email to