--- configure.ac	2009-04-15 01:53:30.000000000 +0400
+++ configure.ac	2010-05-15 12:53:15.484000000 +0400
@@ -209,6 +209,19 @@ else
 fi
 AM_CONDITIONAL([BUILD_PANEL_PLUGIN], [test "x$build_panel_plugin" = "xyes"])
 
+AC_ARG_ENABLE([file-manager-thunar],
+    [AC_HELP_STRING([--disable-file-manager-thunar],
+            [Do not use Thunar DBUS interface for viewing folders])],
+        [ac_cv_enable_file_manager_thunar=$enableval],
+        [ac_cv_enable_file_manager_thunar=yes])
+if test "x$ac_cv_enable_file_manager_thunar" = "xno"; then
+    enable_file_manager_thunar="no"
+else
+    enable_file_manager_thunar="yes"
+    AC_DEFINE([ENABLE_FILE_MANAGER_THUNAR], [1], [Define if Thunar DBUS interface should be used])
+fi
+AM_CONDITIONAL([ENABLE_FILE_MANAGER_THUNAR], [test "x$enable_file_manager_thunar" = "xyes"])
+
 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)])],
--- src/xfdesktop-file-utils.c	2009-01-13 01:03:11.000000000 +0300
+++ src/xfdesktop-file-utils.c	2010-05-15 13:51:48.180000000 +0400
@@ -475,11 +475,13 @@ xfdesktop_file_utils_peek_trash_proxy(vo
     return dbus_trash_proxy;
 }
 
+#ifdef ENABLE_FILE_MANAGER_THUNAR
 DBusGProxy *
 xfdesktop_file_utils_peek_filemanager_proxy(void)
 {
     return dbus_filemanager_proxy;
 }
+#endif
 
 void
 xfdesktop_file_utils_dbus_cleanup(void)
--- src/xfdesktop-file-utils.h	2009-01-13 01:03:11.000000000 +0300
+++ src/xfdesktop-file-utils.h	2010-05-15 13:51:01.116000000 +0400
@@ -81,7 +81,11 @@ void xfdesktop_file_utils_open_folder(co
 
 gboolean xfdesktop_file_utils_dbus_init();
 DBusGProxy *xfdesktop_file_utils_peek_trash_proxy();
+#ifdef ENABLE_FILE_MANAGER_THUNAR
 DBusGProxy *xfdesktop_file_utils_peek_filemanager_proxy();
+#else
+#define xfdesktop_file_utils_peek_filemanager_proxy() NULL
+#endif
 void xfdesktop_file_utils_dbus_cleanup();