2005-03-23  Mark McLoughlin  <mark@skynet.ie>

	* configure.in: Version 2.10.1.
	
2005-03-22  Mark McLoughlin  <mark@skynet.ie>

	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>

2005-03-16  Mark McLoughlin  <mark@skynet.ie>

	Fix problem where if you installed an app which created
	$XDG_DATA_DIRS/menus/applications-merged for the first
	time and dumped its .menu file there, we wouldn't notice
	and re-load the menu.

	* libmenu/menu-tree.c:
	(handle_menu_file_changed): always re-canonicalize so
	that monitors get removed and re-added.
	(handle_menu_file_directory_changed): callback for
	<MergeDir> monitors.
	(menu_tree_add_menu_file_monitor): handle adding <MergeDir>
	monitors.
	(load_merge_file): add a monitor if the <MergeFile> doesn't
	exist.
	(load_merge_dir): always monitor the <MergeDir>

2005-03-09  Mark McLoughlin  <mark@skynet.ie>

	* libmenu/menu-tree.c:
	(add_app_dir), (resolve_default_app_dirs),
	(add_directory_dir), (resolve_default_directory_dirs),
	(add_legacy_dir),(resolve_kde_legacy_dirs): Better fix
	for bug #164309 - get the dirs in the right order.
	(resolve_default_merge_dirs): add the <MergeDir>s in
	reverse order.

2005-03-08  Mark McLoughlin  <mark@skynet.ie>

	Fix for bug #164309 - .directory files in
	~/.local/share/desktop-directories not overriding the
	system versions.

	* libmenu/menu-tree.c:
	(resolve_default_app_dirs), (resolve_default_directory_dirs),
	(resolve_kde_legacy_dirs): append the user dir after the
	system dirs since it has higher priority.

2005-03-08  Mark McLoughlin  <mark@skynet.ie>

	Fix for bug #169031 - .directory files in subdirs of
	<LegacyDir> not getting pulled in.

	* libmenu/menu-tree.c:
	(add_menu_for_legacy_dir): put the relative path
	from the <LegacyDir> into the generated <Directory>
	rather than just ".directory"

2005-03-08  Mark McLoughlin  <mark@skynet.ie>

	Fix bug #168336 - weirdness with .desktop files which
	use [KDE Desktop Entry] as the main group.

	* libmenu/desktop-entries.c: (get_flags_from_key_file),
	(get_categories_from_key_file): use the actual desktop
	entry group name.

2005-03-08  Mark McLoughlin  <mark@skynet.ie>

	Should fix bug #167934 even though the reporter
	says it doesn't :-)

	Well, this at least fixes a problem with <LegacyDir>
	if the toplevel directory doesn't contain any entries.

	* libmenu/menu-tree.c: (add_menu_for_legacy_dir):
	Add a <Menu> for the <LegacyDir> if it has any subdirs.

2005-03-08  Mark McLoughlin  <mark@skynet.ie>

	Fix for bug #168445 - menu items in LegacyDirs don't
	get marked as allocated.

	* libmenu/menu-tree.c:
	(mark_allocated_foreach): kill.
	(process_layout), (process_only_unallocated),
	(menu_tree_build_from_layout): store the list of allocated
	entires in a DesktopEntrySet so we can look up an entry
	using its file ID rather than with a straight pointer
	comparison. Entries in LegacyDirs are copies of the original
	enties, so the pointer comparison doesn't work.

2005-03-08  Mark McLoughlin  <mark@skynet.ie>

	Fix for bug #168444 - LegacyDirs with a prefix don't work.

	* libmenu/entry-directories.c: (entry_directory_get_desktop):
	Remove the hyphen from the desktop file ID as well as
	the prefix when looking up the desktop file.

2005-03-07  Mark McLoughlin  <mark@skynet.ie>

	* configure.in: post-release bump to 2.10.1.

==================== 2.10.0 ====================