[Xfce4-commits] <thunar-vcs-plugin:thunarx-2> Changed to thunarx-2 and removed thunar-vfs

Peter de Ridder peter at xfce.org
Sat Aug 15 21:34:01 CEST 2009 

Updating branch refs/heads/thunarx-2
         to c50c279d5a44e15a001350b56ff8ad0f14ff8190 (commit)
       from e821cac59f3950e539097daa7d56c4dcb571505a (commit)

commit c50c279d5a44e15a001350b56ff8ad0f14ff8190
Author: Peter de Ridder <peter at xfce.org>
Date:   Sat Aug 15 01:53:24 2009 +0200

    Changed to thunarx-2 and removed thunar-vfs

 configure.ac.in                            |    9 ++++--
 thunar-vcs-plugin/Makefile.am              |    8 +++--
 thunar-vcs-plugin/tvp-git-action.c         |    2 +-
 thunar-vcs-plugin/tvp-provider.c           |   44 +++++++++++++++------------
 thunar-vcs-plugin/tvp-svn-action.c         |    2 +-
 thunar-vcs-plugin/tvp-svn-backend.h        |    2 +
 thunar-vcs-plugin/tvp-svn-property-page.c  |    2 +-
 tvp-git-helper/Makefile.am                 |    4 +-
 tvp-git-helper/main.c                      |    2 +-
 tvp-git-helper/tgh-add.c                   |    2 +-
 tvp-git-helper/tgh-branch-dialog.c         |    2 +-
 tvp-git-helper/tgh-branch.c                |    6 +++-
 tvp-git-helper/tgh-common.c                |    2 +-
 tvp-git-helper/tgh-dialog-common.c         |    1 -
 tvp-git-helper/tgh-file-selection-dialog.c |    2 +-
 tvp-git-helper/tgh-reset-dialog.c          |    2 +-
 tvp-git-helper/tgh-reset.c                 |    2 +-
 tvp-git-helper/tgh-status-dialog.c         |    2 +-
 tvp-git-helper/tgh-status.c                |    8 +++--
 tvp-svn-helper/Makefile.am                 |    5 ++-
 tvp-svn-helper/main.c                      |    2 +-
 tvp-svn-helper/tsh-add.c                   |    2 +-
 tvp-svn-helper/tsh-blame-dialog.c          |    2 +-
 tvp-svn-helper/tsh-blame.c                 |    2 +-
 tvp-svn-helper/tsh-checkout.c              |    2 +-
 tvp-svn-helper/tsh-cleanup.c               |    2 +-
 tvp-svn-helper/tsh-commit.c                |    2 +-
 tvp-svn-helper/tsh-common.c                |    2 +-
 tvp-svn-helper/tsh-copy.c                  |    2 +-
 tvp-svn-helper/tsh-delete.c                |    2 +-
 tvp-svn-helper/tsh-dialog-common.c         |    1 -
 tvp-svn-helper/tsh-export.c                |    2 +-
 tvp-svn-helper/tsh-file-dialog.c           |    2 +-
 tvp-svn-helper/tsh-file-selection-dialog.c |    2 +-
 tvp-svn-helper/tsh-import.c                |    2 +-
 tvp-svn-helper/tsh-lock-dialog.c           |    2 +-
 tvp-svn-helper/tsh-lock.c                  |    2 +-
 tvp-svn-helper/tsh-log-dialog.c            |    2 +-
 tvp-svn-helper/tsh-log-message-dialog.c    |    2 +-
 tvp-svn-helper/tsh-log.c                   |    2 +-
 tvp-svn-helper/tsh-login-dialog.c          |    2 +-
 tvp-svn-helper/tsh-move.c                  |    2 +-
 tvp-svn-helper/tsh-notify-dialog.c         |    2 +-
 tvp-svn-helper/tsh-properties-dialog.c     |    2 +-
 tvp-svn-helper/tsh-properties.c            |    2 +-
 tvp-svn-helper/tsh-relocate-dialog.c       |    2 +-
 tvp-svn-helper/tsh-relocate.c              |    2 +-
 tvp-svn-helper/tsh-resolved.c              |    2 +-
 tvp-svn-helper/tsh-revert.c                |    2 +-
 tvp-svn-helper/tsh-status-dialog.c         |    2 +-
 tvp-svn-helper/tsh-status.c                |    2 +-
 tvp-svn-helper/tsh-switch.c                |    2 +-
 tvp-svn-helper/tsh-transfer-dialog.c       |    2 +-
 tvp-svn-helper/tsh-trust-dialog.c          |    2 +-
 tvp-svn-helper/tsh-unlock.c                |    2 +-
 tvp-svn-helper/tsh-update.c                |    2 +-
 56 files changed, 98 insertions(+), 82 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 4dc8f51..0f1282d 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -27,7 +27,7 @@ dnl *** Initialize autoconf ***
 dnl ***************************
 AC_COPYRIGHT([Copyright (c) 2006-2007 Peter de Ridder <peter at xfce.org>.])
 AC_INIT([thunar-vcs-plugin], [tvp_version], [thunar-dev at xfce.org])
