[Xfce4-commits] <xfdesktop:master> Remove ThunarVFS from the configure script, makefiles etc.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 9eaf088ecaa035a4607ad67d8a5189fbad2b947d (commit)
       from b3262236d6471cdfcbf7c0d56760c6d6362866da (commit)

commit 9eaf088ecaa035a4607ad67d8a5189fbad2b947d
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sat Oct 30 00:24:31 2010 +0200

    Remove ThunarVFS from the configure script, makefiles etc.

 configure.ac.in                   |   47 +++---------------------------------
 src/Makefile.am                   |    2 -
 src/xfdesktop-file-icon-manager.h |    1 -
 src/xfdesktop-regular-file-icon.h |    2 -
 src/xfdesktop-special-file-icon.h |    2 -
 5 files changed, 4 insertions(+), 50 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index d1a35fd..8b42948 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -20,7 +20,6 @@ m4_define([libxfce4ui_minimum_version], [4.7.0])
 m4_define([xfce_minimum_version], [4.6.0])
 m4_define([garcon_minimum_version], [0.1.1])
 m4_define([exo_minimum_version], [0.3.100])
-m4_define([thunar_vfs_minimum_version], [1.0.0])
 m4_define([thunar_minimum_version], [1.1.0])
 m4_define([dbus_minimum_version], [0.34])
 m4_define([wnck_minimum_version], [2.12])
@@ -116,14 +115,6 @@ fi
 
 if test "x$enable_desktop_icons" = "xyes" -a "x$enable_file_icons" = "xyes"; then
     dnl here i shall abuse the XDT_CHECK_PACKAGE macro
-    XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1],
-                      [thunar_vfs_minimum_version], [], [
-echo "*** Optional package thunar-vfs-1 was either not found on your system"
-echo "*** or is too old.  Please install or upgrade to at least version"
-echo "*** thunar_minimum_version, or adjust the PKG_CONFIG_PATH environment variable"
-echo "*** if you installed the new version of the package in a nonstandard"
-echo "*** prefix.  File/launcher icons will be disabled."
-])
     XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [dbus_minimum_version], [], [
 echo "*** Optional package dbus-glib-1 was either not found on your system"
 echo "*** or is too old.  Please install or upgrade to at least version"
@@ -132,14 +123,10 @@ echo "*** if you installed the new version of the package in a nonstandard"
 echo "*** prefix.  File/launcher icons will be disabled."
 ])
     enable_file_icons="no"
-    if test "x$THUNAR_VFS_VERSION" != "x"; then
-        already_have_thunar_vfs=yes
-        
-        if test "x$DBUS_VERSION" != "x"; then
-            enable_file_icons="yes"
-            AC_DEFINE([ENABLE_FILE_ICONS], [1],
-                      [Define if file icons should be enabled])
-        fi
+    if test "x$DBUS_VERSION" != "x"; then
+        enable_file_icons="yes"
+        AC_DEFINE([ENABLE_FILE_ICONS], [1],
+                  [Define if file icons should be enabled])
     fi
 fi
 
@@ -182,32 +169,6 @@ build_desktop_menu="no"
 fi
 AM_CONDITIONAL([BUILD_DESKTOP_MENU], [test "x$build_desktop_menu" = "xyes"])
 
-dnl time for more abuse.  if we don't yet have thunar-vfs, we still might want
-dnl it for desktop menu directory monitoring.
-AC_ARG_ENABLE([desktop-menu-dir-monitor],
-              [AC_HELP_STRING([--disable-desktop-menu-dir-monitor],
-                              [Don't use thunar-vfs to monitor menu files to automatically update the desktop menu when needed. (default=enabled)])],
-              [want_thunar_vfs=$enableval],
-              [want_thunar_vfs=yes])
-if test "x$want_thunar_vfs" = "xyes" -a "x$build_desktop_menu" = "xyes"; then
-    if test "x$already_have_thunar_vfs" != "xyes"; then
-        XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1],
-                          [thunar_vfs_minimum_version], [have_thunar_vfs=yes], [
-echo "*** Optional package thunar-vfs-1 was either not found on your system"
-echo "*** or is too old.  Please install or upgrade to at least version"
-echo "*** thunar_minimum_version, or adjust the PKG_CONFIG_PATH environment variable"
-echo "*** if you installed the new version of the package in a nonstandard"
-echo "*** prefix.  Desktop menu directory monitoring will be disabled."
-])
-    fi
-
-    if test "x$have_thunar_vfs" = "xyes" \
-       -o "x$already_have_thunar_vfs" = "xyes"
-    then
-        AC_DEFINE([HAVE_THUNAR_VFS], [1], [Define if thunar-vfs is present.])
-    fi
-fi
-
 AC_ARG_WITH([file-manager-fallback],
     [AC_HELP_STRING([--with-file-manager-fallback=PATH],
             [Default file manager fallback to handle external folders and applications (default=Thunar)])],
diff --git a/src/Makefile.am b/src/Makefile.am
index bb44a98..be5ffce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -121,12 +121,10 @@ xfdesktop_SOURCES += $(desktop_file_icon_sources)
 
 xfdesktop_CFLAGS += \
 	-DDBUS_API_SUBJECT_TO_CHANGE \
-	$(THUNAR_VFS_CFLAGS) \
 	$(THUNARX_CFLAGS) \
 	$(DBUS_CFLAGS)
 
 xfdesktop_LDADD += \
-	$(THUNAR_VFS_LIBS) \
 	$(THUNARX_LIBS) \
 	$(DBUS_LIBS)
 
diff --git a/src/xfdesktop-file-icon-manager.h b/src/xfdesktop-file-icon-manager.h
index 6dea187..703a6f4 100644
--- a/src/xfdesktop-file-icon-manager.h
+++ b/src/xfdesktop-file-icon-manager.h
@@ -23,7 +23,6 @@
 
 #include <glib.h>
 #include <xfconf/xfconf.h>
-#include <thunar-vfs/thunar-vfs.h>
 
 #include "xfdesktop-special-file-icon.h"
 #include "xfdesktop-icon-view-manager.h"
diff --git a/src/xfdesktop-regular-file-icon.h b/src/xfdesktop-regular-file-icon.h
index 49c805e..e2db81d 100644
--- a/src/xfdesktop-regular-file-icon.h
+++ b/src/xfdesktop-regular-file-icon.h
@@ -23,8 +23,6 @@
 
 #include <glib-object.h>
 
-#include <thunar-vfs/thunar-vfs.h>
-
 #include "xfdesktop-file-icon.h"
 
 G_BEGIN_DECLS
diff --git a/src/xfdesktop-special-file-icon.h b/src/xfdesktop-special-file-icon.h
index 4f431f5..0d27e67 100644
--- a/src/xfdesktop-special-file-icon.h
+++ b/src/xfdesktop-special-file-icon.h
@@ -23,8 +23,6 @@
 
 #include <glib-object.h>
 
-#include <thunar-vfs/thunar-vfs.h>
-
 #include "xfdesktop-file-icon.h"
 
 G_BEGIN_DECLS