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

	* configure.in: Version 2.11.90

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

	Revert some of the changes related to handling different
	filename encodings.

	Basically, we shouldn't be trying to convert the desktop
	file ID to UTF-8 as that makes the matching process
	locale dependant.

	* libmenu/desktop-entries.c,
	  libmenu/entry-directories.[ch],
	  libmenu/gmenu-tree.c:  don't try to convert the path
	to UTF-8 in various places.

	* util/test-menu-spec.c: (print_entry): convert the 
	desktop file ID to UTF-8 before printing as well
	as the desktop file path.

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

	* libmenu/menu-monitor.c: (free_event_info): plug
	a leak.

	* libmenu/entry-directories.c:
	(cached_dir_find_file_id),
	(entry_directory_get_desktop),
	(entry_directory_list_get_desktop): remove some unused code.
	It became unused when we switched to matching <Filename>s
	against a DesktopEntrySet of all the desktop entries.

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

	Fix things up so that we correctly handle different
	filename encodings. Fixes bug #310939

	As far as the API goes, the rule is that the return value
	from gmenu_tree_entry_get_desktop_file_path() is in
	the filename encoding; everything else is UTF-8

	* libmenu/gmenu-tree.c: (gmenu_tree_directory_make_path):
	Convert filename encoded basename to UTF-8 before appending
	to returned menu path.
	
	* libmenu/desktop-entries.c: (desktop_entry_new): don't
	load any .desktop files whose filenames aren't in a
	recognised encoding.
	
	* libmenu/entry-directories.[ch]:
	(entry_directory_new_full): convert UTF-8 path to filename
	encoding before loading; fallback to original path if UTF-8
	conversion fails.
	(get_desktop_file_id_from_path): convert the filename
	encoded path to a UTF-8 desktop-file-id
	(entry_directory_foreach_recursive): don't pass the
	path and file_id to the callback; use the path as
	a file_id for .directory files.
	(entry_directory_get_flat_contents): convert filename
	encoded path of .directory file to UTF-8 before using as
	a desktop-file-id.
	(entry_directory_list_get_directory): convert UTF-8 path
	to filename encoding; fallback to original path if conversion
	fails.
	(get_all_func): we don't get passed the path anymore.
	(entry_directory_list_get_all_desktops): munge the code
	from entry_directory_list_add() in here since it was
	its only user.

	* util/Makefile.am: define GNOMELOCALEDIR in CFLAGS.
	
	* util/test-menu-spec.c:
	(print_entry): convert desktop entry path to UTF-8 before
	printing
	(handle_tree_changed), (main): i18nize.
	
2005-07-11  Mark McLoughlin  <mark@skynet.ie>

	Fixes "gmenu-simple-editor calls the Desktop menu
	Preferences" (bug #309693)

	* desktop-directories/Desktop.directory.in: add for
	settings.menu
	
	* desktop-directories/Preferences.directory.in: add
	for preferences.menu
	
	* desktop-directories/Makefile.am: add new .directory
	files.
	
	* layout/preferences.menu: use Desktop.directory.in
	
	* layout/settings.menu: use Preferences.directory.in

2005-06-28  Mark McLoughlin  <mark@skynet.ie>

	Fix for bug #305748 - only include ".directory" in
	a <LegacyDir> if it actually exists.

	* libmenu/gmenu-tree.c:
	(is_dot_directory),
	(add_menu_for_legacy_dir): only add a <Directory>.directory</Directory>
	if the file exists.
	(process_layout): expand debug spew.

2005-06-28  Mark McLoughlin  <mark@skynet.ie>

	Re-name the Edutainment sub-menu to Education.
	Bug #307979

	* layout/applications.menu: s/Edutainment/Education/

	* desktop-directories/Edutainment.directory.in:
	Re-name from Edutainmenut.directory.in and change
	the name.
	
	* desktop-directories/Makefile.am: upd.
	
2005-06-11  Christian Rose  <menthos@menthos.com>

	* configure.in: Added "he" to ALL_LINGUAS.

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

	Patch from Brian Cameron <brian.cameron@sun.com> in
	bug #304129

	* libmenu/libgnome-menu-uninstalled.pc.in: add pkg-config
	file to support building against an uninstalled 
	libgnome-menu.
	
	* configure.in: create libgnome-menu-uninstalled.pc
	
	* libmenu/Makefile.am: add uninstalled.pc to EXTRA_DIST

2005-06-05  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>

	* configure.in: Added 'gl' to ALL_LINGUA.

2005-05-30  Swapnil Hajare  <dreamil@gmail.com>

	* configure.in: Added entry fir Marathi (mr) in ALL_LINGUA

2005-05-30  Mark McLoughlin  <mark@skynet.ie>

	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.

2005-05-22  Dennis Cranston  <dennis_cranston@yahoo.com>

	* simple-editor/gmenu-simple-editor.glade:  HIGify
	the widget spacing and shadow type.
	
	* simple-editor/GMenuSimpleEditor/maindialog.py:  
	"Hide" -> "Show".
	
2005-05-18  Mark McLoughlin  <mark@skynet.ie>

	* configure.in: post-release bump to 2.11.1.1

==================== 2.11.1.1 ====================