--- utils/vfs.py.orig	2011-11-09 02:20:49.349797754 -0800
+++ utils/vfs.py	2011-11-09 02:24:29.488914629 -0800
@@ -1,5 +1,5 @@
 #
-# Abstraction layer for VFS operations to move gnomevfs dependency out of the
+# Abstraction layer for VFS operations to move gvfs dependency out of the
 # core.
 #
 
@@ -8,20 +8,20 @@
 import urllib
 
 try:
-    import gnomevfs
+    import gvfs
 
-    OPEN_READ = gnomevfs.OPEN_READ
-    OPEN_WRITE = gnomevfs.OPEN_WRITE
+    OPEN_READ = gvfs.OPEN_READ
+    OPEN_WRITE = gvfs.OPEN_WRITE
 
 except ImportError:
     try:
-        import gnome.vfs as gnomevfs
+        import gnome.vfs as gvfs
 
-        OPEN_READ = gnomevfs.OPEN_READ
-        OPEN_WRITE = gnomevfs.OPEN_WRITE
+        OPEN_READ = gvfs.OPEN_READ
+        OPEN_WRITE = gvfs.OPEN_WRITE
 
     except ImportError:
-        log("Using urllib, because gnomevfs isn't available")
+        log = "Using urllib, because gvfs isn't available"
         OPEN_READ = "r"
         OPEN_WRITE = "w"
 
@@ -32,7 +32,7 @@
 def escape_path(uri):
 
     try:
-        return gnomevfs.escape_string(uri)
+        return gvfs.escape_string(uri)
     except:
         return escape_path_urllib(uri)
 
@@ -54,7 +54,7 @@
 def read_entire_file(uri):
 
     try:
-        uri = gnomevfs.read_entire_file(uri)
+        uri = gvfs.read_entire_file(uri)
     except:
         log("Warning: Couldn't read file \"%s\"." % (uri,))
         raise
@@ -81,7 +81,7 @@
 def open(uri, mode = OPEN_READ):
 
     try:
-        fd = gnomevfs.open(uri, mode)
+        fd = gvfs.open(uri, mode)
     except:
         log("Warning: Couldn't open file \"%s\"." % (uri,))
         return
@@ -107,7 +107,7 @@
 #
 def exists(uri):
 
-    return gnomevfs.exists(gnomevfs.URI(uri))
+    return gvfs.exists(gvfs.URI(uri))
 
 def exists_urllib(uri):