gnome-system-tools r4108 - in trunk/src/shares: . nautilus

[carlosg svn gnome org]

Author: carlosg
Date: Tue Jan 15 00:03:36 2008
New Revision: 4108
URL: http://svn.gnome.org/viewvc/gnome-system-tools?rev=4108&view=rev

Log:
2008-01-14  Carlos Garnacho  <carlosg gnome org>

        * nautilus/nautilus-shares.c (is_directory_local)
        (get_path_from_file_info): Use Gio.


Modified:
   trunk/src/shares/ChangeLog
   trunk/src/shares/nautilus/nautilus-shares.c

Modified: trunk/src/shares/nautilus/nautilus-shares.c
==============================================================================
--- trunk/src/shares/nautilus/nautilus-shares.c	(original)
+++ trunk/src/shares/nautilus/nautilus-shares.c	Tue Jan 15 00:03:36 2008
@@ -22,9 +22,8 @@
  */
 
 #include <config.h>
+#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-extension/nautilus-extension-types.h>
 #include <libnautilus-extension/nautilus-file-info.h>
 #include <libnautilus-extension/nautilus-menu-provider.h>
@@ -38,16 +37,16 @@
 static gboolean
 is_directory_local (NautilusFileInfo *info)
 {
-  GnomeVFSURI *uri;
-  gchar       *str;
-  gboolean     is_local;
+  gchar    *str;
+  GFile    *file;
+  gboolean  is_local;
 
   str = nautilus_file_info_get_uri (info);
-  uri = gnome_vfs_uri_new (str);
+  file = g_file_new_for_uri (str);
 
-  is_local = gnome_vfs_uri_is_local (uri);
+  is_local = g_file_is_native (file);
 
-  gnome_vfs_uri_unref (uri);
+  g_object_unref (file);
   g_free (str);
 
   return is_local;
@@ -56,22 +55,16 @@
 static char *
 get_path_from_file_info (NautilusFileInfo *info)
 {
-  GnomeVFSURI *uri     = NULL;
-  gchar       *escaped = NULL;
-  gchar       *path    = NULL;
+  GFile *file;
+  gchar *str, *path;
 
-  uri = gnome_vfs_uri_new (nautilus_file_info_get_uri (info));
+  str = nautilus_file_info_get_uri (info);
+  file = g_file_new_for_uri (str);
 
-  if (uri)
-    {
-      escaped = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_TOPLEVEL_METHOD);
+  path = g_file_get_path (file);
 
-      if (escaped)
-	path = gnome_vfs_unescape_string (escaped, NULL);
-	
-      gnome_vfs_uri_unref (uri);
-      g_free (escaped);
-    }
+  g_object_unref (file);
+  g_free (str);
 
   return path;
 }