[conduit] Remove gnomevfs

[John Carr <johncarr src gnome org>]

commit 7652415f0e90f0466ed31f27a4f23e56aa80e6b8
Author: John Carr <john carr unrouted co uk>
Date:   Sat Jun 27 16:01:43 2009 +0100

    Remove gnomevfs

 conduit/Vfs.py                    |    4 +-
 conduit/__init__.py               |    2 +-
 conduit/datatypes/File.py         |   10 +-
 conduit/defs.py.in                |    2 +-
 conduit/gtkui/UI.py               |    4 -
 conduit/platform/FileGnomeVfs.py  |  409 -------------------------------------
 conduit/platform/Makefile.am      |    1 -
 configure.ac                      |    6 +-
 scripts/maintainer.py             |    4 +-
 test/python-tests/TestCoreFile.py |    2 +-
 test/python-tests/TestCoreVfs.py  |    2 +-
 test/python-tests/common.py       |    5 -
 12 files changed, 11 insertions(+), 440 deletions(-)
---
diff --git a/conduit/Vfs.py b/conduit/Vfs.py
index 62d7f50..6ba9c65 100644
--- a/conduit/Vfs.py
+++ b/conduit/Vfs.py
@@ -8,9 +8,7 @@ import urllib
 import conduit
 import conduit.utils.Singleton as Singleton
 
-if conduit.FILE_IMPL == "GnomeVfs":
-    import conduit.platform.FileGnomeVfs as FileImpl
-elif conduit.FILE_IMPL == "GIO":
+if conduit.FILE_IMPL == "GIO":
     import conduit.platform.FileGio as FileImpl
 elif conduit.FILE_IMPL == "Python":
     import conduit.platform.FilePython as FileImpl
diff --git a/conduit/__init__.py b/conduit/__init__.py
index d683d84..ed9a4e4 100644
--- a/conduit/__init__.py
+++ b/conduit/__init__.py
@@ -50,7 +50,7 @@ else:
     SHARED_DATA_DIR =           os.path.join(DIRECTORY, "data")
     SHARED_MODULE_DIR =         os.path.join(DIRECTORY, "conduit", "modules")
     DESKTOP_FILE_DIR =          os.path.join(DIRECTORY, "data")
-                                #{GnomeVfs, GIO, Python}
+                                #{GIO, Python}
     FILE_IMPL =                 os.environ.get("CONDUIT_FILE_IMPL","GIO")
                                 #{gtkmozembed, webkit, system}
     BROWSER_IMPL =              os.environ.get("CONDUIT_BROWSER_IMPL","webkit")
diff --git a/conduit/datatypes/File.py b/conduit/datatypes/File.py
index 251ce4c..80580ab 100644
--- a/conduit/datatypes/File.py
+++ b/conduit/datatypes/File.py
@@ -32,10 +32,7 @@ class File(DataType.DataType):
         #you can override the file implmentation at runtime
         #for testing purposes only
         implName = kwargs.get("implName", conduit.FILE_IMPL)
-        if implName == "GnomeVfs":
-            import conduit.platform.FileGnomeVfs as FileImpl
-            self.FileImpl = FileImpl
-        elif implName == "GIO":
+        if implName == "GIO":
             import conduit.platform.FileGio as FileImpl
             self.FileImpl = FileImpl
         elif implName == "Python":
@@ -447,10 +444,7 @@ class File(DataType.DataType):
         os.close(fd)
 
         implName = conduit.FILE_IMPL
-        if implName == "GnomeVfs":
-            import conduit.platform.FileGnomeVfs as FileImpl
-            self.FileImpl = FileImpl
-        elif implName == "GIO":
+        if implName == "GIO":
             import conduit.platform.FileGio as FileImpl
             self.FileImpl = FileImpl
         elif implName == "Python":
diff --git a/conduit/defs.py.in b/conduit/defs.py.in
index 87c27bf..d5fe67a 100644
--- a/conduit/defs.py.in
+++ b/conduit/defs.py.in
@@ -11,7 +11,7 @@ DESKTOP_FILE_DIR = "@DESKTOPFILEDIR@"
 # Platform specific implementations
 #
 
-#{GnomeVfs, GIO, Python}
+#{GIO, Python}
 FILE_IMPL = "@FILE_IMPL@"
 
 #{gtkmozembed, webkit, system}
