[Xfce4-commits] <thunar-archive-plugin:master> A few updates for the upcoming release.
Jannis Pohlmann
noreply at xfce.org
Sun Jan 23 15:14:01 CET 2011
Updating branch refs/heads/master
to 6813c181250667f9fe9126491f546bb598f68a1f (commit)
from 8dc299cae35d26dea1b195180f811e441fc664fd (commit)
commit 6813c181250667f9fe9126491f546bb598f68a1f
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Sun Jan 23 15:12:16 2011 +0100
A few updates for the upcoming release.
NEWS | 3 +
autogen.sh | 46 ++++++-------
configure.in.in | 87 +++++++------------------
thunar-archive-plugin/tap-backend.c | 25 ++++----
thunar-archive-plugin/tap-provider.c | 19 +++---
thunar-archive-plugin/thunar-archive-plugin.c | 28 +++++---
6 files changed, 88 insertions(+), 120 deletions(-)
diff --git a/NEWS b/NEWS
index a63e1d8..1d522b8 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@
=====
- Port the plugin to thunarx-2 and exo-1 (bug #6093).
- Add support for extracting 7z, lzma and xa archives (bug #6136).
+- Remove INSTALL from the git repository.
+- Updated translations: Chinese (Taiwan), Croatian, Galician, Greek, Hungarian,
+ Kazakh, Polish, Portuguese, Romanian, Russian, Slovak, Uyghur and many more.
0.2.4
diff --git a/autogen.sh b/autogen.sh
index 9bbd678..e209574 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,12 +1,24 @@
#!/bin/sh
#
-# $Id$
-#
-# Copyright (c) 2002-2006
-# The Thunar development team. All rights reserved.
-#
-# Written for Thunar by Benedikt Meurer <benny at xfce.org>.
-#
+# vi:set et ai sw=2 sts=2 ts=2: */
+# -
+# Copyright (c) 2002-2006 Benedikt Meurer <benny at xfce.org>
+# Copyright (c) 2011 Jannis Pohlmann <jannis at xfce.org>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General
+# Public License along with this library; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
(type xdt-autogen) >/dev/null 2>&1 || {
cat >&2 <<EOF
@@ -18,22 +30,4 @@ 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`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
-sed -e "s/@LINGUAS@/${linguas}/g" \
- -e "s/@REVISION@/${revision}/g" \
- < "configure.in.in" > "configure.in"
-
-exec xdt-autogen $@
-
-# vi:set ts=2 sw=2 et ai:
+XDT_AUTOGEN_REQUIRED_VERSION="4.7.2" exec xdt-autogen $@
diff --git a/configure.in.in b/configure.in.in
index 0a1a6a8..edb1617 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,10 +1,22 @@
-dnl $Id$
-dnl
-dnl Copyright (c) 2006-2007
-dnl The Thunar development team. All rights reserved.
-dnl
-dnl Written for Thunar by Benedikt Meurer <benny at xfce.org>.
-dnl
+# vi:set et ai sw=2 sts=2 ts=2: */
+# -
+# Copyright (c) 2006-2011 Benedikt Meurer <benny at xfce.org>
+# Copyright (c) 2011 Jannis Pohlmann <jannis at xfce.org>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General
+# Public License along with this library; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
dnl ***************************
dnl *** Version information ***
@@ -13,21 +25,18 @@ m4_define([tap_version_major], [0])
m4_define([tap_version_minor], [2])
m4_define([tap_version_micro], [5])
m4_define([tap_version_build], [r at REVISION@])
-m4_define([tap_version_tag], [svn])
+m4_define([tap_version_tag], [git])
m4_define([tap_version], [tap_version_major().tap_version_minor().tap_version_micro()ifelse(tap_version_tag(), [], [], [tap_version_tag()-tap_version_build()])])
dnl *******************************************
-dnl *** Debugging support for SVN snapshots ***
+dnl *** Debugging support for Git snapshots ***
dnl *******************************************
-m4_define([tap_debug_default], [ifelse(tap_version_tag(), [svn], [yes], [minimum])])
+m4_define([tap_debug_default], [ifelse(tap_version_tag(), [git], [yes], [minimum])])
dnl ***************************
dnl *** Initialize autoconf ***
dnl ***************************
-AC_COPYRIGHT([Copyright (c) 2006-2007
- The Thunar development team. All rights reserved.
-
-Written for Thunar by Benedikt Meurer <benny at xfce.org>.])
+AC_COPYRIGHT([Copyright (c) 2006-2011 The Thunar development team. All rights reserved.])
AC_INIT([thunar-archive-plugin], [tap_version], [thunar-dev at xfce.org])
AC_PREREQ([2.50])
AC_CANONICAL_TARGET()
@@ -71,62 +80,16 @@ dnl ***********************************
XDT_CHECK_PACKAGE([THUNARX], [thunarx-2], [0.4.0])
XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0])
-dnl XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.4.0])
dnl ***********************************
dnl *** Check for debugging support ***
dnl ***********************************
-AC_ARG_ENABLE([debug],
-AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes/full@:>@], [Turn on debugging @<:@default=tap_debug_default@:>@]),
- [], [enable_debug=tap_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([tap_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/thunar-archive-plugin/tap-backend.c b/thunar-archive-plugin/tap-backend.c
index e457c64..f8d2fbb 100644
--- a/thunar-archive-plugin/tap-backend.c
+++ b/thunar-archive-plugin/tap-backend.c
@@ -1,6 +1,7 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
* Copyright (c) 2006 Benedikt Meurer <benny at xfce.org>
+ * Copyright (c) 2011 Jannis Pohlmann <jannis at xfce.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -9,13 +10,13 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Library General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -358,19 +359,19 @@ static gchar*
tap_backend_mime_wrapper (GAppInfo *mime_application)
{
const gchar *desktop_id;
- gchar *basename;
+ gchar *base_name;
gchar *filename;
gchar *dot;
/* determine the basename of the .desktop file */
desktop_id = g_app_info_get_id (mime_application);
- basename = g_path_get_basename (desktop_id);
- dot = strrchr (basename, '.');
+ base_name = g_path_get_basename (desktop_id);
+ dot = strrchr (base_name, '.');
if (G_LIKELY (dot != NULL))
*dot = '\0';
/* generate the filename for the .tap wrapper script */
- filename = g_strdup_printf (LIBEXECDIR G_DIR_SEPARATOR_S "thunar-archive-plugin" G_DIR_SEPARATOR_S "%s.tap", basename);
+ filename = g_strdup_printf (LIBEXECDIR G_DIR_SEPARATOR_S "thunar-archive-plugin" G_DIR_SEPARATOR_S "%s.tap", base_name);
/* check if the wrapper script exists */
if (!g_file_test (filename, G_FILE_TEST_IS_EXECUTABLE))
@@ -381,7 +382,7 @@ tap_backend_mime_wrapper (GAppInfo *mime_application)
}
/* cleanup */
- g_free (basename);
+ g_free (base_name);
return filename;
}
diff --git a/thunar-archive-plugin/tap-provider.c b/thunar-archive-plugin/tap-provider.c
index a03eb2d..96c0f2e 100644
--- a/thunar-archive-plugin/tap-provider.c
+++ b/thunar-archive-plugin/tap-provider.c
@@ -1,6 +1,7 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
* Copyright (c) 2006 Benedikt Meurer <benny at xfce.org>
+ * Copyright (c) 2011 Jannis Pohlmann <jannis at xfce.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -9,13 +10,13 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Library General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -40,9 +41,7 @@
-static void tap_provider_class_init (TapProviderClass *klass);
static void tap_provider_menu_provider_init (ThunarxMenuProviderIface *iface);
-static void tap_provider_init (TapProvider *tap_provider);
static void tap_provider_finalize (GObject *object);
static GList *tap_provider_get_file_actions (ThunarxMenuProvider *menu_provider,
GtkWidget *window,
@@ -245,7 +244,7 @@ tap_provider_finalize (GObject *object)
static gboolean
tap_is_archive (ThunarxFileInfo *file_info)
{
- gint n;
+ guint n;
for (n = 0; n < G_N_ELEMENTS (TAP_MIME_TYPES); ++n)
if (thunarx_file_info_has_mime_type (file_info, TAP_MIME_TYPES[n]))
diff --git a/thunar-archive-plugin/thunar-archive-plugin.c b/thunar-archive-plugin/thunar-archive-plugin.c
index baf734c..0205af3 100644
--- a/thunar-archive-plugin/thunar-archive-plugin.c
+++ b/thunar-archive-plugin/thunar-archive-plugin.c
@@ -1,6 +1,7 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
* Copyright (c) 2006 Benedikt Meurer <benny at xfce.org>
+ * Copyright (c) 2011 Jannis Pohlmann <jannis at xfce.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -9,13 +10,13 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Library General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
@@ -28,11 +29,18 @@
+G_MODULE_EXPORT void thunar_extension_initialize (ThunarxProviderPlugin *plugin);
+G_MODULE_EXPORT void thunar_extension_shutdown (void);
+G_MODULE_EXPORT void thunar_extension_list_types (const GType **types,
+ gint *n_types);
+
+
+
static GType type_list[1];
-G_MODULE_EXPORT void
+void
thunar_extension_initialize (ThunarxProviderPlugin *plugin)
{
const gchar *mismatch;
@@ -64,7 +72,7 @@ thunar_extension_initialize (ThunarxProviderPlugin *plugin)
-G_MODULE_EXPORT void
+void
thunar_extension_shutdown (void)
{
#ifdef G_ENABLE_DEBUG
@@ -74,7 +82,7 @@ thunar_extension_shutdown (void)
-G_MODULE_EXPORT void
+void
thunar_extension_list_types (const GType **types,
gint *n_types)
{
More information about the Xfce4-commits
mailing list