gimp r28211 - in trunk: . plug-ins/file-uri po-plug-ins

[neo svn gnome org]

Author: neo
Date: Mon Mar 23 08:33:46 2009
New Revision: 28211
URL: http://svn.gnome.org/viewvc/gimp?rev=28211&view=rev

Log:
2009-03-23  Sven Neumann  <sven gimp org>

	Dropped support for the GnomeVFS file-uri backend. Recent GNOME
	releases use GIO/GVfs and libgnomeui will also go away soon.

	* INSTALL 
	* configure.in: removed checks for libgnomeui and 
libgnome-keyring.

	* plug-ins/file-uri/Makefile.am
	* plug-ins/file-uri/uri-backend-gnomevfs.c: removed.



Removed:
   trunk/plug-ins/file-uri/uri-backend-gnomevfs.c
Modified:
   trunk/ChangeLog
   trunk/INSTALL
   trunk/configure.in
   trunk/plug-ins/file-uri/Makefile.am
   trunk/po-plug-ins/ChangeLog
   trunk/po-plug-ins/POTFILES.in

Modified: trunk/INSTALL
==============================================================================
--- trunk/INSTALL	(original)
+++ trunk/INSTALL	Mon Mar 23 08:33:46 2009
@@ -186,11 +186,8 @@
   --without-gvfs.  If you don't want to use GIO/GVfs to access remote
      files, you can pass --without-gvfs to the configure script.
 
-  --without-gnomevfs.  If you don't want to use gnomevfs to access remote
-     files, you can pass --without-gnomevfs to the configure script.
-
   --without-libcurl.  If you don't want to use libcurl to access remote
-     files, you can pass --without-gnomevfs to the configure script.
+     files, you can pass --without-libcurl to the configure script.
 
   --without-alsa.  If you don't want to compile ALSA support into the
      MIDI input controller module, you can use the --without-alsa option.

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Mar 23 08:33:46 2009
@@ -1327,10 +1327,9 @@
 AC_SUBST(FILE_PDF)
 
 
-###############################################
-# Check for gio/gvfs, gnome-vfs and libcurl
-# (and optionally libgnomeui and gnome-keyring)
-###############################################
+################################
+# Check for gio/gvfs and libcurl
+################################
 
 uri_plugin=no
 
@@ -1340,39 +1339,6 @@
 AM_CONDITIONAL(HAVE_GVFS, test "x$with_gvfs" != xno)
 
 
-AC_ARG_WITH(gnomevfs, [  --without-gnomevfs      build without gnomevfs support])
-
-have_gnomeui="no (disabled)"
-have_gnome_keyring="no (disabled)"
-have_gnomevfs="no (disabled)"
-
-if test "x$with_gnomevfs" != xno; then
-
-gnome_vfs_modules="gnome-vfs-2.0 >= gnome_vfs_required_version"
-
-if $PKG_CONFIG --atleast-version=gnomeui_required_version libgnomeui-2.0; then
-  have_gnomeui=yes
-  gnome_vfs_modules="$gnome_vfs_modules libgnomeui-2.0"
-else
-  have_gnomeui="no (libgnomeui-2.0 not found)"
-fi
-
-if $PKG_CONFIG --atleast-version=gnome_keyring_required_version gnome-keyring-1; then
-  have_gnome_keyring=yes
-  gnome_vfs_modules="$gnome_vfs_modules gnome-keyring-1"
-else
-  have_gnome_keyring="no (gnome-keyring-1 not found)"
-fi
-
-PKG_CHECK_MODULES(GNOME_VFS, $gnome_vfs_modules,
-  have_gnomevfs=yes,
-  have_gnomevfs="no (gnome-vfs-2.0 not found)")
-
-fi
-
-AM_CONDITIONAL(HAVE_GNOMEVFS, test "x$have_gnomevfs" = xyes)
-
-
 AC_ARG_WITH(libcurl,  [  --without-libcurl       build without curl support])
 
 have_libcurl="no (disabled)"
@@ -1390,8 +1356,6 @@
 
 if test "x$with_gvfs" != xno; then
   uri_plugin="yes (using GIO/GVfs)"
-elif test "x$have_gnomevfs" = xyes; then
-  uri_plugin="yes (using gnome-vfs)"
 elif test "x$have_libcurl" = xyes; then
   uri_plugin="yes (using libcurl)"
 elif test "x$os_win32" = xno; then
@@ -1399,15 +1363,6 @@
 fi
 
 
-if test "x$have_gnomeui" = xyes; then
-  AC_DEFINE(HAVE_GNOMEUI, 1, [Define to 1 if libgnomeui is available])
-fi
-
-if test "x$have_gnome_keyring" = xyes; then
-  AC_DEFINE(HAVE_GNOME_KEYRING, 1, [Define to 1 if gnome-keyring is available])
-fi
-
-
 ###################
 # Check for libwmf2
 ###################
@@ -2138,8 +2093,6 @@
 
 Plug-In Features:
   EXIF support:        $have_libexif
-  GNOME UI:            $have_gnomeui
-  GNOME keyring:       $have_gnome_keyring
 
 Optional Modules:
   ALSA (MIDI Input):   $have_alsa

Modified: trunk/plug-ins/file-uri/Makefile.am
==============================================================================
--- trunk/plug-ins/file-uri/Makefile.am	(original)
+++ trunk/plug-ins/file-uri/Makefile.am	Mon Mar 23 08:33:46 2009
@@ -23,11 +23,6 @@
 backend_cflags = $(GIO_CFLAGS)
 backend_libs = $(GIO_LIBS)
 else
-if HAVE_GNOMEVFS
-backend_sources = uri-backend-gnomevfs.c
-backend_cflags = $(GNOME_VFS_CFLAGS)
-backend_libs = $(GNOME_VFS_LIBS)
-else
 if HAVE_LIBCURL
 backend_sources = uri-backend-libcurl.c
 backend_cflags = $(CURL_CFLAGS)
@@ -38,7 +33,6 @@
 backend_libs = 
 endif
 endif
-endif
 
 file_uri_SOURCES = \
 	uri.c			\

Modified: trunk/po-plug-ins/POTFILES.in
==============================================================================
--- trunk/po-plug-ins/POTFILES.in	(original)
+++ trunk/po-plug-ins/POTFILES.in	Mon Mar 23 08:33:46 2009
@@ -171,7 +171,6 @@
 plug-ins/file-psd/psd-util.c
 plug-ins/file-psd/psd.c
 plug-ins/file-sgi/sgi.c
-plug-ins/file-uri/uri-backend-gnomevfs.c
 plug-ins/file-uri/uri-backend-gvfs.c
 plug-ins/file-uri/uri-backend-libcurl.c
 plug-ins/file-uri/uri-backend-wget.c