[Xfce4-commits] <thunar-vcs-plugin:thunarx-2> * autogen.sh configure.ac.in: Changed scripts to xfce4-dev-tools version 4.7.2. Thunar VCS Plugin depends on 4.7.2 of xfce4-dev-tools, now. * tvp-svn-helper/tsh-file-selection-dialog.c: Fixed revert for directory deletion.

Peter de Ridder noreply at xfce.org
Sun Nov 29 19:04:09 CET 2009


Updating branch refs/heads/thunarx-2
         to 62e7c3f1ac9edb49e7315fbf4eb4bb1cc3e6ef70 (commit)
       from 8d25653224e304889d941de8ed4ee6ad8b581c62 (commit)

commit 62e7c3f1ac9edb49e7315fbf4eb4bb1cc3e6ef70
Author: Peter de Ridder <peter at xfce.org>
Date:   Sun Sep 27 13:14:53 2009 +0200

    * autogen.sh configure.ac.in: Changed scripts to xfce4-dev-tools
      version 4.7.2. Thunar VCS Plugin depends on 4.7.2 of
      xfce4-dev-tools, now.
    * tvp-svn-helper/tsh-file-selection-dialog.c: Fixed revert for
      directory deletion.

 ChangeLog                                  |   90 +++++++++++++++++++++++++++-
 autogen.sh                                 |   22 +-------
 configure.ac.in                            |   69 ++++-----------------
 tvp-svn-helper/tsh-file-selection-dialog.c |    7 +--
 4 files changed, 102 insertions(+), 86 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dbfd09b..04e6ef4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,87 @@
+2009-09-27	Peter de Ridder <peter at xfce.org>
+
+	* autogen.sh configure.ac.in: Changed scripts to xfce4-dev-tools
+	  version 4.7.2. Thunar VCS Plugin depends on 4.7.2 of
+	  xfce4-dev-tools, now.
+	* tvp-svn-helper/tsh-file-selection-dialog.c: Fixed revert for
+	  directory deletion.
+
+2009-08-27	Peter de Ridder <peter at xfce.org>
+
+	* tvp-svn-helper/tsh-commit.c
+	  tvp-svn-helper/tsh-file-selection-dialog.[ch]: Better file Selector.
+	  Using recursion info in file selection and commit command to be able
+	  to commit directory deletion.
+	* tvp-svn-helper/tsh-delete.c: Removed TSH_FILE_SELECTION_FLAG_MODIFIED
+	  flag.
+	* tvp-svn-helper/tsh-revert.c: Added
+	  TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN flag.
+
+2009-07-27	Peter de Ridder <peter at xfce.org>
+
+	* tvp-svn-helper/tsh-delete.c(delete_thread): Fixed segfault.
+	* tvp-svn-helper/tsh-file-selection-dialog.[ch]: Support for
+	  unversioned directory trees.
+	* tvp-svn-helper/tsh-revert.c(revert_thread): Execute revert in
+	  reverse directory order.
+	* tvp-svn-helper/tsh-add.c: Support for non-recursive add.
+	* tvp-svn-helper/tsh-log-dialog.c: Fixed 2 missing characters in last
+	  commit.
+	* tvp-svn-helper/tsh-commit.c: Support adding unversioned files before
+	  commiting. This fixes bug #3921.
+	
+2009-07-26	Peter de Ridder <peter at xfce.org>
+
+	* thunar-vcs-plugin/tvp-svn-action.c: The add context menu item is now
+	  visible on folder background menu too.
+	* tvp-svn-helper/tsh-{file-selection,log-message,log,status}-dialog.c:
+	  The file lists are tree views now.
+	* tvp-svn-helper/tsh-tree-common.[ch]: Common routines to build a tree
+	  view of files.
+	* tvp-svn-helper/tsh-common.c(tsh_log_func)
+	  tvp-svn-helper/tsh-log-dialog.[ch]: Support has_children for log
+	  entries.
+	* tvp-svn-helper/Makefile.am: tsh-tree-common.[ch] added.
+	
+2009-07-25	Peter de Ridder <peter at xfce.org>
+
+	* thunar-vcs-plugin/tvp-svn-backend.c(tvp_svn_backend_init,
+	  tvp_svn_backend_free): Changed the libsvn init. Not using
+	  svn_cmdline_init anymore. This fixes bug #5106.
+	* thunar-vcs-plugin/tvp-svn-action.c(tvp_svn_action_create_menu_item):
+	  Made the changelist menu item popup unimplemented.
+	* tvp-git-helper/tgh-{add,common}.c: Fixed system includes.
+	* configure.ac.in: Added check for 'sys/wait.h'.
+	* tvp-svn-helper/gtk*.[ch]: Removed the gtkfilechooser files from the
+	  project.
+	* tvp-svn-helper/ths-log.c(log_thread): Fixed libsvn 1.5 support.
+	* tvp-svn-helper/tsh-common.c: Fixed compiler compatibility.
+	* tvp-svn-helper/tsh-resolved.c(resolved_thread): Added initializer
+	  for posible uninintialized variable.
+	
+2009-07-10	Peter de Ridder <peter at xfce.org>
+
+	* configure.ac.in: Added flags to disable subversion or git support.
+
+2009-06-28	Peter de Ridder <peter at xfce.org>
+
+	* Renaming the thunar-svn-plugin to thunar-vcs-plugin.
+	* Added basic git support to the thunar-vcs-plugin.
+
+2009-06-28	Peter de Ridder <peter at xfce.org>
+
+	* thunar-svn-plugin.c: Added add_subaction{,_u} to save alot of code
+	  for adding items to the action menu.
+
+2009-04-30	Peter de Ridder <peter at xfce.org>
+
+	* configure.ac.in: version incremented after release.
+	* thunar-svn-plugin tsp-svn-helper: changed functions to svn 1.6 api.
+
+2009-03-15	Peter de Ridder <peter at xfce.org>
+
+	* Added comments about 1.5 recursion information for translators.
+
 2009-03-14	Peter de Ridder	<peter at xfce.org>
 
 	* === Released 0.0.3 ===