-AC_PREFIX_DEFAULT([$(pkg-config --variable prefix thunarx-1 || echo /usr/local)])
+AC_PREFIX_DEFAULT([$(pkg-config --variable prefix thunarx-2 || echo /usr/local)])
 AC_PREREQ([2.50])
 AC_CANONICAL_TARGET()
 
@@ -72,10 +72,13 @@ XDT_I18N([@LINGUAS@])
 dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
-XDT_CHECK_PACKAGE([THUNARX], [thunarx-1], [0.4.0])
-XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.4.0])
+XDT_CHECK_PACKAGE([THUNARX], [thunarx-2], [0.4.0])
+XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.100])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0])
+dnl XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.4.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.0])
+XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
 XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.6.0])
 
 dnl ***********************************
diff --git a/thunar-vcs-plugin/Makefile.am b/thunar-vcs-plugin/Makefile.am
index a2a396f..95d5f2e 100644
--- a/thunar-vcs-plugin/Makefile.am
+++ b/thunar-vcs-plugin/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES =								\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
 	$(PLATFORM_CPPFLAGS)
 
-extensionsdir = $(libdir)/thunarx-1
+extensionsdir = $(libdir)/thunarx-2
 extensions_LTLIBRARIES =						\
 	thunar-vcs-plugin.la
 
@@ -34,7 +34,8 @@ endif
 thunar_vcs_plugin_la_CFLAGS =						\
 	$(PLATFORM_CFLAGS)						\
 	$(THUNARX_CFLAGS)						\
-	$(THUNAR_VFS_CFLAGS)
+	$(EXO_CFLAGS)							\
+	$(LIBXFCE4UTIL_CFLAGS)
 if HAVE_SUBVERSION
 thunar_vcs_plugin_la_CFLAGS +=						\
 	$(APR_CFLAGS)							\
@@ -51,7 +52,8 @@ thunar_vcs_plugin_la_LDFLAGS =						\
 	-module								\
 	$(PLATFORM_LDFLAGS)						\
 	$(THUNARX_LDFLAGS)						\
-	$(THUNAR_VFS_LDFLAGS)
+	$(EXO_LDFLAGS)							\
+	$(LIBXFCE4UTIL_LDFLAGS)
 if HAVE_SUBVERSION
 thunar_vcs_plugin_la_LDFLAGS +=						\
 	$(APR_LDFLAGS)
diff --git a/thunar-vcs-plugin/tvp-git-action.c b/thunar-vcs-plugin/tvp-git-action.c
index 5a7f3b8..f7a98ef 100644
--- a/thunar-vcs-plugin/tvp-git-action.c
+++ b/thunar-vcs-plugin/tvp-git-action.c
@@ -23,7 +23,7 @@
 
 #include <thunarx/thunarx.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <thunar-vcs-plugin/tvp-git-action.h>
 
diff --git a/thunar-vcs-plugin/tvp-provider.c b/thunar-vcs-plugin/tvp-provider.c
index ac0ade4..02f5ae8 100644
--- a/thunar-vcs-plugin/tvp-provider.c
+++ b/thunar-vcs-plugin/tvp-provider.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #ifdef HAVE_SUBVERSION
 #include <subversion-1/svn_types.h>