diff --git a/conduit/gtkui/UI.py b/conduit/gtkui/UI.py
index f25af39..5de004d 100644
--- a/conduit/gtkui/UI.py
+++ b/conduit/gtkui/UI.py
@@ -80,10 +80,6 @@ class MainWindow:
         Constructs the mainwindow. Throws up a splash screen to cover 
         the most time consuming pieces
         """
-        if conduit.FILE_IMPL == "GnomeVfs":
-            import gnome.ui
-            gnome.ui.authentication_manager_init()        
-
         #add some additional dirs to the icon theme search path so that
         #modules can provider their own icons
         icon_dirs = [
diff --git a/conduit/platform/Makefile.am b/conduit/platform/Makefile.am
index ce8f195..4891035 100644
--- a/conduit/platform/Makefile.am
+++ b/conduit/platform/Makefile.am
@@ -2,7 +2,6 @@ conduitdir = $(pythondir)/conduit/platform
 conduit_PYTHON = \
 	__init__.py				\
 	FileGio.py				\
-	FileGnomeVfs.py			\
 	FilePython.py			\
 	SettingsGConf.py		\
 	SettingsPython.py		\
diff --git a/configure.ac b/configure.ac
index 59ed3ea..fff4de5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,9 +30,9 @@ AM_PATH_PYTHON(2.4)
 FILE_IMPL="GIO"
 
 AC_ARG_WITH([file_impl],
-            AC_HELP_STRING([--with-file-impl], [GIO (default), GnomeVfs, Python]))
+            AC_HELP_STRING([--with-file-impl], [GIO (default), Python]))
 
-if test "$with_file_impl" = "GnomeVfs" || test "$with_file_impl" = "Python" ; then
+if test "$with_file_impl" = "Python" ; then
 	FILE_IMPL=$with_file_impl
 fi
 
@@ -63,8 +63,6 @@ AM_CHECK_PYMOD_VERSION([dbus], [__version__], [0.80.0], , AC_MSG_ERROR([Python m
 
 if test $FILE_IMPL = "GIO" ; then
 	AM_CHECK_PYMOD([gio], , , AC_MSG_ERROR([Python module gio required to run Conduit]))
-elif test $FILE_IMPL = "GnomeVfs" ; then
-	AM_CHECK_PYMOD([gnomevfs], , , AC_MSG_ERROR([Python module gnomevfs required to run Conduit]))
 fi
 
 ################################################################################
diff --git a/scripts/maintainer.py b/scripts/maintainer.py
index 4d26481..9beecf8 100755
--- a/scripts/maintainer.py
+++ b/scripts/maintainer.py
@@ -43,7 +43,7 @@ import csv
 import optparse
 import time
 import datetime 
-import gnomevfs, gobject
+import gobject, gtk
 import StringIO
 from string import Template
 
@@ -1093,7 +1093,7 @@ if opts.create_release_email:
 	if opts.debug:
 		print '\nCreating email...' 
 
-	gnomevfs.url_show(url)
+	gtk.show_uri(gtk.gdk.Screen(), url, 0L)
 	
 if opts.upload:
 	upload_tarball()
diff --git a/test/python-tests/TestCoreFile.py b/test/python-tests/TestCoreFile.py
index 10581b0..e51d4e5 100644
--- a/test/python-tests/TestCoreFile.py
+++ b/test/python-tests/TestCoreFile.py
@@ -14,7 +14,7 @@ import tempfile
 if os.environ.has_key("CONDUIT_FILE_IMPL"):
     impls = (os.environ["CONDUIT_FILE_IMPL"],)
 else:
-    impls = ("GIO", "GnomeVfs")
+    impls = ("GIO", )
 
 for impl in impls:
     ok("--- TESTING FILE IMPL: %s" % impl, True)
diff --git a/test/python-tests/TestCoreVfs.py b/test/python-tests/TestCoreVfs.py
index a90338a..4aa2d81 100644
--- a/test/python-tests/TestCoreVfs.py
+++ b/test/python-tests/TestCoreVfs.py
@@ -3,7 +3,7 @@ from common import *
 import conduit.Vfs as Vfs
 import conduit.utils as Utils
 
-for impl in ("GIO", "GnomeVfs",):
+for impl in ("GIO",):
     conduit.FILE_IMPL = impl
     reload(Vfs)
     reload(Utils)
diff --git a/test/python-tests/common.py b/test/python-tests/common.py
index 48185d5..3c64321 100644
--- a/test/python-tests/common.py
+++ b/test/python-tests/common.py
@@ -128,11 +128,6 @@ def read_data_file_from_data_dir(filename):
     path = os.path.join(get_data_dir(),filename)
     return read_data_file(path)
 
-def init_gnomevfs_authentication():
-    import gnome.ui
-    gnome.init(conduit.APPNAME, conduit.APPVERSION)
-    gnome.ui.authentication_manager_init()     
-    
 def get_external_resources(typename):
     #Reads the appropriate file (typename.list) and 
     #returns a dict of name:uris beginning with subtypename