@@ -10,14 +94,14 @@
 2009-02-27	Peter de Ridder	<peter at xfce.org>
 
 	* thunar-svn-helper/tsh-{transfer,relocate}-dialog.c
-	thunar-svn-helper/Makefile: Removed gtkfilechooserentry which got
-	broken with the later version of gtk.
+	  thunar-svn-helper/Makefile: Removed gtkfilechooserentry which got
+	  broken with the later version of gtk.
 	* INSTALL: Updated to newer version provided by the auto tools.
 
 2008-07-17	Peter de Ridder	<peter at xfce.org>
 
 	* tsp-svn-helper/main.c: Fixed bug by moving gtk_threads_enter
-	directly behind gdk_threads_init.
+	  directly behind gdk_threads_init.
 
 2008-06-16	Peter de Ridder	<peter at xfce.org>
 
diff --git a/autogen.sh b/autogen.sh
index f56ecb7..f87947f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,26 +16,6 @@ EOF
   exit 1
 }
 
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
-  cat >&2 <<EOF
-autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
-            or try to checkout again.
-EOF
-  exit 1
-}
-
-# substitute revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-if test -d .git/svn; then
- revision=`LC_ALL=C git-svn find-rev HEAD`
-else
- revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n",$2}'`
-fi
-sed -e "s/@LINGUAS@/${linguas}/g" \
-    -e "s/@REVISION@/${revision}/g" \
-    < "configure.ac.in" > "configure.ac"
-
-exec xdt-autogen $@
+XDT_AUTOGEN_REQUIRED_VERSION="4.7.0" exec xdt-autogen $@
 
 # vi:set ts=2 sw=2 et ai:
diff --git a/configure.ac.in b/configure.ac.in
index 4dc8f51..14f03b5 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -11,21 +11,21 @@ dnl ***************************
 dnl *** Version information ***
 dnl ***************************
 m4_define([tvp_version_major], [0])
-m4_define([tvp_version_minor], [0])
-m4_define([tvp_version_micro], [4])
-m4_define([tvp_version_build], [r at REVISION@])
-m4_define([tvp_version_tag], [svn]) # Leave empty for releases
+m4_define([tvp_version_minor], [1])
+m4_define([tvp_version_micro], [0])
+m4_define([tvp_version_build], [@REVISION@])
+m4_define([tvp_version_tag], [git]) # Leave empty for releases
 m4_define([tvp_version], [tvp_version_major().tvp_version_minor().tvp_version_micro()ifelse(tvp_version_tag(), [], [], [tvp_version_tag()-tvp_version_build()])])
 
 dnl *******************************************
-dnl *** Debugging support for SVN snapshots ***
+dnl *** Debugging support for GIT snapshots ***
 dnl *******************************************
-m4_define([tvp_debug_default], [ifelse(tvp_version_tag(), [svn], [yes], [minimum])])
+m4_define([tvp_debug_default], [ifelse(tvp_version_tag(), [git], [yes], [])])
 
 dnl ***************************
 dnl *** Initialize autoconf ***
 dnl ***************************
