Use nautilus_get_home_directory_uri everywhere instead of open coding it

2006-12-08  Paolo Borelli  <pborelli@katamail.com>

	* libnautilus-private/nautilus-desktop-link.c:
	* libnautilus-private/nautilus-file-utilities.c:
	* libnautilus-private/nautilus-query.c:
	* src/nautilus-navigation-window.c:
	* src/nautilus-navigation-window.h:
	* src/nautilus-pathbar.c:
	* src/nautilus-places-sidebar.c:
	* src/nautilus-shell.c:
	* src/nautilus-window-manage-views.c:
	* src/nautilus-window.c:
	* src/file-manager/fm-tree-model.c:
	* src/file-manager/fm-tree-view.c:

	Use nautilus_get_home_directory_uri everywhere instead of
	open coding it and other minor cleanups.

3 files changed, 8 insertions, 9 deletions

diff --git a/libnautilus-private/nautilus-desktop-link.c b/libnautilus-private/nautilus-desktop-link.c
index 41ecf2ba1..89a8314ef 100644
--- a/libnautilus-private/nautilus-desktop-link.c
+++ b/libnautilus-private/nautilus-desktop-link.c
@@ -34,6 +34,7 @@
 #include <gtk/gtksignal.h>
 #include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs.h>
+#include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-trash-monitor.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <string.h>
@@ -130,10 +131,8 @@ nautilus_desktop_link_new (NautilusDesktopLinkType type)
 	switch (type) {
 	case NAUTILUS_DESKTOP_LINK_HOME:
 		link->details->filename = g_strdup ("home");
-
 		link->details->display_name = eel_preferences_get (NAUTILUS_PREFERENCES_DESKTOP_HOME_NAME);
-		
-		link->details->activation_uri = gnome_vfs_get_uri_from_local_path (g_get_home_dir ());
+		link->details->activation_uri = nautilus_get_home_directory_uri ();
 		link->details->icon = g_strdup ("gnome-fs-home");
 
 		eel_preferences_add_callback (NAUTILUS_PREFERENCES_DESKTOP_HOME_NAME,
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index 80a1f72c5..0473b16e0 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -323,7 +323,7 @@ nautilus_is_home_directory_file_escaped (char *escaped_dirname,
 	GnomeVFSURI *vfs_uri;
 	
 	if (escaped_home_dir_dirname == NULL) {
-		uri = gnome_vfs_get_uri_from_local_path (g_get_home_dir ());
+		uri = nautilus_get_home_directory_uri ();
 		vfs_uri = gnome_vfs_uri_new (uri);
 		g_free (uri);
 
diff --git a/libnautilus-private/nautilus-query.c b/libnautilus-private/nautilus-query.c
index 2775657e5..267620de0 100644
--- a/libnautilus-private/nautilus-query.c
+++ b/libnautilus-private/nautilus-query.c
@@ -25,10 +25,10 @@
 #include <string.h>
 
 #include "nautilus-query.h"
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-glib-extensions.h>
 #include <glib/gi18n.h>
+#include <libnautilus-private/nautilus-file-utilities.h>
 
 struct NautilusQueryDetails {
 	char *text;
@@ -143,9 +143,9 @@ encode_home_uri (const char *uri)
 {
 	char *home_uri;
 	const char *encoded_uri;
-	
-	home_uri = gnome_vfs_get_uri_from_local_path (g_get_home_dir ());
-	
+
+	home_uri = nautilus_get_home_directory_uri ();
+
 	if (g_str_has_prefix (uri, home_uri)) {
 		encoded_uri = uri + strlen (home_uri);
 		if (*encoded_uri == '/') {
@@ -169,7 +169,7 @@ decode_home_uri (const char *uri)
 	if (g_str_has_prefix (uri, "file:")) {
 		decoded_uri = g_strdup (uri);
 	} else {
-		home_uri = gnome_vfs_get_uri_from_local_path (g_get_home_dir ());
+		home_uri = nautilus_get_home_directory_uri ();
 
 		decoded_uri = g_strconcat (home_uri, "/", uri, NULL);