[Xfce4-commits] <thunar-vcs-plugin:thunarx-2> * thunar-vcs-plugin/tvp-provider.c: Fixed build when svn is disabled. * tvp-git-helper/tgh-{add, move, reset}.c: Fixed WEXITSTATUS includes.

[Peter de Ridder]

Updating branch refs/heads/thunarx-2
         to b569d3b43feb8572c5c0ff46016e41f29912106a (commit)
       from 6132b287a5f479fd62fcbac18973b3103304e6df (commit)

commit b569d3b43feb8572c5c0ff46016e41f29912106a
Author: Peter de Ridder <peter at xfce.org>
Date:   Sun Nov 8 17:00:18 2009 +0100

    * thunar-vcs-plugin/tvp-provider.c: Fixed build when svn is disabled.
    * tvp-git-helper/tgh-{add,move,reset}.c: Fixed WEXITSTATUS includes.

 thunar-vcs-plugin/tvp-provider.c |    4 +++-
 tvp-git-helper/tgh-add.c         |    8 --------
 tvp-git-helper/tgh-move.c        |    9 ++++++++-
 tvp-git-helper/tgh-reset.c       |    8 ++++++++
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/thunar-vcs-plugin/tvp-provider.c b/thunar-vcs-plugin/tvp-provider.c
index ac77ffc..cc46ccd 100644
--- a/thunar-vcs-plugin/tvp-provider.c
+++ b/thunar-vcs-plugin/tvp-provider.c
@@ -303,6 +303,7 @@ tvp_get_parent_status (ThunarxFileInfo *file_info)
 
 
 
+#ifdef HAVE_SUBVERSION
 static gint
 tvp_compare_filename (const gchar *uri1, const gchar *uri2)
 {
@@ -343,6 +344,7 @@ tvp_compare_filename (const gchar *uri1, const gchar *uri2)
 
   return result;
 }
+#endif
 
 
 
@@ -389,13 +391,13 @@ tvp_provider_get_file_actions (ThunarxMenuProvider *menu_provider,
   ThunarVfsPathScheme scheme;
   ThunarVfsInfo      *info;
   GList              *lp;
+  gint                n_files = 0;
 #ifdef HAVE_SUBVERSION
   gboolean            parent_wc = FALSE;
   gboolean            directory_is_wc = FALSE;
   gboolean            directory_is_not_wc = FALSE;
   gboolean            file_is_vc = FALSE;
   gboolean            file_is_not_vc = FALSE;
-  gint                n_files = 0;
   GSList             *file_status;
   GSList             *iter;
 #endif
diff --git a/tvp-git-helper/tgh-add.c b/tvp-git-helper/tgh-add.c
index 76dd80c..1ac5351 100644
--- a/tvp-git-helper/tgh-add.c
+++ b/tvp-git-helper/tgh-add.c
@@ -22,14 +22,6 @@
 #include <stdlib.h>
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-
 #include <glib.h>
 #include <gtk/gtk.h>
 
diff --git a/tvp-git-helper/tgh-move.c b/tvp-git-helper/tgh-move.c
index 0e89843..9b8cd6b 100644
--- a/tvp-git-helper/tgh-move.c
+++ b/tvp-git-helper/tgh-move.c
@@ -22,9 +22,16 @@
 #include <stdlib.h>
 #endif
 
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <dirent.h>
 
 #include <thunar-vfs/thunar-vfs.h>
 
diff --git a/tvp-git-helper/tgh-reset.c b/tvp-git-helper/tgh-reset.c
index 0bd1e7f..10300dc 100644
--- a/tvp-git-helper/tgh-reset.c
+++ b/tvp-git-helper/tgh-reset.c
@@ -22,6 +22,14 @@
 #include <stdlib.h>
 #endif
 
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
 #include <glib.h>
 #include <gtk/gtk.h>