-AC_COPYRIGHT([Copyright (c) 2006-2007 Peter de Ridder <peter at xfce.org>.])
+AC_COPYRIGHT([Copyright (c) 2006-2009 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_PREREQ([2.50])
@@ -98,9 +98,9 @@ fi
 AM_CONDITIONAL([HAVE_SUBVERSION], [test x"$found_subversion" = x"yes"])
 
 AC_ARG_ENABLE([git], 
-    AC_HELP_STRING([--enable-git], [Enable git (default)])
-AC_HELP_STRING([--disable-git], [Disable git]),
-    [check_for_git=$enableval], [check_for_git=yes])
+    AC_HELP_STRING([--enable-git], [Enable git])
+AC_HELP_STRING([--disable-git], [Disable git (default)]),
+    [check_for_git=$enableval], [check_for_git=no])
 AC_MSG_CHECKING([for optional package git])
 if test x"$check_for_git" = x"yes"; then
     found_git=yes
@@ -114,57 +114,12 @@ AM_CONDITIONAL([HAVE_GIT], [test x"$found_git" = x"yes"])
 dnl ***********************************
 dnl *** Check for debugging support ***
 dnl ***********************************
-AC_ARG_ENABLE([debug],
-AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes/full@:>@], [Turn on debugging @<:@default=tvp_debug_default@:>@]),
-  [], [enable_debug=tvp_debug_default])
-AC_MSG_CHECKING([whether to enable debugging support])
-if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then
-  dnl Check whether the compiler accepts the -fno-strict-aliasing
-  dnl switch, as certain packages - like Glib - still don't work
-  dnl properly with newer compilers.
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -fno-strict-aliasing"
-  AC_MSG_CHECKING([whether $CC accepts -fno-strict-aliasing])
-  AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
-    AC_MSG_RESULT([yes])
-    PLATFORM_CFLAGS="$PLATFORM_CFLAGS -fno-strict-aliasing"
-  ], [
-    AC_MSG_RESULT([no])
-  ])
-  CFLAGS="$save_CFLAGS"
-
-  dnl Make sure we detect possible errors
-  PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Werror -Wall"
-
-  dnl Paranoia for --enable-debug=full
-  if test x"$enable_debug" = x"full"; then
-    PLATFORM_CFLAGS="$PLATFORM_CFLAGS -O0 -g3"
-    PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_DEPRECATED -DG_ENABLE_DEBUG"
-  fi
-else
-  dnl Disable object cast checks
-  PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS"
-
-  dnl Disable all checks for --enable-debug=no
-  if test x"$enable_debug" = x"no"; then
-    PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
-  fi
-fi
-AC_MSG_RESULT([$enable_debug])
+XDT_FEATURE_DEBUG([tvp_debug_default])
 
 dnl **************************************
 dnl *** Check for linker optimizations ***
 dnl **************************************
-AC_MSG_CHECKING([whether $LD accepts -O1])
-case `$LD -O1 -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -Wl,-O1"
-  AC_MSG_RESULT([yes])
-  ;;
-*)
-  AC_MSG_RESULT([no])
-  ;;
-esac
+XDT_FEATURE_LINKER_OPTS()
 
 dnl *********************************
 dnl *** Substitute platform flags ***
diff --git a/tvp-svn-helper/tsh-file-selection-dialog.c b/tvp-svn-helper/tsh-file-selection-dialog.c
index 454b6c7..8c72220 100644
--- a/tvp-svn-helper/tsh-file-selection-dialog.c
+++ b/tvp-svn-helper/tsh-file-selection-dialog.c
@@ -505,10 +505,7 @@ selection_cell_toggled (GtkCellRendererToggle *renderer, gchar *path, gpointer u
       break;
     case TSH_FILE_STATUS_DELETED:
       if (dialog->flags & TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN)
-      {
-        if(selection)
-          set_children_status (dialog, GTK_TREE_STORE (model), &iter, selection, non_recursive);
-      }
+        set_children_status (dialog, GTK_TREE_STORE (model), &iter, selection, non_recursive);
       else
         set_children_status (dialog, GTK_TREE_STORE (model), &iter, selection, !selection);
       break;
@@ -628,7 +625,7 @@ set_selected (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointe
           enabled = status == TSH_FILE_STATUS_UNVERSIONED && ((struct select_context*)ctx)->select;
         break;
       case TSH_FILE_STATUS_DELETED:
-        enabled = !((struct select_context*)ctx)->select;
+        enabled = !(((struct select_context*)ctx)->dialog->flags & TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN) && !((struct select_context*)ctx)->select;
         break;
       case TSH_FILE_STATUS_UNVERSIONED:
         enabled = FALSE;



More information about the Xfce4-commits mailing list