Small updates.

	* RENAMING: Small updates.

	* components/help/converters/gnome-info2html2/main.c: (main):
	* components/html/glibwww-init.c: (glibwww_parse_proxy_env):
	* components/html/ntl-web-browser.c: (main):
	* components/loser/content/nautilus-content-loser.c:
	(ensure_fail_env):
	* components/loser/sidebar/nautilus-sidebar-loser.c:
	(ensure_fail_env):
	* components/notes/nautilus-notes.c: (main):
	* libnautilus-extensions/nautilus-view-identifier.c:
	(get_lang_list):
	* src/nautilus-application.c: (nautilus_app_startup):
	* src/nautilus-main.c: (main):
	Changed from getenv to g_getenv, even though it makes no
	difference right now, because it's "the right thing to do (tm)".

	* components/services/time/nautilus-view/trilobite-eazel-time-view.h:
	Fixed include (the build was broken for me or anyone who doesn't
	have old .h files sitting around in their install directory).

	* libnautilus-extensions/nautilus-directory.c:
	(construct_alternate_metafile_uri):
	Use nautilus_get_user_directory instead of hard-coding the name
	of the user directory.

	* libnautilus-extensions/nautilus-file-utilities.h:
	* libnautilus-extensions/nautilus-file-utilities.c:
	(nautilus_get_user_directory), (nautilus_get_user_main_directory):
	Use #defines instead of global constants since these are things
	that do not change and this is not C++ :-) Added "get_" to the
	names of these functions so they would be verbs instead of nouns.
	(nautilus_get_desktop_directory): Added this new function for use
	by the desktop code.

	* libnautilus-extensions/nautilus-global-preferences.c:
	(global_preferences_create_dialog),
	(nautilus_global_preferences_get_enabled_sidebar_panel_view_identifiers),
	(nautilus_global_preferences_get_disabled_sidebar_panel_view_identifiers),
	(global_preferences_register_sidebar_panels_preferences_for_ui):
	* libnautilus-extensions/nautilus-view-identifier.h:
	* libnautilus-extensions/nautilus-view-identifier.c:
	(nautilus_view_identifier_list_free):
	* src/nautilus-applicable-views.c: (nautilus_navigation_info_free):
	Changed nautilus_view_identifier_free_list to *_list_free to match
	other calls with similar names.

	* libnautilus-extensions/nautilus-global-preferences.c:
	(user_level_changed_callback):
	* libnautilus-extensions/nautilus-icon-factory.c:
	(get_themed_icon_file_path):
	* src/file-manager/fm-properties-window.c: (get_property_names):
	* src/nautilus-bookmark-list.c:
	(nautilus_bookmark_list_get_file_path):
	* src/nautilus-property-browser.c:
	(nautilus_property_browser_drag_data_get), (make_drag_image),
	(remove_color), (remove_background), (remove_emblem),
	(get_xml_path), (add_background_to_browser), (add_color_to_file),
	(emblem_dialog_clicked), (make_properties_from_directory):
	Change to use directory calls by new "get_" names.

	* src/Makefile.am: Removed nautilus.h since it is long gone,
	and fixed spelling of nautlus-window-state.h.

	* src/file-manager/.cvsignore: Stop ignoring things that we
	no longer generated.

	* src/file-manager/desktop-item.c: [removed]
	* src/file-manager/desktop-item.h: [removed]
	* src/file-manager/desktop-layout.c: [removed]
	* src/file-manager/desktop-layout.h: [removed]
	* src/file-manager/desktop-window.c: [removed]
	* src/file-manager/desktop-window.h: [removed]
	The rest of the code has been harvested from the desktop
	implementation. As I said before we can always recover it if we
	decide we want to reuse it.

	* src/file-manager/fm-main.c: [removed]
	This was no longer used and was getting out of date. The file manager
	is now compiled in rather than being a separate process.

	* src/nautilus-desktop-window.c:
	(nautilus_desktop_window_initialize_class),
	(nautilus_desktop_window_initialize),
	(nautilus_desktop_window_new), (realize):
	Another cut at the desktop code. Still not working too well,
	but way further along.

	* src/nautilus-sidebar.h:
	* src/nautilus-sidebar.c:
	* src/nautilus-view-frame.c:
	(nautilus_view_frame_handle_client_destroy_2):
	* src/nautilus-window-manage-views.c:
	* src/nautilus-window.h:
	* src/nautilus-window.c:
	* src/nautilus-window-private.h:
	Changed the names to use Sidebar instead of IndexPanel.
	Also changed to say sidebar panel instead of meta view in many
	places.

1 files changed, 5 insertions, 6 deletions

diff --git a/libnautilus-extensions/nautilus-file-utilities.h b/libnautilus-extensions/nautilus-file-utilities.h
index f192b9aa4..d01a6a3da 100644
--- a/libnautilus-extensions/nautilus-file-utilities.h
+++ b/libnautilus-extensions/nautilus-file-utilities.h
@@ -25,11 +25,10 @@
 #ifndef NAUTILUS_FILE_UTILITIES_H
 #define NAUTILUS_FILE_UTILITIES_H
 
-#include <glib.h>
-
-char *      nautilus_make_path          (const char *path,
-					 const char *name);
-const char *nautilus_user_directory     (void);
-const char *nautilus_user_main_directory (void);
+char *      nautilus_make_path               (const char *path,
+					      const char *name);
+const char *nautilus_get_user_directory      (void);
+const char *nautilus_get_user_main_directory (void);
+const char *nautilus_get_desktop_directory   (void);
 
 #endif /* NAUTILUS_FILE_UTILITIES_H */