@@ -386,8 +386,7 @@ tvp_provider_get_file_actions (ThunarxMenuProvider *menu_provider,
   GList              *actions = NULL;
   GtkAction          *action;
 #ifdef HAVE_SUBVERSION
-  ThunarVfsPathScheme scheme;
-  ThunarVfsInfo      *info;
+  gchar              *scheme;
   gboolean            parent_wc = FALSE;
   gboolean            directory_is_wc = FALSE;
   gboolean            directory_is_not_wc = FALSE;
@@ -404,13 +403,15 @@ tvp_provider_get_file_actions (ThunarxMenuProvider *menu_provider,
   for (lp = files; lp != NULL; lp = lp->next, ++n_files)
   {
     /* check if the file is a local file */
-    info = thunarx_file_info_get_vfs_info (lp->data);
-    scheme = thunar_vfs_path_get_scheme (info->path);
-    thunar_vfs_info_unref (info);
+    scheme = thunarx_file_info_get_uri_scheme (lp->data);
 
     /* unable to handle non-local files */
-    if (G_UNLIKELY (scheme != THUNAR_VFS_PATH_SCHEME_FILE))
+    if (G_UNLIKELY (strcmp (scheme, "file")))
+    {
+      g_free (scheme);
       return NULL;
+    }
+    g_free (scheme);
 
     /* check if the parent folder is a working copy */
     if (!parent_wc && tvp_is_parent_working_copy (lp->data))
@@ -476,18 +477,19 @@ tvp_provider_get_folder_actions (ThunarxMenuProvider *menu_provider,
 {
   GtkAction          *action;
   GList              *actions = NULL;
-  ThunarVfsPathScheme scheme;
-  ThunarVfsInfo      *info;
+  gchar              *scheme;
   GList              *files;
 
   /* check if the file is a local file */
-  info = thunarx_file_info_get_vfs_info (folder);
-  scheme = thunar_vfs_path_get_scheme (info->path);
-  thunar_vfs_info_unref (info);
+  scheme = thunarx_file_info_get_uri_scheme (folder);
 
   /* unable to handle non-local files */
-  if (G_UNLIKELY (scheme != THUNAR_VFS_PATH_SCHEME_FILE))
+  if (G_UNLIKELY (strcmp (scheme, "file")))
+  {
+    g_free (scheme);
     return NULL;
+  }
+  g_free (scheme);
 
   files = g_list_append (NULL, folder);
 
@@ -521,17 +523,18 @@ tvp_provider_get_pages (ThunarxPropertyPageProvider *page_provider, GList *files
   if (g_list_length (files) == 1)
   {
     gboolean            is_vc = FALSE;
-    ThunarVfsPathScheme scheme;
-    ThunarVfsInfo      *info;
+    gchar              *scheme;
 
     /* check if the file is a local file */
-    info = thunarx_file_info_get_vfs_info (files->data);
-    scheme = thunar_vfs_path_get_scheme (info->path);
-    thunar_vfs_info_unref (info);
+    scheme = thunarx_file_info_get_uri_scheme (files->data);
 
     /* unable to handle non-local files */
-    if (G_UNLIKELY (scheme != THUNAR_VFS_PATH_SCHEME_FILE))
+    if (G_UNLIKELY (strcmp (scheme, "file")))
+    {
+      g_free (scheme);
       return NULL;
+    }
+    g_free (scheme);
 
     if (thunarx_file_info_is_directory (files->data))
     {
@@ -574,6 +577,7 @@ tvp_provider_get_pages (ThunarxPropertyPageProvider *page_provider, GList *files
 static void
 tvp_child_watch (GPid pid, gint status, gpointer data)
 {
+  /*
   gchar *watch_path = data;
 
   if (G_LIKELY (data))
@@ -595,7 +599,7 @@ tvp_child_watch (GPid pid, gint status, gpointer data)
     //this is done by destroy callback
     //g_free (watch_path);
   }
-
+  */
   g_spawn_close_pid (pid);
 }
 
diff --git a/thunar-vcs-plugin/tvp-svn-action.c b/thunar-vcs-plugin/tvp-svn-action.c
index d8f0931..4425c29 100644
--- a/thunar-vcs-plugin/tvp-svn-action.c
+++ b/thunar-vcs-plugin/tvp-svn-action.c
@@ -23,7 +23,7 @@
 
 #include <thunarx/thunarx.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <thunar-vcs-plugin/tvp-svn-action.h>
 
diff --git a/thunar-vcs-plugin/tvp-svn-backend.h b/thunar-vcs-plugin/tvp-svn-backend.h
index 881f8a9..1526271 100644
--- a/thunar-vcs-plugin/tvp-svn-backend.h
+++ b/thunar-vcs-plugin/tvp-svn-backend.h
@@ -20,6 +20,8 @@
 #ifndef __TVP_SVN_BACKEND_H__
 #define __TVP_SVN_BACKEND_H__
 
+#include <glib.h>
+
 G_BEGIN_DECLS;
 
 typedef struct
diff --git a/thunar-vcs-plugin/tvp-svn-property-page.c b/thunar-vcs-plugin/tvp-svn-property-page.c
index e347781..9fd9ea5 100644
--- a/thunar-vcs-plugin/tvp-svn-property-page.c
+++ b/thunar-vcs-plugin/tvp-svn-property-page.c
@@ -23,7 +23,7 @@
 
 #include <thunarx/thunarx.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_types.h>
 
diff --git a/tvp-git-helper/Makefile.am b/tvp-git-helper/Makefile.am
index e275391..b825758 100644
--- a/tvp-git-helper/Makefile.am
+++ b/tvp-git-helper/Makefile.am
@@ -40,14 +40,14 @@ tvp_git_helper_CPPFLAGS =						\
 
 tvp_git_helper_CFLAGS =							\
 	$(PLATFORM_CFLAGS)						\
-	$(THUNAR_VFS_CFLAGS)						\
+	$(LIBXFCE4UTIL_CFLAGS)						\
 	$(GTK_CFLAGS)							\
 	$(GLIB_CFLAGS)							\
 	$(GOBJECT_CFLAGS)
 
 tvp_git_helper_LDFLAGS =						\
 	$(PLATFORM_LIBS)						\
-	$(THUNAR_VFS_LIBS)						\
+	$(LIBXFCE4UTIL_LIBS)						\
 	$(GTK_LIBS)							\
 	$(GLIB_LIBS)							\
 	$(GOBJECT_LIBS)
diff --git a/tvp-git-helper/main.c b/tvp-git-helper/main.c
index 70433ae..35d8b1f 100644
--- a/tvp-git-helper/main.c
+++ b/tvp-git-helper/main.c
@@ -26,7 +26,7 @@
 #include <glib/gprintf.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include "tgh-add.h"
 #include "tgh-branch.h"
diff --git a/tvp-git-helper/tgh-add.c b/tvp-git-helper/tgh-add.c
index 7472ad0..78400cc 100644
--- a/tvp-git-helper/tgh-add.c
+++ b/tvp-git-helper/tgh-add.c
@@ -33,7 +33,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include "tgh-common.h"
 #include "tgh-dialog-common.h"
diff --git a/tvp-git-helper/tgh-branch-dialog.c b/tvp-git-helper/tgh-branch-dialog.c
index dbb6852..c4262a6 100644
--- a/tvp-git-helper/tgh-branch-dialog.c
+++ b/tvp-git-helper/tgh-branch-dialog.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include "tgh-common.h"
diff --git a/tvp-git-helper/tgh-branch.c b/tvp-git-helper/tgh-branch.c
index 8d7d2cc..2f489d7 100644
--- a/tvp-git-helper/tgh-branch.c
+++ b/tvp-git-helper/tgh-branch.c
@@ -22,10 +22,14 @@
 #include <stdlib.h>
 #endif
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include "tgh-common.h"
 #include "tgh-dialog-common.h"
diff --git a/tvp-git-helper/tgh-common.c b/tvp-git-helper/tgh-common.c
index 6ae6ae2..f31ab72 100644
--- a/tvp-git-helper/tgh-common.c
+++ b/tvp-git-helper/tgh-common.c
@@ -33,7 +33,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include "tgh-dialog-common.h"
 #include "tgh-status-dialog.h"
diff --git a/tvp-git-helper/tgh-dialog-common.c b/tvp-git-helper/tgh-dialog-common.c
index b39eb95..3f028b8 100644
--- a/tvp-git-helper/tgh-dialog-common.c
+++ b/tvp-git-helper/tgh-dialog-common.c
@@ -19,7 +19,6 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
 #include <gtk/gtk.h>
 
 #include "tgh-dialog-common.h"
diff --git a/tvp-git-helper/tgh-file-selection-dialog.c b/tvp-git-helper/tgh-file-selection-dialog.c
index 0ba5955..be9053d 100644
--- a/tvp-git-helper/tgh-file-selection-dialog.c
+++ b/tvp-git-helper/tgh-file-selection-dialog.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include "tgh-common.h"
diff --git a/tvp-git-helper/tgh-reset-dialog.c b/tvp-git-helper/tgh-reset-dialog.c
index 73c7049..539bea8 100644
--- a/tvp-git-helper/tgh-reset-dialog.c
+++ b/tvp-git-helper/tgh-reset-dialog.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include "tgh-reset-dialog.h"
diff --git a/tvp-git-helper/tgh-reset.c b/tvp-git-helper/tgh-reset.c
index f73339b..cbc6378 100644
--- a/tvp-git-helper/tgh-reset.c
+++ b/tvp-git-helper/tgh-reset.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include "tgh-common.h"
 #include "tgh-dialog-common.h"
diff --git a/tvp-git-helper/tgh-status-dialog.c b/tvp-git-helper/tgh-status-dialog.c
index 6f7f426..0b1c033 100644
--- a/tvp-git-helper/tgh-status-dialog.c
+++ b/tvp-git-helper/tgh-status-dialog.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include "tgh-common.h"
diff --git a/tvp-git-helper/tgh-status.c b/tvp-git-helper/tgh-status.c
index 40cecd7..3a353c8 100644
--- a/tvp-git-helper/tgh-status.c
+++ b/tvp-git-helper/tgh-status.c
@@ -22,11 +22,13 @@
 #include <stdlib.h>
 #endif
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #include <glib.h>
 #include <gtk/gtk.h>
-
-#include <thunar-vfs/thunar-vfs.h>
-
+#include <libxfce4util/libxfce4util.h>
 #include "tgh-common.h"
 #include "tgh-dialog-common.h"
 #include "tgh-status-dialog.h"
diff --git a/tvp-svn-helper/Makefile.am b/tvp-svn-helper/Makefile.am
index db4c9fa..12aa9af 100644
--- a/tvp-svn-helper/Makefile.am
+++ b/tvp-svn-helper/Makefile.am
@@ -92,7 +92,7 @@ tvp_svn_helper_CPPFLAGS =						\
 
 tvp_svn_helper_CFLAGS =							\
 	$(PLATFORM_CFLAGS)						\
-	$(THUNAR_VFS_CFLAGS)						\
+	$(LIBXFCE4UTIL_CFLAGS)						\
 	$(GTK_CFLAGS)							\
 	$(GLIB_CFLAGS)							\
 	$(GOBJECT_CFLAGS)						\
@@ -100,9 +100,10 @@ tvp_svn_helper_CFLAGS =							\
 
 tvp_svn_helper_LDFLAGS =						\
 	$(PLATFORM_LIBS)						\
-	$(THUNAR_VFS_LIBS)						\
+	$(LIBXFCE4UTIL_LIBS)						\
 	$(GTK_LIBS)							\
 	$(GLIB_LIBS)							\
+	$(GTHREAD_LIBS)							\
 	$(GOBJECT_LIBS)							\
 	$(APR_LIBS)
 
diff --git a/tvp-svn-helper/main.c b/tvp-svn-helper/main.c
index 7083b25..4a1dab6 100644
--- a/tvp-svn-helper/main.c
+++ b/tvp-svn-helper/main.c
@@ -26,7 +26,7 @@
 #include <glib/gprintf.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-add.c b/tvp-svn-helper/tsh-add.c
index fb7b6c1..9bc6060 100644
--- a/tvp-svn-helper/tsh-add.c
+++ b/tvp-svn-helper/tsh-add.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-blame-dialog.c b/tvp-svn-helper/tsh-blame-dialog.c
index 5bbad63..4ebd65d 100644
--- a/tvp-svn-helper/tsh-blame-dialog.c
+++ b/tvp-svn-helper/tsh-blame-dialog.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include <subversion-1/svn_client.h>
diff --git a/tvp-svn-helper/tsh-blame.c b/tvp-svn-helper/tsh-blame.c
index c05b5c0..9ba8499 100644
--- a/tvp-svn-helper/tsh-blame.c
+++ b/tvp-svn-helper/tsh-blame.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-checkout.c b/tvp-svn-helper/tsh-checkout.c
index 516c5e7..8833103 100644
--- a/tvp-svn-helper/tsh-checkout.c
+++ b/tvp-svn-helper/tsh-checkout.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-cleanup.c b/tvp-svn-helper/tsh-cleanup.c
index 8f178cb..436b974 100644
--- a/tvp-svn-helper/tsh-cleanup.c
+++ b/tvp-svn-helper/tsh-cleanup.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-commit.c b/tvp-svn-helper/tsh-commit.c
index 6a28913..1cc885b 100644
--- a/tvp-svn-helper/tsh-commit.c
+++ b/tvp-svn-helper/tsh-commit.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-common.c b/tvp-svn-helper/tsh-common.c
index 511a6ec..fe6c174 100644
--- a/tvp-svn-helper/tsh-common.c
+++ b/tvp-svn-helper/tsh-common.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <apr_lib.h>
 
diff --git a/tvp-svn-helper/tsh-copy.c b/tvp-svn-helper/tsh-copy.c
index 8dc9777..7f13d75 100644
--- a/tvp-svn-helper/tsh-copy.c
+++ b/tvp-svn-helper/tsh-copy.c
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <dirent.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-delete.c b/tvp-svn-helper/tsh-delete.c
index 9c4e73c..b023768 100644
--- a/tvp-svn-helper/tsh-delete.c
+++ b/tvp-svn-helper/tsh-delete.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-dialog-common.c b/tvp-svn-helper/tsh-dialog-common.c
index 702cd99..036bebe 100644
--- a/tvp-svn-helper/tsh-dialog-common.c
+++ b/tvp-svn-helper/tsh-dialog-common.c
@@ -19,7 +19,6 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
 #include <gtk/gtk.h>
 
 #include "tsh-dialog-common.h"
diff --git a/tvp-svn-helper/tsh-export.c b/tvp-svn-helper/tsh-export.c
index a59d8f7..88cac04 100644
--- a/tvp-svn-helper/tsh-export.c
+++ b/tvp-svn-helper/tsh-export.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-file-dialog.c b/tvp-svn-helper/tsh-file-dialog.c
index af00567..b994aba 100644
--- a/tvp-svn-helper/tsh-file-dialog.c
+++ b/tvp-svn-helper/tsh-file-dialog.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include "tsh-file-dialog.h"
diff --git a/tvp-svn-helper/tsh-file-selection-dialog.c b/tvp-svn-helper/tsh-file-selection-dialog.c
index f2c9e1b..89e441e 100644
--- a/tvp-svn-helper/tsh-file-selection-dialog.c
+++ b/tvp-svn-helper/tsh-file-selection-dialog.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include <subversion-1/svn_client.h>
diff --git a/tvp-svn-helper/tsh-import.c b/tvp-svn-helper/tsh-import.c
index 509d280..8e1bdc5 100644
--- a/tvp-svn-helper/tsh-import.c
+++ b/tvp-svn-helper/tsh-import.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-lock-dialog.c b/tvp-svn-helper/tsh-lock-dialog.c
index 9e7db67..4a9ed43 100644
--- a/tvp-svn-helper/tsh-lock-dialog.c
+++ b/tvp-svn-helper/tsh-lock-dialog.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include "tsh-lock-dialog.h"
diff --git a/tvp-svn-helper/tsh-lock.c b/tvp-svn-helper/tsh-lock.c
index 03ac091..1702b14 100644
--- a/tvp-svn-helper/tsh-lock.c
+++ b/tvp-svn-helper/tsh-lock.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-log-dialog.c b/tvp-svn-helper/tsh-log-dialog.c
index 62f5d0c..9a4c9e1 100644
--- a/tvp-svn-helper/tsh-log-dialog.c
+++ b/tvp-svn-helper/tsh-log-dialog.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include <subversion-1/svn_client.h>
diff --git a/tvp-svn-helper/tsh-log-message-dialog.c b/tvp-svn-helper/tsh-log-message-dialog.c
index ffaf48f..80e6b23 100644
--- a/tvp-svn-helper/tsh-log-message-dialog.c
+++ b/tvp-svn-helper/tsh-log-message-dialog.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include "tsh-tree-common.h"
diff --git a/tvp-svn-helper/tsh-log.c b/tvp-svn-helper/tsh-log.c
index 8dd6d8d..a45b596 100644
--- a/tvp-svn-helper/tsh-log.c
+++ b/tvp-svn-helper/tsh-log.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-login-dialog.c b/tvp-svn-helper/tsh-login-dialog.c
index ced0c0c..609632a 100644
--- a/tvp-svn-helper/tsh-login-dialog.c
+++ b/tvp-svn-helper/tsh-login-dialog.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include "tsh-login-dialog.h"
diff --git a/tvp-svn-helper/tsh-move.c b/tvp-svn-helper/tsh-move.c
index a38e2b8..110ee82 100644
--- a/tvp-svn-helper/tsh-move.c
+++ b/tvp-svn-helper/tsh-move.c
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <dirent.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-notify-dialog.c b/tvp-svn-helper/tsh-notify-dialog.c
index b001697..ff262e2 100644
--- a/tvp-svn-helper/tsh-notify-dialog.c
+++ b/tvp-svn-helper/tsh-notify-dialog.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include "tsh-notify-dialog.h"
diff --git a/tvp-svn-helper/tsh-properties-dialog.c b/tvp-svn-helper/tsh-properties-dialog.c
index 01b0b4a..6eb6ef9 100644
--- a/tvp-svn-helper/tsh-properties-dialog.c
+++ b/tvp-svn-helper/tsh-properties-dialog.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include <subversion-1/svn_client.h>
diff --git a/tvp-svn-helper/tsh-properties.c b/tvp-svn-helper/tsh-properties.c
index 0c6b573..4411568 100644
--- a/tvp-svn-helper/tsh-properties.c
+++ b/tvp-svn-helper/tsh-properties.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-relocate-dialog.c b/tvp-svn-helper/tsh-relocate-dialog.c
index 12907b1..7fadd01 100644
--- a/tvp-svn-helper/tsh-relocate-dialog.c
+++ b/tvp-svn-helper/tsh-relocate-dialog.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 #include <dirent.h>
 #include <subversion-1/svn_path.h>
diff --git a/tvp-svn-helper/tsh-relocate.c b/tvp-svn-helper/tsh-relocate.c
index f62d53d..b82a755 100644
--- a/tvp-svn-helper/tsh-relocate.c
+++ b/tvp-svn-helper/tsh-relocate.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-resolved.c b/tvp-svn-helper/tsh-resolved.c
index eb1bea9..169cce3 100644
--- a/tvp-svn-helper/tsh-resolved.c
+++ b/tvp-svn-helper/tsh-resolved.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-revert.c b/tvp-svn-helper/tsh-revert.c
index ff7d883..3adec36 100644
--- a/tvp-svn-helper/tsh-revert.c
+++ b/tvp-svn-helper/tsh-revert.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-status-dialog.c b/tvp-svn-helper/tsh-status-dialog.c
index de45a2c..6fb6461 100644
--- a/tvp-svn-helper/tsh-status-dialog.c
+++ b/tvp-svn-helper/tsh-status-dialog.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include <subversion-1/svn_client.h>
diff --git a/tvp-svn-helper/tsh-status.c b/tvp-svn-helper/tsh-status.c
index a048546..4c67611 100644
--- a/tvp-svn-helper/tsh-status.c
+++ b/tvp-svn-helper/tsh-status.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-switch.c b/tvp-svn-helper/tsh-switch.c
index 1102112..0db4868 100644
--- a/tvp-svn-helper/tsh-switch.c
+++ b/tvp-svn-helper/tsh-switch.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-transfer-dialog.c b/tvp-svn-helper/tsh-transfer-dialog.c
index 934a1e9..26c783b 100644
--- a/tvp-svn-helper/tsh-transfer-dialog.c
+++ b/tvp-svn-helper/tsh-transfer-dialog.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 #include <dirent.h>
 #include <subversion-1/svn_path.h>
diff --git a/tvp-svn-helper/tsh-trust-dialog.c b/tvp-svn-helper/tsh-trust-dialog.c
index 2f45d2f..4c43e73 100644
--- a/tvp-svn-helper/tsh-trust-dialog.c
+++ b/tvp-svn-helper/tsh-trust-dialog.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #endif
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 #include <gtk/gtk.h>
 
 #include <subversion-1/svn_auth.h>
diff --git a/tvp-svn-helper/tsh-unlock.c b/tvp-svn-helper/tsh-unlock.c
index 5c049be..20a4fe6 100644
--- a/tvp-svn-helper/tsh-unlock.c
+++ b/tvp-svn-helper/tsh-unlock.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>
diff --git a/tvp-svn-helper/tsh-update.c b/tvp-svn-helper/tsh-update.c
index 9ba1633..6be56a9 100644
--- a/tvp-svn-helper/tsh-update.c
+++ b/tvp-svn-helper/tsh-update.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <thunar-vfs/thunar-vfs.h>
+#include <libxfce4util/libxfce4util.h>
 
 #include <subversion-1/svn_client.h>
 #include <subversion-1/svn_pools.h>

More information about the Xfce4-commits mailing list