[Xfce4-commits] <thunar-vcs-plugin:thunarx-2> * thunar-vcs-plugin/tvp-provider.c tvp-git-helper/*.c: Ported git helper to thunarx-2.
Peter de Ridder
noreply at xfce.org
Sun Nov 29 19:06:15 CET 2009
Updating branch refs/heads/thunarx-2
to 00643afda39561a1ba7665c4a78b7fa0127104de (commit)
from d71f86ea9cc5ae53b9727c4d7ac756ca5c2c14ca (commit)
commit 00643afda39561a1ba7665c4a78b7fa0127104de
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Nov 29 11:44:37 2009 +0100
* thunar-vcs-plugin/tvp-provider.c tvp-git-helper/*.c: Ported git helper
to thunarx-2.
thunar-vcs-plugin/tvp-provider.c | 12 ++++++++----
tvp-git-helper/tgh-blame-dialog.c | 2 +-
tvp-git-helper/tgh-blame.c | 2 +-
tvp-git-helper/tgh-clean-dialog.c | 2 +-
tvp-git-helper/tgh-clean.c | 2 +-
tvp-git-helper/tgh-clone.c | 2 +-
tvp-git-helper/tgh-log-dialog.c | 2 +-
tvp-git-helper/tgh-log.c | 2 +-
tvp-git-helper/tgh-move.c | 2 +-
tvp-git-helper/tgh-stash-dialog.c | 2 +-
tvp-git-helper/tgh-stash.c | 2 +-
tvp-git-helper/tgh-transfer-dialog.c | 2 +-
12 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/thunar-vcs-plugin/tvp-provider.c b/thunar-vcs-plugin/tvp-provider.c
index 2119b42..139a95f 100644
--- a/thunar-vcs-plugin/tvp-provider.c
+++ b/thunar-vcs-plugin/tvp-provider.c
@@ -388,6 +388,8 @@ tvp_provider_get_file_actions (ThunarxMenuProvider *menu_provider,
{
GList *actions = NULL;
GtkAction *action;
+ GList *lp;
+ gint n_files = 0;
#ifdef HAVE_SUBVERSION
gchar *scheme;
gboolean parent_wc = FALSE;
@@ -470,13 +472,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);
if (thunarx_file_info_is_directory (lp->data))
{
diff --git a/tvp-git-helper/tgh-blame-dialog.c b/tvp-git-helper/tgh-blame-dialog.c
index 24adf64..aaae2e5 100644
--- a/tvp-git-helper/tgh-blame-dialog.c
+++ b/tvp-git-helper/tgh-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 "tgh-common.h"
diff --git a/tvp-git-helper/tgh-blame.c b/tvp-git-helper/tgh-blame.c
index 61b3b2e..bce7762 100644
--- a/tvp-git-helper/tgh-blame.c
+++ b/tvp-git-helper/tgh-blame.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-clean-dialog.c b/tvp-git-helper/tgh-clean-dialog.c
index 24c2f6c..3c85b1e 100644
--- a/tvp-git-helper/tgh-clean-dialog.c
+++ b/tvp-git-helper/tgh-clean-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-clean-dialog.h"
diff --git a/tvp-git-helper/tgh-clean.c b/tvp-git-helper/tgh-clean.c
index 632ee5c..899e958 100644
--- a/tvp-git-helper/tgh-clean.c
+++ b/tvp-git-helper/tgh-clean.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-clone.c b/tvp-git-helper/tgh-clone.c
index 76ccfd5..b863363 100644
--- a/tvp-git-helper/tgh-clone.c
+++ b/tvp-git-helper/tgh-clone.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-log-dialog.c b/tvp-git-helper/tgh-log-dialog.c
index f7938c9..012e38d 100644
--- a/tvp-git-helper/tgh-log-dialog.c
+++ b/tvp-git-helper/tgh-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 "tgh-common.h"
diff --git a/tvp-git-helper/tgh-log.c b/tvp-git-helper/tgh-log.c
index f9d1918..29825fb 100644
--- a/tvp-git-helper/tgh-log.c
+++ b/tvp-git-helper/tgh-log.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-move.c b/tvp-git-helper/tgh-move.c
index 9b8cd6b..64a3fbd 100644
--- a/tvp-git-helper/tgh-move.c
+++ b/tvp-git-helper/tgh-move.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-stash-dialog.c b/tvp-git-helper/tgh-stash-dialog.c
index d51a804..d62048f 100644
--- a/tvp-git-helper/tgh-stash-dialog.c
+++ b/tvp-git-helper/tgh-stash-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-stash.c b/tvp-git-helper/tgh-stash.c
index ee87cd9..821d549 100644
--- a/tvp-git-helper/tgh-stash.c
+++ b/tvp-git-helper/tgh-stash.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-transfer-dialog.c b/tvp-git-helper/tgh-transfer-dialog.c
index c894674..7b4ef80 100644
--- a/tvp-git-helper/tgh-transfer-dialog.c
+++ b/tvp-git-helper/tgh-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>
More information about the Xfce4-commits
mailing list