diff -Nru tumbler-0.1.31/aclocal.m4 tumbler-0.1.90/aclocal.m4 --- tumbler-0.1.31/aclocal.m4 2015-02-28 16:28:12.000000000 +0000 +++ tumbler-0.1.90/aclocal.m4 2017-05-11 09:08:35.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -335,7 +335,7 @@ # on various variables needed by the Makefile.in.in installed by # glib-gettextize. dnl -glib_DEFUN([GLIB_GNU_GETTEXT], +AU_DEFUN([GLIB_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_CC])dnl GLIB_LC_MESSAGES @@ -405,7 +405,8 @@ rm -f po/POTFILES sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ < $srcdir/po/POTFILES.in > po/POTFILES - ]) + ], + [[$0: This macro is deprecated. You should use upstream gettext instead.]]) # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) # ------------------------------- @@ -457,19 +458,19 @@ # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, -dnl Inc. +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software +dnl Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -dnl This file can can be used in projects which are not available under +dnl This file can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. +dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: @@ -489,32 +490,63 @@ AC_SUBST([USE_NLS]) ]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program 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 -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29) +dnl +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) @@ -536,18 +568,19 @@ PKG_CONFIG="" fi fi[]dnl -])# PKG_PROG_PKG_CONFIG +])dnl PKG_PROG_PKG_CONFIG -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ @@ -557,8 +590,10 @@ $3])dnl fi]) -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. m4_define([_PKG_CONFIG], [if test -n "$$1"; then pkg_cv_[]$1="$$1" @@ -570,10 +605,11 @@ else pkg_failed=untried fi[]dnl -])# _PKG_CONFIG +])dnl _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -581,19 +617,17 @@ else _pkg_short_errors_supported=no fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +])dnl _PKG_SHORT_ERRORS_SUPPORTED -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac AC_DEFUN([PKG_CHECK_MODULES], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl @@ -647,16 +681,40 @@ AC_MSG_RESULT([yes]) $3 fi[]dnl -])# PKG_CHECK_MODULES +])dnl PKG_CHECK_MODULES -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. AC_DEFUN([PKG_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -667,16 +725,18 @@ AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR +])dnl PKG_INSTALLDIR -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. AC_DEFUN([PKG_NOARCH_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -687,13 +747,15 @@ AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR +])dnl PKG_NOARCH_INSTALLDIR -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. AC_DEFUN([PKG_CHECK_VAR], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl @@ -702,9 +764,9 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR +])dnl PKG_CHECK_VAR -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -716,10 +778,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -735,14 +797,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # Figure out how to run the assembler. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -762,7 +824,7 @@ # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -807,15 +869,14 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -846,7 +907,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1037,7 +1098,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1113,7 +1174,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1203,8 +1264,8 @@ # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -1277,7 +1338,11 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -1306,7 +1371,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1317,7 +1382,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -1327,7 +1392,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1349,7 +1414,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1384,7 +1449,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1434,7 +1499,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1473,7 +1538,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1502,7 +1567,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1549,7 +1614,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1568,7 +1633,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1649,7 +1714,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1709,7 +1774,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1737,7 +1802,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1756,7 +1821,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2890,7 +2955,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -4826,14 +4890,7 @@ *) objformat=elf ;; esac fi - # Handle Gentoo/FreeBSD as it was Linux - case $host_vendor in - gentoo) - version_type=linux ;; - *) - version_type=freebsd-$objformat ;; - esac - + version_type=freebsd-$objformat case $version_type in freebsd-elf*) library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' @@ -4845,12 +4902,6 @@ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; - linux) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - need_lib_prefix=no - need_version=no - ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -5060,6 +5111,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -5719,7 +5782,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -6597,7 +6660,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -7109,6 +7172,9 @@ ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -7171,6 +7237,9 @@ openbsd* | bitrig*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -7425,7 +7494,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -7946,6 +8015,7 @@ if test yes = "$lt_cv_irix_exported_symbol"; then _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -7967,7 +8037,7 @@ esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else diff -Nru tumbler-0.1.31/ChangeLog tumbler-0.1.90/ChangeLog --- tumbler-0.1.31/ChangeLog 2015-02-28 16:28:39.000000000 +0000 +++ tumbler-0.1.90/ChangeLog 2017-05-11 09:08:44.000000000 +0000 @@ -1,3 +1,322 @@ +commit d02adb17983155bfbe278228be3685d7f62ba1d0 +Merge: 87b985e 87ec630 +Author: Ali Abdallah +Date: Thu May 11 11:06:12 2017 +0200 + + Merge branch 'gdbus-port' + +commit 87ec6303a672bc66c538ff9df51f596fd9106d3e +Author: Ali Abdallah +Date: Thu May 11 09:38:17 2017 +0200 + + Fix a couple of compile warnings caused by return void + with g_return_if_fail in functions returing boolean. + +commit 87b985eb6ac8960173e25a82adb626584d70bae4 +Author: Xosé +Date: Tue Mar 21 00:30:56 2017 +0100 + + I18n: Update translation gl (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b9cb0cee1e40a9a5a073c08a8b9d638e786ca390 +Author: Apóstolos Papaðimitríu +Date: Sat Mar 4 00:30:42 2017 +0100 + + I18n: Update translation el (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1badaeed4e268c247f6bb4972fb4a60585dcc9a0 +Author: Ivica Kolić +Date: Sun Feb 26 00:30:53 2017 +0100 + + I18n: Update translation hr (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 318fbf73d377dc5240eec8700633c59b528c5ade +Author: Ivica Kolić +Date: Fri Feb 3 06:30:37 2017 +0100 + + I18n: Update translation hr (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3d5903326852db3eb2414e62cf2e6a3101f22568 +Author: Anonymous +Date: Thu Jan 19 12:30:53 2017 +0100 + + I18n: Update translation da (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 2b7a84a376ee9fb98b1f383450365e70d6240557 +Author: Anonymous +Date: Sat Jan 14 12:31:09 2017 +0100 + + I18n: Update translation da (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4290e0b232b05cbba01c935a0e94c771a3515802 +Author: Robert Antoni Buj i Gelonch +Date: Sat Apr 30 00:31:10 2016 +0200 + + I18n: Update translation ca (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 782782bfae35eff6228562aea010d1b95b37819f +Author: Påvel Nicklasson +Date: Mon Apr 25 00:30:25 2016 +0200 + + I18n: Update translation sv (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e7b570ebdff72fe44c667a4e5e1fe0b20ae0454d +Author: Anonymous +Date: Fri Mar 18 00:30:57 2016 +0100 + + I18n: Update translation lt (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit d3764923ce2a63369945ad05413443fc5207b54e +Author: Elishai Eliyahu +Date: Tue Mar 8 00:30:25 2016 +0100 + + I18n: Update translation he (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1fb6b0f583eaffd1adbae8ced5f58c1c8f63479b +Author: Apostolos Papadimitriu +Date: Tue Feb 9 00:30:38 2016 +0100 + + I18n: Update translation el (97%). + + 43 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 059d9cd6a6b0ec9c400ac82f75cd17aeaee27ea1 +Author: Piarres Beobide +Date: Mon Feb 8 18:30:34 2016 +0100 + + I18n: Update translation eu (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 22acd8bd89a16bc3bd8fdf21520d0516e931961c +Author: Apostolos Papadimitriu +Date: Fri Feb 5 18:30:30 2016 +0100 + + I18n: Update translation el (95%). + + 42 translated messages, 2 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 13aac61d20927ef8ccd0de5023b1ca38a5a49641 +Author: Ivica Kolić +Date: Fri Dec 18 18:30:36 2015 +0100 + + I18n: Update translation hr (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 96cd084411fd8b5fcfd98fb386ca4012e1a96cef +Author: Davidmp +Date: Tue Dec 15 18:30:23 2015 +0100 + + I18n: Update translation ca (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 8dacf47153bdafc82fc48fdecc079514a6ecab39 +Author: Sveinn í Felli +Date: Sun Dec 13 18:30:24 2015 +0100 + + I18n: Update translation is (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 8b048c5d48673b51860a546608e3b4c6a5dae23c +Author: Ali Abdallah +Date: Sun Nov 1 21:40:18 2015 +0100 + + Pass &s to g_variant_get to get only a pointer to the serialised + data. + +commit a52fce150b161149886f417b80b78bcfe977accf +Author: Ali Abdallah +Date: Wed Oct 14 13:47:25 2015 +0200 + + Fixed a typo in g_variant_is_of_type. + + Indentation prob also is fixed. + +commit 2eef7d1e9e637b2e47fd5c5115b7a58dbaaa12cd +Author: Ali Abdallah +Date: Tue Oct 13 14:59:14 2015 +0200 + + Update news and version information + +commit d39fd0cf6f523796452938458ee7cdfde73a1683 +Author: Ali Abdallah +Date: Sun Oct 11 09:20:51 2015 +0200 + + Dummy commit to create user repo + +commit e6ca1b0a68b56094fc5576b6bf3915b26a721bb6 +Author: Ali Abdallah +Date: Sat Oct 10 18:50:42 2015 +0200 + + Replace the deprecated function 'gsf_msole_metadata_read' + with 'gsf_doc_meta_data_read_from_msole.' + +commit acc901b4c430bbde7d0e08c5c4df116182af2e64 +Author: Ali Abdallah +Date: Sat Oct 10 18:50:17 2015 +0200 + + Porting the specialized thumbnailer to gdbus + Getting rid of all dbus-glib api + + Tumbler is now dbus-glib free! + +commit 59984d6e3b6ac3f8108a660afb56c38b060cabbc +Author: Ali Abdallah +Date: Sat Oct 10 16:41:43 2015 +0200 + + Port the caching service to gbus. + +commit 91111b97d8b43a216c8c37ea734b789f79e48421 +Author: Ali Abdallah +Date: Sat Oct 10 13:07:56 2015 +0200 + + Port tumbler-service to gdbus. + Also get rid of some dbus low level code + in favor of their gdbus equivalents. + +commit 1f9899cad6ba2f6bae6722db605de41ba474f1b9 +Author: Ali Abdallah +Date: Thu Oct 8 20:10:32 2015 +0200 + + Start porting some code from dbus-glib. + + TumblerManager object which exports the interface + 'org.freedesktop.thumbnails.Manager1' is almost dbus-glib free now. + There is still only a dbus-glib legacy_connection used for + the TumblerSpecializedThumbnailer, which will go away one that object + is ported. + +commit 6b0983ef1bf390c33e919e2086e9be50b4ff8752 +Author: Xosé +Date: Sat Sep 19 00:31:09 2015 +0200 + + I18n: Update translation gl (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 418677862abee549a62e0bf8b4d92a2ebffb3ba4 +Author: Påvel Nicklasson +Date: Mon Jul 20 00:31:26 2015 +0200 + + I18n: Update translation sv (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4f8f81e4bf32165139e76ede3a995354e1e57bee +Author: Påvel Nicklasson +Date: Wed Jun 3 18:31:21 2015 +0200 + + I18n: Update translation sv (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e086e3c50ccd1aca526a73bd4c14850b5c2eb2ba +Author: Anonymous +Date: Thu Apr 9 00:30:57 2015 +0200 + + I18n: Update translation lt (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0d4e8305b21174a536a77c60ea5fd8f26f76295d +Author: Anonymous +Date: Wed Apr 1 18:30:29 2015 +0200 + + I18n: Update translation lt (100%). + + 44 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 717b0c50b9069e6264a55b11f95f485a7814bddc +Author: Anonymous +Date: Fri Mar 27 18:30:29 2015 +0100 + + I18n: Update translation lt (97%). + + 43 translated messages, 1 untranslated message. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4ffe34807248e6c324a7bda95696e73dc3b0dac7 +Author: Anonymous +Date: Mon Mar 16 18:30:33 2015 +0100 + + I18n: Update translation lt (88%). + + 39 translated messages, 5 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 81edf4346bdae6abd680c6e1518693a88861403e +Author: Matt Thirtytwo +Date: Thu Mar 5 20:33:08 2015 +0100 + + Removed unused static function xdg_cache_cache_get_home() (bug #11648) + commit 5ef58d3821f766cb8f77b1feb6ad29b0d44eb41a Author: Harald Judt Date: Sat Feb 28 16:42:17 2015 +0100 @@ -5004,7 +5323,7 @@ Conflicts: - tumblerd/tumbler-specialized-thumbnailer.c + tumblerd/tumbler-specialized-thumbnailer.c Signed-off-by: Jannis Pohlmann @@ -5265,8 +5584,8 @@ Conflicts: - plugins/font-thumbnailer/font-thumbnailer.c - plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c + plugins/font-thumbnailer/font-thumbnailer.c + plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c commit 5c7ce962e7dd4b2de1ce4df8acf68518fe9cc68e Author: Iñigo Varela @@ -5486,7 +5805,7 @@ Conflicts: - tumblerd/tumbler-group-scheduler.c + tumblerd/tumbler-group-scheduler.c commit f583df4a3bf353ad577723c5fce538b872fd9e47 Author: Jannis Pohlmann diff -Nru tumbler-0.1.31/compile tumbler-0.1.90/compile --- tumbler-0.1.31/compile 2015-02-28 16:28:13.000000000 +0000 +++ tumbler-0.1.90/compile 2017-05-11 09:08:36.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify diff -Nru tumbler-0.1.31/config.guess tumbler-0.1.90/config.guess --- tumbler-0.1.31/config.guess 2015-02-28 16:28:13.000000000 +0000 +++ tumbler-0.1.90/config.guess 2017-05-11 09:08:36.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2014-03-23' +timestamp='2016-10-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -168,19 +168,29 @@ # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. + # to ELF recently (or will in the future) and ABI. case "${UNAME_MACHINE_ARCH}" in + earm*) + os=netbsdelf + ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -197,6 +207,13 @@ os=netbsd ;; esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -207,13 +224,13 @@ release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -223,6 +240,10 @@ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -235,6 +256,9 @@ *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-unknown-sortix + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -251,42 +275,42 @@ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -359,16 +383,16 @@ exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build - SUN_ARCH="i386" + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -393,7 +417,7 @@ exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) echo m68k-sun-sunos${UNAME_RELEASE} @@ -579,8 +603,9 @@ else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -617,13 +642,13 @@ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi @@ -662,11 +687,11 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ ${HP_ARCH} = hppa2.0w ] then eval $set_cc_for_build @@ -679,12 +704,12 @@ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -789,14 +814,14 @@ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -878,7 +903,7 @@ exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -901,7 +926,7 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) @@ -932,6 +957,9 @@ crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -944,6 +972,9 @@ ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -969,6 +1000,9 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + mips64el:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; openrisc*:Linux:*:*) echo or1k-unknown-linux-${LIBC} exit ;; @@ -1001,6 +1035,9 @@ ppcle:Linux:*:*) echo powerpcle-unknown-linux-${LIBC} exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; @@ -1020,18 +1057,7 @@ echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - eval $set_cc_for_build - X86_64_ABI= - # If there is a compiler, see if it is configured for 32-bit objects. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_X32 >/dev/null - then - X86_64_ABI=x32 - fi - fi - echo x86_64-unknown-linux-gnu${X86_64_ABI} + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} @@ -1110,7 +1136,7 @@ # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1259,6 +1285,9 @@ SX-8R:SUPER-UX:*:*) echo sx8r-nec-superux${UNAME_RELEASE} exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1272,9 +1301,9 @@ UNAME_PROCESSOR=powerpc fi if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in @@ -1296,7 +1325,7 @@ exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi @@ -1327,7 +1356,7 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" @@ -1369,7 +1398,7 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` exit ;; i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos @@ -1380,23 +1409,25 @@ x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-unknown-esx exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs + exit ;; esac cat >&2 < in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to config-patches@gnu.org to +provide the necessary information to handle your system. config.guess timestamp = $timestamp diff -Nru tumbler-0.1.31/config.sub tumbler-0.1.90/config.sub --- tumbler-0.1.31/config.sub 2015-02-28 16:28:13.000000000 +0000 +++ tumbler-0.1.90/config.sub 2017-05-11 09:08:36.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2014-07-28' +timestamp='2016-11-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ # of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,8 +53,7 @@ me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. @@ -68,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -117,8 +116,8 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -255,12 +254,13 @@ | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ + | ba \ | be32 | be64 \ | bfin \ | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx | dvp \ - | epiphany \ - | fido | fr30 | frv \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ | i370 | i860 | i960 | ia64 \ @@ -301,10 +301,12 @@ | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -312,6 +314,7 @@ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -326,6 +329,9 @@ c6x) basic_machine=tic6x-unknown ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none @@ -371,12 +377,13 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | ba-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ + | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ @@ -422,13 +429,15 @@ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ + | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile*-* \ @@ -436,6 +445,7 @@ | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -512,6 +522,9 @@ basic_machine=i386-pc os=-aros ;; + asmjs) + basic_machine=asmjs-unknown + ;; aux) basic_machine=m68k-apple os=-aux @@ -632,6 +645,14 @@ basic_machine=m68k-bull os=-sysv3 ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + os=$os"spe" + ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -773,6 +794,9 @@ basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -814,24 +838,6 @@ basic_machine=m68k-atari os=-mint ;; - mipsEE* | ee | ps2) - basic_machine=mips64r5900el-scei - case $os in - -linux*) - ;; - *) - os=-elf - ;; - esac - ;; - iop) - basic_machine=mipsel-scei - os=-irx - ;; - dvp) - basic_machine=dvp-scei - os=-elf - ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; @@ -1026,7 +1032,7 @@ ppc-* | ppcbe-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) @@ -1036,7 +1042,7 @@ ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) @@ -1382,27 +1388,28 @@ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1534,6 +1541,8 @@ ;; -nacl*) ;; + -ios) + ;; -none) ;; *) diff -Nru tumbler-0.1.31/configure tumbler-0.1.90/configure --- tumbler-0.1.31/configure 2015-02-28 16:28:14.000000000 +0000 +++ tumbler-0.1.90/configure 2017-05-11 09:08:38.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for tumbler 0.1.31. +# Generated by GNU Autoconf 2.69 for tumbler 0.1.90. # # Report bugs to . # @@ -592,8 +592,8 @@ # Identity of this package. PACKAGE_NAME='tumbler' PACKAGE_TARNAME='tumbler' -PACKAGE_VERSION='0.1.31' -PACKAGE_STRING='tumbler 0.1.31' +PACKAGE_VERSION='0.1.90' +PACKAGE_STRING='tumbler 0.1.90' PACKAGE_BUGREPORT='http://bugzilla.xfce.org/' PACKAGE_URL='' @@ -682,19 +682,17 @@ CURL_CFLAGS GDK_PIXBUF_LIBS GDK_PIXBUF_CFLAGS -DBUS_GLIB_LIBS -DBUS_GLIB_CFLAGS -DBUS_LIBS -DBUS_CFLAGS GTHREAD_LIBS GTHREAD_CFLAGS GMODULE_LIBS GMODULE_CFLAGS +GIO_UNIX_LIBS +GIO_UNIX_CFLAGS GIO_LIBS GIO_CFLAGS GLIB_LIBS GLIB_CFLAGS -DBUS_BINDING_TOOL +GDBUS_CODEGEN GTK_DOC_USE_REBASE_FALSE GTK_DOC_USE_REBASE_TRUE GTK_DOC_USE_LIBTOOL_FALSE @@ -881,6 +879,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -950,19 +949,17 @@ PKG_CONFIG_LIBDIR GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS -DBUS_BINDING_TOOL +GDBUS_CODEGEN GLIB_CFLAGS GLIB_LIBS GIO_CFLAGS GIO_LIBS +GIO_UNIX_CFLAGS +GIO_UNIX_LIBS GMODULE_CFLAGS GMODULE_LIBS GTHREAD_CFLAGS GTHREAD_LIBS -DBUS_CFLAGS -DBUS_LIBS -DBUS_GLIB_CFLAGS -DBUS_GLIB_LIBS GDK_PIXBUF_CFLAGS GDK_PIXBUF_LIBS CURL_CFLAGS @@ -1019,6 +1016,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1271,6 +1269,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1408,7 +1415,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1521,7 +1528,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures tumbler 0.1.31 to adapt to many kinds of systems. +\`configure' configures tumbler 0.1.90 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1561,6 +1568,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1592,7 +1600,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of tumbler 0.1.31:";; + short | recursive ) echo "Configuration of tumbler 0.1.90:";; esac cat <<\_ACEOF @@ -1681,12 +1689,17 @@ C compiler flags for GTKDOC_DEPS, overriding pkg-config GTKDOC_DEPS_LIBS linker flags for GTKDOC_DEPS, overriding pkg-config - DBUS_BINDING_TOOL - Tool to generate C bindings from XML D-Bus interface definitions + GDBUS_CODEGEN + D-Bus code and documentation generator from XML D-Bus interface + definitions GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config GLIB_LIBS linker flags for GLIB, overriding pkg-config GIO_CFLAGS C compiler flags for GIO, overriding pkg-config GIO_LIBS linker flags for GIO, overriding pkg-config + GIO_UNIX_CFLAGS + C compiler flags for GIO_UNIX, overriding pkg-config + GIO_UNIX_LIBS + linker flags for GIO_UNIX, overriding pkg-config GMODULE_CFLAGS C compiler flags for GMODULE, overriding pkg-config GMODULE_LIBS @@ -1695,12 +1708,6 @@ C compiler flags for GTHREAD, overriding pkg-config GTHREAD_LIBS linker flags for GTHREAD, overriding pkg-config - DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config - DBUS_LIBS linker flags for DBUS, overriding pkg-config - DBUS_GLIB_CFLAGS - C compiler flags for DBUS_GLIB, overriding pkg-config - DBUS_GLIB_LIBS - linker flags for DBUS_GLIB, overriding pkg-config GDK_PIXBUF_CFLAGS C compiler flags for GDK_PIXBUF, overriding pkg-config GDK_PIXBUF_LIBS @@ -1798,7 +1805,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -tumbler configure 0.1.31 +tumbler configure 0.1.90 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2169,7 +2176,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by tumbler $as_me 0.1.31, which was +It was created by tumbler $as_me 0.1.90, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2661,7 +2668,7 @@ NONENONEs,x,x, && program_prefix=${target_alias}- -am__api_version='1.14' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2833,8 +2840,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2853,7 +2860,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -3147,7 +3154,7 @@ # Define the identity of the package. PACKAGE='tumbler' - VERSION='0.1.31' + VERSION='0.1.90' cat >>confdefs.h <<_ACEOF @@ -3181,8 +3188,8 @@ # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -3356,6 +3363,7 @@ fi fi + ACLOCAL_AMFLAGS="$ACLOCAL_FLAGS -I m4" ac_config_headers="$ac_config_headers config.h" @@ -3428,7 +3436,7 @@ TUMBLER_VERSION_MAJOR=0 TUMBLER_VERSION_MINOR=1 -TUMBLER_VERSION_MICRO=31 +TUMBLER_VERSION_MICRO=90 TUMBLER_VERSION_API_MAJOR=1 TUMBLER_VERSION_API=$TUMBLER_VERSION_API_MAJOR @@ -7527,7 +7535,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -10947,6 +10955,9 @@ openbsd* | bitrig*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -11201,7 +11212,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -11871,6 +11882,7 @@ if test yes = "$lt_cv_irix_exported_symbol"; then archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + link_all_deplibs=no else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -11892,7 +11904,7 @@ esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -12767,14 +12779,7 @@ *) objformat=elf ;; esac fi - # Handle Gentoo/FreeBSD as it was Linux - case $host_vendor in - gentoo) - version_type=linux ;; - *) - version_type=freebsd-$objformat ;; - esac - + version_type=freebsd-$objformat case $version_type in freebsd-elf*) library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' @@ -12786,12 +12791,6 @@ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; - linux) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - need_lib_prefix=no - need_version=no - ;; esac shlibpath_var=LD_LIBRARY_PATH case $host_os in @@ -13020,6 +13019,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -15620,16 +15631,16 @@ -# Extract the first word of "dbus-binding-tool", so it can be a program name with args. -set dummy dbus-binding-tool; ac_word=$2 +# Extract the first word of "gdbus-codegen", so it can be a program name with args. +set dummy gdbus-codegen; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_DBUS_BINDING_TOOL+:} false; then : +if ${ac_cv_path_GDBUS_CODEGEN+:} false; then : $as_echo_n "(cached) " >&6 else - case $DBUS_BINDING_TOOL in + case $GDBUS_CODEGEN in [\\/]* | ?:[\\/]*) - ac_cv_path_DBUS_BINDING_TOOL="$DBUS_BINDING_TOOL" # Let the user override the test with a path. + ac_cv_path_GDBUS_CODEGEN="$GDBUS_CODEGEN" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -15639,7 +15650,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_DBUS_BINDING_TOOL="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GDBUS_CODEGEN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -15647,23 +15658,23 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_DBUS_BINDING_TOOL" && ac_cv_path_DBUS_BINDING_TOOL="no" + test -z "$ac_cv_path_GDBUS_CODEGEN" && ac_cv_path_GDBUS_CODEGEN="no" ;; esac fi -DBUS_BINDING_TOOL=$ac_cv_path_DBUS_BINDING_TOOL -if test -n "$DBUS_BINDING_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_BINDING_TOOL" >&5 -$as_echo "$DBUS_BINDING_TOOL" >&6; } +GDBUS_CODEGEN=$ac_cv_path_GDBUS_CODEGEN +if test -n "$GDBUS_CODEGEN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDBUS_CODEGEN" >&5 +$as_echo "$GDBUS_CODEGEN" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -if test x"$DBUS_BINDING_TOOL" = x"no"; then - as_fn_error $? "could not find dbus-binding-tool in \$PATH. You can run - ./configure DBUS_BINDING_TOOL=/path/to/dbus-binding-tool to define +if test x"$GDBUS_CODEGEN" = x"no"; then + as_fn_error $? "could not find gdbus-codegen in \$PATH. You can run + ./configure GDBUS_CODEGEN=/path/to/gdbus-codegen to define a custom location for it." "$LINENO" 5 fi @@ -15676,12 +15687,12 @@ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.26.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.26.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.16.0" 2>/dev/null` + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.26.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -15693,12 +15704,12 @@ pkg_cv_GLIB_LIBS="$GLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.26.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.26.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.16.0" 2>/dev/null` + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.26.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -15719,14 +15730,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.16.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.26.0" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.16.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.26.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0 >= 2.16.0) were not met: + as_fn_error $? "Package requirements (glib-2.0 >= 2.26.0) were not met: $GLIB_PKG_ERRORS @@ -15767,12 +15778,12 @@ pkg_cv_GIO_CFLAGS="$GIO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.16.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.16.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.26.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.26.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.16.0" 2>/dev/null` + pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.26.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -15784,12 +15795,12 @@ pkg_cv_GIO_LIBS="$GIO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.16.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.16.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.26.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.26.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.16.0" 2>/dev/null` + pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.26.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -15810,14 +15821,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= 2.16.0" 2>&1` + GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= 2.26.0" 2>&1` else - GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= 2.16.0" 2>&1` + GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= 2.26.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GIO_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gio-2.0 >= 2.16.0) were not met: + as_fn_error $? "Package requirements (gio-2.0 >= 2.26.0) were not met: $GIO_PKG_ERRORS @@ -15851,110 +15862,19 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5 -$as_echo_n "checking for GMODULE... " >&6; } - -if test -n "$GMODULE_CFLAGS"; then - pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.10.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.10.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0 >= 2.10.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$GMODULE_LIBS"; then - pkg_cv_GMODULE_LIBS="$GMODULE_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.10.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.10.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 >= 2.10.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0 >= 2.10.0" 2>&1` - else - GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0 >= 2.10.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GMODULE_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (gmodule-2.0 >= 2.10.0) were not met: - -$GMODULE_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GMODULE_CFLAGS -and GMODULE_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GMODULE_CFLAGS -and GMODULE_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } -else - GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS - GMODULE_LIBS=$pkg_cv_GMODULE_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTHREAD" >&5 -$as_echo_n "checking for GTHREAD... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO_UNIX" >&5 +$as_echo_n "checking for GIO_UNIX... " >&6; } -if test -n "$GTHREAD_CFLAGS"; then - pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS" +if test -n "$GIO_UNIX_CFLAGS"; then + pkg_cv_GIO_UNIX_CFLAGS="$GIO_UNIX_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.16.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.16.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.26.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.26.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 >= 2.16.0" 2>/dev/null` + pkg_cv_GIO_UNIX_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.26.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -15962,16 +15882,16 @@ else pkg_failed=untried fi -if test -n "$GTHREAD_LIBS"; then - pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS" +if test -n "$GIO_UNIX_LIBS"; then + pkg_cv_GIO_UNIX_LIBS="$GIO_UNIX_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.16.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.16.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.26.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.26.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0 >= 2.16.0" 2>/dev/null` + pkg_cv_GIO_UNIX_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.26.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -15992,22 +15912,22 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gthread-2.0 >= 2.16.0" 2>&1` + GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0 >= 2.26.0" 2>&1` else - GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gthread-2.0 >= 2.16.0" 2>&1` + GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0 >= 2.26.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$GTHREAD_PKG_ERRORS" >&5 + echo "$GIO_UNIX_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gthread-2.0 >= 2.16.0) were not met: + as_fn_error $? "Package requirements (gio-unix-2.0 >= 2.26.0) were not met: -$GTHREAD_PKG_ERRORS +$GIO_UNIX_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables GTHREAD_CFLAGS -and GTHREAD_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables GIO_UNIX_CFLAGS +and GIO_UNIX_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -16018,34 +15938,34 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables GTHREAD_CFLAGS -and GTHREAD_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables GIO_UNIX_CFLAGS +and GIO_UNIX_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS - GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS + GIO_UNIX_CFLAGS=$pkg_cv_GIO_UNIX_CFLAGS + GIO_UNIX_LIBS=$pkg_cv_GIO_UNIX_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 -$as_echo_n "checking for DBUS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5 +$as_echo_n "checking for GMODULE... " >&6; } -if test -n "$DBUS_CFLAGS"; then - pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" +if test -n "$GMODULE_CFLAGS"; then + pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.0.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.26.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.26.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.0.0" 2>/dev/null` + pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0 >= 2.26.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -16053,16 +15973,16 @@ else pkg_failed=untried fi -if test -n "$DBUS_LIBS"; then - pkg_cv_DBUS_LIBS="$DBUS_LIBS" +if test -n "$GMODULE_LIBS"; then + pkg_cv_GMODULE_LIBS="$GMODULE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.0.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.26.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.26.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.0.0" 2>/dev/null` + pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 >= 2.26.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -16083,22 +16003,22 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 1.0.0" 2>&1` + GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0 >= 2.26.0" 2>&1` else - DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 1.0.0" 2>&1` + GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0 >= 2.26.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$DBUS_PKG_ERRORS" >&5 + echo "$GMODULE_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (dbus-1 >= 1.0.0) were not met: + as_fn_error $? "Package requirements (gmodule-2.0 >= 2.26.0) were not met: -$DBUS_PKG_ERRORS +$GMODULE_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables DBUS_CFLAGS -and DBUS_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables GMODULE_CFLAGS +and GMODULE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -16109,34 +16029,34 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables DBUS_CFLAGS -and DBUS_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables GMODULE_CFLAGS +and GMODULE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS - DBUS_LIBS=$pkg_cv_DBUS_LIBS + GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS + GMODULE_LIBS=$pkg_cv_GMODULE_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS_GLIB" >&5 -$as_echo_n "checking for DBUS_GLIB... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTHREAD" >&5 +$as_echo_n "checking for GTHREAD... " >&6; } -if test -n "$DBUS_GLIB_CFLAGS"; then - pkg_cv_DBUS_GLIB_CFLAGS="$DBUS_GLIB_CFLAGS" +if test -n "$GTHREAD_CFLAGS"; then + pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.72\""; } >&5 - ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.72") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.26.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.26.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.72" 2>/dev/null` + pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 >= 2.26.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -16144,16 +16064,16 @@ else pkg_failed=untried fi -if test -n "$DBUS_GLIB_LIBS"; then - pkg_cv_DBUS_GLIB_LIBS="$DBUS_GLIB_LIBS" +if test -n "$GTHREAD_LIBS"; then + pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.72\""; } >&5 - ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.72") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.26.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.26.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_DBUS_GLIB_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.72" 2>/dev/null` + pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0 >= 2.26.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -16174,22 +16094,22 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-glib-1 >= 0.72" 2>&1` + GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gthread-2.0 >= 2.26.0" 2>&1` else - DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-glib-1 >= 0.72" 2>&1` + GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gthread-2.0 >= 2.26.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$DBUS_GLIB_PKG_ERRORS" >&5 + echo "$GTHREAD_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (dbus-glib-1 >= 0.72) were not met: + as_fn_error $? "Package requirements (gthread-2.0 >= 2.26.0) were not met: -$DBUS_GLIB_PKG_ERRORS +$GTHREAD_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS -and DBUS_GLIB_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables GTHREAD_CFLAGS +and GTHREAD_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -16200,15 +16120,15 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS -and DBUS_GLIB_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables GTHREAD_CFLAGS +and GTHREAD_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - DBUS_GLIB_CFLAGS=$pkg_cv_DBUS_GLIB_CFLAGS - DBUS_GLIB_LIBS=$pkg_cv_DBUS_GLIB_LIBS + GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS + GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -18800,7 +18720,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by tumbler $as_me 0.1.31, which was +This file was extended by tumbler $as_me 0.1.90, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18866,7 +18786,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -tumbler config.status 0.1.31 +tumbler config.status 0.1.90 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -20008,7 +19928,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. diff -Nru tumbler-0.1.31/configure.ac tumbler-0.1.90/configure.ac --- tumbler-0.1.31/configure.ac 2015-02-28 15:27:02.000000000 +0000 +++ tumbler-0.1.90/configure.ac 2017-05-11 09:06:12.000000000 +0000 @@ -25,7 +25,7 @@ m4_define([tumbler_version_api_major], [1]) m4_define([tumbler_version_major], [0]) m4_define([tumbler_version_minor], [1]) -m4_define([tumbler_version_micro], [31]) +m4_define([tumbler_version_micro], [90]) m4_define([tumbler_version], [tumbler_version_major().tumbler_version_minor().tumbler_version_micro()]) dnl *************************** @@ -129,25 +129,24 @@ GTK_DOC_CHECK(1.9) dnl *********************************** -dnl *** Check for dbus-binding-tool *** +dnl *** Check for gdbus-codegen *** dnl *********************************** -AC_ARG_VAR([DBUS_BINDING_TOOL], [Tool to generate C bindings from XML D-Bus interface definitions]) -AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no]) -if test x"$DBUS_BINDING_TOOL" = x"no"; then - AC_MSG_ERROR([could not find dbus-binding-tool in \$PATH. You can run - ./configure DBUS_BINDING_TOOL=/path/to/dbus-binding-tool to define +AC_ARG_VAR([GDBUS_CODEGEN], [D-Bus code and documentation generator from XML D-Bus interface definitions]) +AC_PATH_PROG([GDBUS_CODEGEN], [gdbus-codegen], [no]) +if test x"$GDBUS_CODEGEN" = x"no"; then + AC_MSG_ERROR([could not find gdbus-codegen in \$PATH. You can run + ./configure GDBUS_CODEGEN=/path/to/gdbus-codegen to define a custom location for it.]) fi dnl *********************************** dnl *** Check for required packages *** dnl *********************************** -PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16.0]) -PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.16.0]) -PKG_CHECK_MODULES([GMODULE], [gmodule-2.0 >= 2.10.0]) -PKG_CHECK_MODULES([GTHREAD], [gthread-2.0 >= 2.16.0]) -PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.0.0]) -PKG_CHECK_MODULES([DBUS_GLIB], [dbus-glib-1 >= 0.72]) +PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.26.0]) +PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.26.0]) +PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0 >= 2.26.0]) +PKG_CHECK_MODULES([GMODULE], [gmodule-2.0 >= 2.26.0]) +PKG_CHECK_MODULES([GTHREAD], [gthread-2.0 >= 2.26.0]) dnl ************************* dnl *** Check for plugins *** diff -Nru tumbler-0.1.31/debian/changelog tumbler-0.1.90/debian/changelog --- tumbler-0.1.31/debian/changelog 2016-04-23 07:27:04.000000000 +0000 +++ tumbler-0.1.90/debian/changelog 2017-05-16 07:39:01.000000000 +0000 @@ -1,3 +1,10 @@ +tumbler (0.1.90-0ubuntu1) devel; urgency=medium + + * New git snapshot. + * d/control: Drop build-dep on libdbus-glib-1-dev, we use gdbus now. + + -- Unit 193 Tue, 16 May 2017 03:39:01 -0400 + tumbler (0.1.31-2build4) yakkety; urgency=medium * No-change rebuild for libpng soname change. diff -Nru tumbler-0.1.31/debian/control tumbler-0.1.90/debian/control --- tumbler-0.1.31/debian/control 2015-08-11 21:01:19.000000000 +0000 +++ tumbler-0.1.90/debian/control 2017-05-16 07:38:11.000000000 +0000 @@ -6,10 +6,10 @@ Uploaders: Yves-Alexis Perez , Lionel Le Folgoc Build-Depends: debhelper (>= 9), intltool (>= 0.31), pkg-config, - libglib2.0-dev, libgtk2.0-dev, libdbus-glib-1-dev, libpoppler-glib-dev, - libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, libjpeg-dev, - libgsf-1-dev, libopenrawgnome-dev, libffmpegthumbnailer-dev, - libcurl4-gnutls-dev, dpkg-dev (>= 1.16.1) + libglib2.0-dev, libgtk2.0-dev, libpoppler-glib-dev, libgstreamer1.0-dev, + libgstreamer-plugins-base1.0-dev, libjpeg-dev, libgsf-1-dev, + libopenrawgnome-dev, libffmpegthumbnailer-dev, libcurl4-gnutls-dev, + dpkg-dev (>= 1.16.1) Standards-Version: 3.9.6 Homepage: http://www.xfce.org/ Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/tumbler diff -Nru tumbler-0.1.31/depcomp tumbler-0.1.90/depcomp --- tumbler-0.1.31/depcomp 2015-02-28 16:28:14.000000000 +0000 +++ tumbler-0.1.90/depcomp 2017-05-11 09:08:37.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru tumbler-0.1.31/docs/Makefile.in tumbler-0.1.90/docs/Makefile.in --- tumbler-0.1.31/docs/Makefile.in 2015-02-28 16:28:13.000000000 +0000 +++ tumbler-0.1.90/docs/Makefile.in 2017-05-11 09:08:36.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -33,7 +33,17 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -98,12 +108,12 @@ host_triplet = @host@ target_triplet = @target@ subdir = docs -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -163,6 +173,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -213,11 +224,6 @@ CURL_LIBS = @CURL_LIBS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -234,11 +240,14 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ +GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ +GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ @@ -384,6 +393,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -414,7 +424,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu docs/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -709,6 +718,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru tumbler-0.1.31/docs/reference/Makefile.in tumbler-0.1.90/docs/reference/Makefile.in --- tumbler-0.1.31/docs/reference/Makefile.in 2015-02-28 16:28:13.000000000 +0000 +++ tumbler-0.1.90/docs/reference/Makefile.in 2017-05-11 09:08:36.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -33,7 +33,17 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -98,12 +108,12 @@ host_triplet = @host@ target_triplet = @target@ subdir = docs/reference -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -163,6 +173,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -213,11 +224,6 @@ CURL_LIBS = @CURL_LIBS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -234,11 +240,14 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ +GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ +GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ @@ -384,6 +393,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -414,7 +424,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu docs/reference/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -709,6 +718,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/api-index-full.html tumbler-0.1.90/docs/reference/tumbler/html/api-index-full.html --- tumbler-0.1.31/docs/reference/tumbler/html/api-index-full.html 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/api-index-full.html 2017-05-11 09:08:55.000000000 +0000 @@ -2,12 +2,12 @@ -tumbler Reference Manual: API Index - +API Index: tumbler Reference Manual + - + @@ -90,11 +90,11 @@
-tumbler_check_version, function in Version Information and Compatibility Checks +TUMBLER_CHECK_VERSION, macro in Version Information and Compatibility Checks
-TUMBLER_CHECK_VERSION, macro in Version Information and Compatibility Checks +tumbler_check_version, function in Version Information and Compatibility Checks

E

@@ -187,11 +187,11 @@

M

-tumbler_major_version, variable in Version Information and Compatibility Checks +TUMBLER_MAJOR_VERSION, macro in Version Information and Compatibility Checks
-TUMBLER_MAJOR_VERSION, macro in Version Information and Compatibility Checks +tumbler_major_version, variable in Version Information and Compatibility Checks
@@ -219,19 +219,19 @@
-tumbler_micro_version, variable in Version Information and Compatibility Checks +TUMBLER_MICRO_VERSION, macro in Version Information and Compatibility Checks
-TUMBLER_MICRO_VERSION, macro in Version Information and Compatibility Checks +tumbler_micro_version, variable in Version Information and Compatibility Checks
-tumbler_minor_version, variable in Version Information and Compatibility Checks +TUMBLER_MINOR_VERSION, macro in Version Information and Compatibility Checks
-TUMBLER_MINOR_VERSION, macro in Version Information and Compatibility Checks +tumbler_minor_version, variable in Version Information and Compatibility Checks

P

@@ -407,7 +407,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/extension-api.html tumbler-0.1.90/docs/reference/tumbler/html/extension-api.html --- tumbler-0.1.31/docs/reference/tumbler/html/extension-api.html 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/extension-api.html 2017-05-11 09:08:55.000000000 +0000 @@ -2,13 +2,13 @@ -tumbler Reference Manual: Part IV. Extension API - +Part IV. Extension API: tumbler Reference Manual + - + @@ -41,7 +41,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/extension-tutorial.html tumbler-0.1.90/docs/reference/tumbler/html/extension-tutorial.html --- tumbler-0.1.31/docs/reference/tumbler/html/extension-tutorial.html 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/extension-tutorial.html 2017-05-11 09:08:55.000000000 +0000 @@ -2,13 +2,13 @@ -tumbler Reference Manual: Part V. Tutorial: Extending Tumbler - +Part V. Tutorial: Extending Tumbler: tumbler Reference Manual + - + @@ -22,7 +22,6 @@

Part V. Tutorial: Extending Tumbler

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.25 \ No newline at end of file Binary files /tmp/tmpOFF7nH/d_b5LgPZzE/tumbler-0.1.31/docs/reference/tumbler/html/home.png and /tmp/tmpOFF7nH/GOC4JPRFvy/tumbler-0.1.90/docs/reference/tumbler/html/home.png differ diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/index.html tumbler-0.1.90/docs/reference/tumbler/html/index.html --- tumbler-0.1.31/docs/reference/tumbler/html/index.html 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/index.html 2017-05-11 09:08:55.000000000 +0000 @@ -3,10 +3,10 @@ tumbler Reference Manual: tumbler Reference Manual - + - + @@ -20,7 +20,7 @@

-

Version 0.1.31 +

Version 0.1.90

Copyright © 2009 Jannis Pohlmann

@@ -82,7 +82,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.25
\ No newline at end of file diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/index.sgml tumbler-0.1.90/docs/reference/tumbler/html/index.sgml --- tumbler-0.1.31/docs/reference/tumbler/html/index.sgml 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/index.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Binary files /tmp/tmpOFF7nH/d_b5LgPZzE/tumbler-0.1.31/docs/reference/tumbler/html/left-insensitive.png and /tmp/tmpOFF7nH/GOC4JPRFvy/tumbler-0.1.90/docs/reference/tumbler/html/left-insensitive.png differ Binary files /tmp/tmpOFF7nH/d_b5LgPZzE/tumbler-0.1.31/docs/reference/tumbler/html/left.png and /tmp/tmpOFF7nH/GOC4JPRFvy/tumbler-0.1.90/docs/reference/tumbler/html/left.png differ diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/miscellaneous.html tumbler-0.1.90/docs/reference/tumbler/html/miscellaneous.html --- tumbler-0.1.31/docs/reference/tumbler/html/miscellaneous.html 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/miscellaneous.html 2017-05-11 09:08:55.000000000 +0000 @@ -2,13 +2,13 @@ -tumbler Reference Manual: Part II. Miscellaneous - +Part II. Miscellaneous: tumbler Reference Manual + - + @@ -38,7 +38,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/object-tree.html tumbler-0.1.90/docs/reference/tumbler/html/object-tree.html --- tumbler-0.1.31/docs/reference/tumbler/html/object-tree.html 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/object-tree.html 2017-05-11 09:08:55.000000000 +0000 @@ -2,13 +2,13 @@ -tumbler Reference Manual: Part VI. Object Hierarchy - +Part VI. Object Hierarchy: tumbler Reference Manual + - + @@ -23,8 +23,8 @@

Part VI. Object Hierarchy

-    GObject
-    ├── GTypeModule
+    GObject
+    ├── GTypeModule
     │   ╰── TumblerProviderPlugin
     ├── TumblerProviderFactory
     ├── TumblerFileInfo
@@ -40,7 +40,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/pt01.html tumbler-0.1.90/docs/reference/tumbler/html/pt01.html --- tumbler-0.1.31/docs/reference/tumbler/html/pt01.html 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/pt01.html 2017-05-11 09:08:55.000000000 +0000 @@ -2,13 +2,13 @@ -tumbler Reference Manual: Part I. Overview - +Part I. Overview: tumbler Reference Manual + - + @@ -57,7 +57,6 @@

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.25 \ No newline at end of file Binary files /tmp/tmpOFF7nH/d_b5LgPZzE/tumbler-0.1.31/docs/reference/tumbler/html/right-insensitive.png and /tmp/tmpOFF7nH/GOC4JPRFvy/tumbler-0.1.90/docs/reference/tumbler/html/right-insensitive.png differ Binary files /tmp/tmpOFF7nH/d_b5LgPZzE/tumbler-0.1.31/docs/reference/tumbler/html/right.png and /tmp/tmpOFF7nH/GOC4JPRFvy/tumbler-0.1.90/docs/reference/tumbler/html/right.png differ diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/style.css tumbler-0.1.90/docs/reference/tumbler/html/style.css --- tumbler-0.1.31/docs/reference/tumbler/html/style.css 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/style.css 2017-05-11 09:08:54.000000000 +0000 @@ -60,7 +60,7 @@ div.informaltable table { border-collapse: separate; - border-spacing: 1em 0.5em; + border-spacing: 1em 0.3em; border: none; } @@ -148,6 +148,8 @@ h4 { color: #555753; + margin-top: 1em; + margin-bottom: 1em; } hr @@ -166,17 +168,16 @@ padding-bottom: 0.25em; } -dl.toc > dd > dl > dt +dl.toc > dt { padding-top: 0.25em; padding-bottom: 0.25em; + font-weight: bold; } -dl.toc > dt +dl.toc > dl { - padding-top: 1em; padding-bottom: 0.5em; - font-weight: bold; } .parameter @@ -346,7 +347,9 @@ } @media screen { - sup a.footnote + /* these have a as a first child, but since there are no parent selectors + * we can't use that. */ + a.footnote { position: relative; top: 0em ! important; diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/thumbnails.html tumbler-0.1.90/docs/reference/tumbler/html/thumbnails.html --- tumbler-0.1.31/docs/reference/tumbler/html/thumbnails.html 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/thumbnails.html 2017-05-11 09:08:55.000000000 +0000 @@ -2,13 +2,13 @@ -tumbler Reference Manual: Part III. Querying and Generating Thumbnails - +Part III. Querying and Generating Thumbnails: tumbler Reference Manual + - + @@ -38,7 +38,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/TumblerAbstractThumbnailer.html tumbler-0.1.90/docs/reference/tumbler/html/TumblerAbstractThumbnailer.html --- tumbler-0.1.31/docs/reference/tumbler/html/TumblerAbstractThumbnailer.html 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/TumblerAbstractThumbnailer.html 2017-05-11 09:08:55.000000000 +0000 @@ -2,13 +2,13 @@ -tumbler Reference Manual: TumblerAbstractThumbnailer - +TumblerAbstractThumbnailer: tumbler Reference Manual + - + @@ -34,24 +34,22 @@

Object Hierarchy

-
    GObject
+
    GObject
     ╰── TumblerAbstractThumbnailer

Description

-

-

Functions

+

Types and Values

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/TumblerCache.html tumbler-0.1.90/docs/reference/tumbler/html/TumblerCache.html --- tumbler-0.1.31/docs/reference/tumbler/html/TumblerCache.html 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/TumblerCache.html 2017-05-11 09:08:55.000000000 +0000 @@ -2,13 +2,13 @@ -tumbler Reference Manual: TumblerCache - +TumblerCache: tumbler Reference Manual + - + @@ -34,7 +34,7 @@

Functions

-
+
@@ -90,7 +90,7 @@
-gboolean +gboolean tumbler_cache_is_thumbnail () @@ -98,7 +98,7 @@
-GList * +GList * tumbler_cache_get_flavors () @@ -123,8 +123,6 @@

Description

-

-

Functions

@@ -132,103 +130,65 @@

tumbler_cache_get_default ()

TumblerCache *
 tumbler_cache_get_default (void);
-

-

-
-

Returns

-

-

tumbler_cache_get_thumbnail ()

TumblerThumbnail *
 tumbler_cache_get_thumbnail (TumblerCache *cache,
-                             const gchar *uri,
+                             const gchar *uri,
                              TumblerThumbnailFlavor *flavor);
-

-

-
-

Returns

-

-

tumbler_cache_cleanup ()

void
 tumbler_cache_cleanup (TumblerCache *cache,
-                       const gchar *const *base_uris,
-                       guint64 since);
-

-

+ const gchar *const *base_uris, + guint64 since);

tumbler_cache_delete ()

void
 tumbler_cache_delete (TumblerCache *cache,
-                      const gchar *const *uris);
-

-

+ const gchar *const *uris);

tumbler_cache_copy ()

void
 tumbler_cache_copy (TumblerCache *cache,
-                    const gchar *const *from_uris,
-                    const gchar *const *to_uris);
-

-

+ const gchar *const *from_uris, + const gchar *const *to_uris);

tumbler_cache_move ()

void
 tumbler_cache_move (TumblerCache *cache,
-                    const gchar *const *from_uris,
-                    const gchar *const *to_uris);
-

-

+ const gchar *const *from_uris, + const gchar *const *to_uris);

tumbler_cache_is_thumbnail ()

-
gboolean
+
gboolean
 tumbler_cache_is_thumbnail (TumblerCache *cache,
-                            const gchar *uri);

-

-

-

-
Returns

-

-

+                            const gchar *uri);

tumbler_cache_get_flavors ()

-
GList *
+
GList *
 tumbler_cache_get_flavors (TumblerCache *cache);

-

-

-

-
Returns

-

-

tumbler_cache_get_flavor ()

TumblerThumbnailFlavor *
 tumbler_cache_get_flavor (TumblerCache *cache,
-                          const gchar *name);
-

-

-
-

Returns

-

-
+ const gchar *name);
@@ -236,7 +196,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/tumbler.devhelp2 tumbler-0.1.90/docs/reference/tumbler/html/tumbler.devhelp2 --- tumbler-0.1.31/docs/reference/tumbler/html/tumbler.devhelp2 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/tumbler.devhelp2 2017-05-11 09:08:54.000000000 +0000 @@ -1,5 +1,4 @@ - @@ -24,8 +23,8 @@ - + @@ -74,5 +73,13 @@ + + + + + + + + diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/tumbler-Error-Domain-and-Types.html tumbler-0.1.90/docs/reference/tumbler/html/tumbler-Error-Domain-and-Types.html --- tumbler-0.1.31/docs/reference/tumbler/html/tumbler-Error-Domain-and-Types.html 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/tumbler-Error-Domain-and-Types.html 2017-05-11 09:08:55.000000000 +0000 @@ -2,13 +2,13 @@ -tumbler Reference Manual: Error Domain and Types - +Error Domain and Types: tumbler Reference Manual + - + @@ -32,21 +32,8 @@
-

Functions

-
---- - - - - -
#defineTUMBLER_ERROR
-
-

Types and Values

-
+
@@ -57,6 +44,10 @@ + + + + @@ -73,13 +64,7 @@

Functions

-
-

TUMBLER_ERROR

-
#define TUMBLER_ERROR        (g_quark_from_static_string (TUMBLER_ERROR_DOMAIN))
-
-

-

-
+

Types and Values

@@ -87,17 +72,19 @@

TUMBLER_ERROR_DOMAIN

#define TUMBLER_ERROR_DOMAIN "Tumbler"
-

-

+
+
+
+

TUMBLER_ERROR

+
#define TUMBLER_ERROR        (g_quark_from_static_string (TUMBLER_ERROR_DOMAIN))
+

enum TumblerErrorEnum

-

-

-

Members

-
TUMBLER_ERROR_DOMAIN
#defineTUMBLER_ERROR
enum TumblerErrorEnum
+

Members

+
@@ -106,43 +93,43 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +

TUMBLER_ERROR_UNSUPPORTED

    

TUMBLER_ERROR_CONNECTION_ERROR

    

TUMBLER_ERROR_INVALID_FORMAT

    

TUMBLER_ERROR_IS_THUMBNAIL

    

TUMBLER_ERROR_SAVE_FAILED

    

TUMBLER_ERROR_UNSUPPORTED_FLAVOR

    

TUMBLER_ERROR_NO_CONTENT

    

TUMBLER_ERROR_SHUTTING_DOWN

    
@@ -151,7 +138,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/TumblerThumbnailerProvider.html tumbler-0.1.90/docs/reference/tumbler/html/TumblerThumbnailerProvider.html --- tumbler-0.1.31/docs/reference/tumbler/html/TumblerThumbnailerProvider.html 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/TumblerThumbnailerProvider.html 2017-05-11 09:08:55.000000000 +0000 @@ -2,13 +2,13 @@ -tumbler Reference Manual: TumblerThumbnailerProvider - +TumblerThumbnailerProvider: tumbler Reference Manual + - + @@ -34,14 +34,14 @@

Functions

-
+
-GList * +GList * tumbler_thumbnailer_provider_get_thumbnailers () @@ -57,22 +57,14 @@

Description

-

-

Functions

tumbler_thumbnailer_provider_get_thumbnailers ()

-
GList *
+
GList *
 tumbler_thumbnailer_provider_get_thumbnailers
                                (TumblerThumbnailerProvider *provider);

-

-

-

-
Returns

-

-
@@ -80,7 +72,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/TumblerThumbnail.html tumbler-0.1.90/docs/reference/tumbler/html/TumblerThumbnail.html --- tumbler-0.1.31/docs/reference/tumbler/html/TumblerThumbnail.html 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/TumblerThumbnail.html 2017-05-11 09:08:55.000000000 +0000 @@ -2,13 +2,13 @@ -tumbler Reference Manual: TumblerThumbnail - +TumblerThumbnail: tumbler Reference Manual + - + @@ -35,7 +35,7 @@

Functions

-
+
@@ -43,7 +43,7 @@
-gboolean +gboolean tumbler_thumbnail_load () @@ -51,7 +51,7 @@
-gboolean +gboolean tumbler_thumbnail_needs_update () @@ -59,7 +59,7 @@
-gboolean +gboolean tumbler_thumbnail_save_image_data () @@ -67,7 +67,7 @@
-gboolean +gboolean tumbler_thumbnail_save_file () @@ -86,7 +86,7 @@

Properties

-
+
@@ -107,7 +107,7 @@ +gchar * @@ -116,7 +116,7 @@

Types and Values

-
-gchar * uri Read / Write / Construct Only
+
@@ -135,81 +135,49 @@

Description

-

-

Functions

tumbler_thumbnail_load ()

-
gboolean
+
gboolean
 tumbler_thumbnail_load (TumblerThumbnail *thumbnail,
-                        GCancellable *cancellable,
-                        GError **error);

-

-

-

-
Returns

-

-

+                        GCancellable *cancellable,
+                        GError **error);

tumbler_thumbnail_needs_update ()

-
gboolean
+
gboolean
 tumbler_thumbnail_needs_update (TumblerThumbnail *thumbnail,
-                                const gchar *uri,
-                                guint64 mtime);

-

-

-

-
Returns

-

-

+                                const gchar *uri,
+                                guint64 mtime);

tumbler_thumbnail_save_image_data ()

-
gboolean
+
gboolean
 tumbler_thumbnail_save_image_data (TumblerThumbnail *thumbnail,
                                    TumblerImageData *data,
-                                   guint64 mtime,
-                                   GCancellable *cancellable,
-                                   GError **error);

-

-

-

-
Returns

-

-

+                                   guint64 mtime,
+                                   GCancellable *cancellable,
+                                   GError **error);

tumbler_thumbnail_save_file ()

-
gboolean
+
gboolean
 tumbler_thumbnail_save_file (TumblerThumbnail *thumbnail,
-                             GFile *file,
-                             guint64 mtime,
-                             GCancellable *cancellable,
-                             GError **error);

-

-

-

-
Returns

-

-

+                             GFile *file,
+                             guint64 mtime,
+                             GCancellable *cancellable,
+                             GError **error);

tumbler_thumbnail_get_flavor ()

TumblerThumbnailFlavor *
 tumbler_thumbnail_get_flavor (TumblerThumbnail *thumbnail);
-

-

-
-

Returns

-

-
@@ -226,8 +194,6 @@ gint rowstride; }; -

-

@@ -248,7 +214,7 @@

The “uri” property

-
  “uri”                      gchar *
+
  “uri”                      gchar *

uri.

Flags: Read / Write / Construct Only

Default value: NULL

@@ -256,7 +222,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/tumbler-tumbler-file-info.html tumbler-0.1.90/docs/reference/tumbler/html/tumbler-tumbler-file-info.html --- tumbler-0.1.31/docs/reference/tumbler/html/tumbler-tumbler-file-info.html 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/tumbler-tumbler-file-info.html 2017-05-11 09:08:55.000000000 +0000 @@ -2,13 +2,13 @@ -tumbler Reference Manual: tumbler-file-info - +tumbler-file-info: tumbler Reference Manual + - + @@ -35,7 +35,7 @@

Functions

-
+
@@ -51,21 +51,21 @@ - -
-gboolean +gboolean tumbler_file_info_load ()
const gchar * +const gchar * tumbler_file_info_get_uri ()
const gchar * +const gchar * tumbler_file_info_get_mime_type () @@ -73,7 +73,7 @@
-guint64 +guint64 tumbler_file_info_get_mtime () @@ -81,7 +81,7 @@
-gboolean +gboolean tumbler_file_info_needs_update () @@ -124,7 +124,7 @@

Properties

-
+
@@ -139,18 +139,18 @@ +gchar * - + +gchar * @@ -159,140 +159,82 @@

Object Hierarchy

-
    GObject
+
    GObject
     ╰── TumblerFileInfo

Description

-

-

Functions

tumbler_file_info_new ()

TumblerFileInfo *
-tumbler_file_info_new (const gchar *uri,
-                       const gchar *mime_type,
+tumbler_file_info_new (const gchar *uri,
+                       const gchar *mime_type,
                        TumblerThumbnailFlavor *flavor);
-

-

-
-

Returns

-

-

tumbler_file_info_load ()

-
gboolean
+
gboolean
 tumbler_file_info_load (TumblerFileInfo *info,
-                        GCancellable *cancellable,
-                        GError **error);

-

-

-

-
Returns

-

-

+                        GCancellable *cancellable,
+                        GError **error);

tumbler_file_info_get_uri ()

-
const gchar *
+
const gchar *
 tumbler_file_info_get_uri (TumblerFileInfo *info);

-

-

-

-
Returns

-

-

tumbler_file_info_get_mime_type ()

-
const gchar *
+
const gchar *
 tumbler_file_info_get_mime_type (TumblerFileInfo *info);

-

-

-

-
Returns

-

-

tumbler_file_info_get_mtime ()

-
guint64
+
guint64
 tumbler_file_info_get_mtime (TumblerFileInfo *info);

-

-

-

-
Returns

-

-

tumbler_file_info_needs_update ()

-
gboolean
+
gboolean
 tumbler_file_info_needs_update (TumblerFileInfo *info);

-

-

-

-
Returns

-

-

tumbler_file_info_get_thumbnail ()

TumblerThumbnail *
 tumbler_file_info_get_thumbnail (TumblerFileInfo *info);
-

-

-
-

Returns

-

-

tumbler_file_info_array_new_with_flavor ()

TumblerFileInfo **
 tumbler_file_info_array_new_with_flavor
-                               (const gchar *const *uris,
-                                const gchar *const *mime_types,
+                               (const gchar *const *uris,
+                                const gchar *const *mime_types,
                                 TumblerThumbnailFlavor *flavor,
-                                guint *length);
-

-

-
-

Returns

-

-
+ guint *length);

tumbler_file_info_array_copy ()

TumblerFileInfo **
 tumbler_file_info_array_copy (TumblerFileInfo **infos,
-                              guint length);
-

-

-
-

Returns

-

-
+ guint length);

tumbler_file_info_array_free ()

void
 tumbler_file_info_array_free (TumblerFileInfo **infos);
-

-

@@ -309,7 +251,7 @@

The “mime-type” property

-
  “mime-type”                gchar *
+
  “mime-type”                gchar *

mime-type.

Flags: Read / Write / Construct Only

Default value: NULL

@@ -317,7 +259,7 @@

The “mtime” property

-
  “mtime”                    guint64
+
  “mtime”                    guint64

mtime.

Flags: Read

Default value: 0

@@ -325,7 +267,7 @@

The “uri” property

-
  “uri”                      gchar *
+
  “uri”                      gchar *

uri.

Flags: Read / Write / Construct Only

Default value: NULL

@@ -333,7 +275,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.25
\ No newline at end of file diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/tumbler-tumbler-provider-factory.html tumbler-0.1.90/docs/reference/tumbler/html/tumbler-tumbler-provider-factory.html --- tumbler-0.1.31/docs/reference/tumbler/html/tumbler-tumbler-provider-factory.html 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/tumbler-tumbler-provider-factory.html 2017-05-11 09:08:55.000000000 +0000 @@ -2,13 +2,13 @@ -tumbler Reference Manual: tumbler-provider-factory - +tumbler-provider-factory: tumbler Reference Manual + - + @@ -34,7 +34,7 @@
-gchar * mime-type Read / Write / Construct Only
guint64guint64 mtime Read
-gchar * uri Read / Write / Construct Only

Functions

-
+
@@ -50,7 +50,7 @@
-GList * +GList * tumbler_provider_factory_get_providers () @@ -61,14 +61,12 @@

Object Hierarchy

-
    GObject
+
    GObject
     ╰── TumblerProviderFactory

Description

-

-

Functions

@@ -76,26 +74,14 @@

tumbler_provider_factory_get_default ()

TumblerProviderFactory *
 tumbler_provider_factory_get_default (void);
-

-

-
-

Returns

-

-

tumbler_provider_factory_get_providers ()

-
GList *
+
GList *
 tumbler_provider_factory_get_providers
                                (TumblerProviderFactory *factory,
-                                GType type);

-

-

-

-
Returns

-

-

+                                GType type);
@@ -103,7 +89,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/tumbler-tumbler-provider-plugin.html tumbler-0.1.90/docs/reference/tumbler/html/tumbler-tumbler-provider-plugin.html --- tumbler-0.1.31/docs/reference/tumbler/html/tumbler-tumbler-provider-plugin.html 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/tumbler-tumbler-provider-plugin.html 2017-05-11 09:08:55.000000000 +0000 @@ -2,13 +2,13 @@ -tumbler Reference Manual: tumbler-provider-plugin - +tumbler-provider-plugin: tumbler Reference Manual + - + @@ -34,7 +34,7 @@

Functions

-
+
@@ -61,38 +61,28 @@

Object Hierarchy

-
    GObject
-    ╰── GTypeModule
+
    GObject
+    ╰── GTypeModule
         ╰── TumblerProviderPlugin

Description

-

-

Functions

tumbler_provider_plugin_new ()

TumblerProviderPlugin *
-tumbler_provider_plugin_new (const gchar *filename);
-

-

-
-

Returns

-

-
+tumbler_provider_plugin_new (const gchar *filename);

tumbler_provider_plugin_get_types ()

void
 tumbler_provider_plugin_get_types (const TumblerProviderPlugin *plugin,
-                                   const GType **types,
-                                   gint *n_types);
-

-

+ const GType **types, + gint *n_types);
@@ -100,7 +90,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/tumbler-Various-Enumeration-Types.html tumbler-0.1.90/docs/reference/tumbler/html/tumbler-Various-Enumeration-Types.html --- tumbler-0.1.31/docs/reference/tumbler/html/tumbler-Various-Enumeration-Types.html 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/tumbler-Various-Enumeration-Types.html 2017-05-11 09:08:55.000000000 +0000 @@ -2,13 +2,13 @@ -tumbler Reference Manual: Various Enumeration Types - +Various Enumeration Types: tumbler Reference Manual + - + @@ -48,13 +48,13 @@

Functions

+

Types and Values

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.25 \ No newline at end of file diff -Nru tumbler-0.1.31/docs/reference/tumbler/html/tumbler-Version-Information-and-Compatibility-Checks.html tumbler-0.1.90/docs/reference/tumbler/html/tumbler-Version-Information-and-Compatibility-Checks.html --- tumbler-0.1.31/docs/reference/tumbler/html/tumbler-Version-Information-and-Compatibility-Checks.html 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/html/tumbler-Version-Information-and-Compatibility-Checks.html 2017-05-11 09:08:55.000000000 +0000 @@ -2,13 +2,13 @@ -tumbler Reference Manual: Version Information and Compatibility Checks - +Version Information and Compatibility Checks: tumbler Reference Manual + - + @@ -33,7 +33,7 @@

Functions

-
+
@@ -46,7 +46,7 @@ -
const gchar * +const gchar * tumbler_check_version () @@ -57,7 +57,7 @@

Types and Values

-
+
@@ -111,16 +111,14 @@

TUMBLER_CHECK_VERSION()

#define             TUMBLER_CHECK_VERSION(major,minor,micro)
-

-

tumbler_check_version ()

-
const gchar *
-tumbler_check_version (guint required_major,
-                       guint required_minor,
-                       guint required_micro);
+
const gchar *
+tumbler_check_version (guint required_major,
+                       guint required_minor,
+                       guint required_micro);

Checks that the tumbler library in use is compatible with the given version. Generally you would pass in the constants TUMBLER_MAJOR_VERSION, TUMBLER_MINOR_VERSION and @@ -130,18 +128,31 @@ compiled against.

Example 1. Checking the runtime version of the tumbler library

-
-const gchar *mismatch;
-mismatch = tumbler_check_version (TUMBLER_VERSION_MAJOR,
-                                  TUMBLER_VERSION_MINOR,
-                                  TUMBLER_VERSION_MICRO);
-if (G_UNLIKELY (mismatch != NULL))
-  g_error ("Version mismatch: %s", mismatch);
-
+
+
+ + + + + + + 
1
+2
+3
+4
+5
+6
const gchar *mismatch;
+mismatch = tumbler_check_version (TUMBLER_VERSION_MAJOR,
+                                  TUMBLER_VERSION_MINOR,
+                                  TUMBLER_VERSION_MICRO);
+if (G_UNLIKELY (mismatch != NULL))
+  g_error ("Version mismatch: %s", mismatch);
+
+

-

Parameters

-
+

Parameters

+
@@ -167,12 +178,11 @@
-

Returns

-

NULL if the library is compatible with the given version, +

Returns

+

NULL if the library is compatible with the given version, or a string describing the version mismatch. The returned string is owned by the library and must not be freed or modified by the caller.

-

@@ -182,69 +192,52 @@

TUMBLER_MAJOR_VERSION

#define TUMBLER_MAJOR_VERSION 0
-

-

TUMBLER_MINOR_VERSION

#define TUMBLER_MINOR_VERSION 1
-

-

TUMBLER_MICRO_VERSION

-
#define TUMBLER_MICRO_VERSION 31
+
#define TUMBLER_MICRO_VERSION 90
 

-

-

tumbler_major_version

extern const guint tumbler_major_version;
-

-

tumbler_minor_version

extern const guint tumbler_minor_version;
-

-

tumbler_micro_version

extern const guint tumbler_micro_version;
-

-

G_GNUC_NULL_TERMINATED

#define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
-

-

G_GNUC_WARN_UNUSED_RESULT

#define G_GNUC_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
-

-

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.25 \ No newline at end of file Binary files /tmp/tmpOFF7nH/d_b5LgPZzE/tumbler-0.1.31/docs/reference/tumbler/html/up-insensitive.png and /tmp/tmpOFF7nH/GOC4JPRFvy/tumbler-0.1.90/docs/reference/tumbler/html/up-insensitive.png differ Binary files /tmp/tmpOFF7nH/d_b5LgPZzE/tumbler-0.1.31/docs/reference/tumbler/html/up.png and /tmp/tmpOFF7nH/GOC4JPRFvy/tumbler-0.1.90/docs/reference/tumbler/html/up.png differ diff -Nru tumbler-0.1.31/docs/reference/tumbler/Makefile.in tumbler-0.1.90/docs/reference/tumbler/Makefile.in --- tumbler-0.1.31/docs/reference/tumbler/Makefile.in 2015-02-28 16:28:13.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/Makefile.in 2017-05-11 09:08:36.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -40,7 +40,17 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -104,14 +114,13 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(srcdir)/version.xml.in subdir = docs/reference/tumbler ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version.xml @@ -136,6 +145,8 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.xml.in \ + $(top_srcdir)/gtk-doc.make DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -161,11 +172,6 @@ CURL_LIBS = @CURL_LIBS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -182,11 +188,14 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ +GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ +GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ @@ -332,6 +341,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -423,6 +433,7 @@ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) SETUP_FILES = \ $(content_files) \ + $(expand_content_files) \ $(DOC_MAIN_SGML_FILE) \ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt @@ -430,9 +441,9 @@ # Other files to distribute EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in -DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ +DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \ html-build.stamp pdf-build.stamp \ - tmpl.stamp sgml.stamp html.stamp pdf.stamp + sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -465,11 +476,6 @@ GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; -#### templates #### -GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) -GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; - #### xml #### GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) @@ -502,7 +508,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/tumbler/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu docs/reference/tumbler/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -511,7 +516,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/gtk-doc.make: +$(top_srcdir)/gtk-doc.make $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -688,6 +693,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-am uninstall-local +.PRECIOUS: Makefile + gtkdoc-check.test: Makefile $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ @@ -705,18 +712,15 @@ setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ - destdir=`dirname $(abs_builddir)/$$file` ;\ + destdir=`dirname $(abs_builddir)/$$file`; \ test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ - test -d $(abs_srcdir)/tmpl && \ - { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \ - chmod -R u+w $(abs_builddir)/tmpl; } \ fi $(AM_V_at)touch setup-build.stamp @@ -729,7 +733,7 @@ $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ scanobj_options="--verbose"; \ fi; \ @@ -746,23 +750,8 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - if test -w $(abs_srcdir) ; then \ - cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \ - fi \ - fi - $(AM_V_at)touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -$(srcdir)/tmpl/*.sgml: - @true - -sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \ +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent + $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ @@ -772,17 +761,28 @@ sgml.stamp: sgml-build.stamp @true -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +xml/gtkdocentities.ent: Makefile + $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + ) > $@ + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkhtml_options="$$mkhtml_options --verbose"; \ fi; \ fi; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ fi; \ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @@ -794,15 +794,16 @@ if test -f $(abs_builddir)/$$file ; then \ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ + test -f $$file && cp $$file $(abs_builddir)/html; \ done; $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) $(AM_V_at)touch html-build.stamp -pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkpdf_options="$$mkpdf_options --verbose"; \ fi; \ @@ -827,13 +828,15 @@ @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ rm -f $(DOC_MODULE).types; \ fi + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \ + rm -f $(DOC_MODULE)-sections.txt; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ - rm -rf tmpl; \ + rm -f $(SETUP_FILES) $(DOC_MODULE).types; \ fi maintainer-clean-local: @@ -880,9 +883,7 @@ @HAVE_GTK_DOC_FALSE@ @false dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local - @mkdir $(distdir)/tmpl @mkdir $(distdir)/html - @-cp ./tmpl/*.sgml $(distdir)/tmpl @cp ./html/* $(distdir)/html @-cp ./$(DOC_MODULE).pdf $(distdir)/ @-cp ./$(DOC_MODULE).types $(distdir)/ diff -Nru tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-abstract-thumbnailer.sgml tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-abstract-thumbnailer.sgml --- tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-abstract-thumbnailer.sgml 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-abstract-thumbnailer.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ - -TumblerAbstractThumbnailer - - - - - - - - - - - - - - - - - - - - diff -Nru tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-cache-plugin.sgml tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-cache-plugin.sgml --- tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-cache-plugin.sgml 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-cache-plugin.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ - -tumbler-cache-plugin - - - - - - - - - - - - - - - - - - - - - - - - - -@void: -@Returns: - - - - - - - -@plugin: -@Returns: - - diff -Nru tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-cache.sgml tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-cache.sgml --- tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-cache.sgml 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-cache.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ - -TumblerCache - - - - - - - - - - - - - - - - - - - - - - - - - -@void: -@Returns: - - - - - - - -@cache: -@uri: -@flavor: -@Returns: - - - - - - - -@cache: -@base_uris: -@since: - - - - - - - -@cache: -@uris: - - - - - - - -@cache: -@from_uris: -@to_uris: - - - - - - - -@cache: -@from_uris: -@to_uris: - - - - - - - -@cache: -@uri: -@Returns: - - - - - - - -@cache: -@Returns: - - - - - - - -@cache: -@name: -@Returns: - - diff -Nru tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-config.sgml tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-config.sgml --- tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-config.sgml 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-config.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ - -tumbler-config - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@major: -@minor: -@micro: - - - - - - - - - - - - - - - - - - - - - - - - - -@required_major: -@required_minor: -@required_micro: -@Returns: - - - - - - - - - - - - - - - - diff -Nru tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-enum-types.sgml tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-enum-types.sgml --- tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-enum-types.sgml 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-enum-types.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ - -tumbler-enum-types - - - - - - - - - - - - - - - - - - - - diff -Nru tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-error.sgml tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-error.sgml --- tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-error.sgml 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-error.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ - -tumbler-error - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@TUMBLER_ERROR_UNSUPPORTED: -@TUMBLER_ERROR_CONNECTION_ERROR: -@TUMBLER_ERROR_INVALID_FORMAT: -@TUMBLER_ERROR_IS_THUMBNAIL: -@TUMBLER_ERROR_SAVE_FAILED: -@TUMBLER_ERROR_UNSUPPORTED_FLAVOR: -@TUMBLER_ERROR_NO_CONTENT: -@TUMBLER_ERROR_SHUTTING_DOWN: - diff -Nru tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-file-info.sgml tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-file-info.sgml --- tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-file-info.sgml 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-file-info.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,119 +0,0 @@ - -tumbler-file-info - - - - - - - - - - - - - - - - - - - - - - - - - -@uri: -@mime_type: -@flavor: -@Returns: - - - - - - - -@info: -@cancellable: -@error: -@Returns: - - - - - - - -@info: -@Returns: - - - - - - - -@info: -@Returns: - - - - - - - -@info: -@Returns: - - - - - - - -@info: -@Returns: - - - - - - - -@info: -@Returns: - - - - - - - -@uris: -@mime_types: -@flavor: -@length: -@Returns: - - - - - - - -@infos: -@length: -@Returns: - - - - - - - -@infos: - - diff -Nru tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-glib-extensions.sgml tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-glib-extensions.sgml --- tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-glib-extensions.sgml 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-glib-extensions.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ - -tumbler-glib-extensions - - - - - - - - - - - - - - - - - - - - - - - - - -@TYPE_IFACE: -@iface_init: - - diff -Nru tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-marshal.sgml tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-marshal.sgml --- tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-marshal.sgml 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-marshal.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ - -tumbler-marshal - - - - - - - - - - - - - - - - - - - - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - diff -Nru tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-provider-factory.sgml tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-provider-factory.sgml --- tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-provider-factory.sgml 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-provider-factory.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ - -tumbler-provider-factory - - - - - - - - - - - - - - - - - - - - - - - - - -@void: -@Returns: - - - - - - - -@factory: -@type: -@Returns: - - diff -Nru tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-provider-plugin.sgml tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-provider-plugin.sgml --- tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-provider-plugin.sgml 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-provider-plugin.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ - -tumbler-provider-plugin - - - - - - - - - - - - - - - - - - - - - - - - - -@filename: -@Returns: - - - - - - - -@plugin: -@types: -@n_types: - - diff -Nru tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler.sgml tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler.sgml --- tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler.sgml 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ - -tumbler - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-thumbnailer-provider.sgml tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-thumbnailer-provider.sgml --- tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-thumbnailer-provider.sgml 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-thumbnailer-provider.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ - -TumblerThumbnailerProvider - - - - - - - - - - - - - - - - - - - - - - - - - -@provider: -@Returns: - - diff -Nru tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-thumbnailer.sgml tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-thumbnailer.sgml --- tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-thumbnailer.sgml 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-thumbnailer.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,116 +0,0 @@ - -TumblerThumbnailer - - - - - - - - - - - - - - - - - - - - - - - - - -@thumbnailer: -@cancellable: -@info: - - - - - - - -@thumbnailer: -@Returns: - - - - - - - -@thumbnailer: -@Returns: - - - - - - - -@thumbnailer: -@Returns: - - - - - - - -@thumbnailer: -@Returns: - - - - - - - -@thumbnailer: -@Returns: - - - - - - - -@thumbnailer: -@file: -@Returns: - - - - - - - -@thumbnailer: -@hash_key: -@Returns: - - - - - - - -@thumbnailers: -@length: -@Returns: - - - - - - - -@thumbnailers: -@length: - - diff -Nru tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-thumbnail-flavor.sgml tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-thumbnail-flavor.sgml --- tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-thumbnail-flavor.sgml 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-thumbnail-flavor.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ - -tumbler-thumbnail-flavor - - - - - - - - - - - - - - - - - - - - - - - - - -@name: -@width: -@height: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@flavor: -@Returns: - - - - - - - -@flavor: -@width: -@height: - - diff -Nru tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-thumbnail.sgml tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-thumbnail.sgml --- tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-thumbnail.sgml 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-thumbnail.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,92 +0,0 @@ - -TumblerThumbnail - - - - - - - - - - - - - - - - - - - - - - - - - -@colorspace: -@data: -@has_alpha: -@bits_per_sample: -@width: -@height: -@rowstride: - - - - - - -@thumbnail: -@cancellable: -@error: -@Returns: - - - - - - - -@thumbnail: -@uri: -@mtime: -@Returns: - - - - - - - -@thumbnail: -@data: -@mtime: -@cancellable: -@error: -@Returns: - - - - - - - -@thumbnail: -@file: -@mtime: -@cancellable: -@error: -@Returns: - - - - - - - -@thumbnail: -@Returns: - - diff -Nru tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-util.sgml tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-util.sgml --- tumbler-0.1.31/docs/reference/tumbler/tmpl/tumbler-util.sgml 2015-02-28 16:28:43.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/tmpl/tumbler-util.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ - -tumbler-util - - - - - - - - - - - - - - - - - - - - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - diff -Nru tumbler-0.1.31/docs/reference/tumbler/version.xml tumbler-0.1.90/docs/reference/tumbler/version.xml --- tumbler-0.1.31/docs/reference/tumbler/version.xml 2015-02-28 16:28:19.000000000 +0000 +++ tumbler-0.1.90/docs/reference/tumbler/version.xml 2017-05-11 09:08:43.000000000 +0000 @@ -1 +1 @@ -0.1.31 +0.1.90 diff -Nru tumbler-0.1.31/gtk-doc.make tumbler-0.1.90/gtk-doc.make --- tumbler-0.1.31/gtk-doc.make 2015-02-28 16:28:10.000000000 +0000 +++ tumbler-0.1.90/gtk-doc.make 2017-05-11 09:08:32.000000000 +0000 @@ -25,6 +25,7 @@ SETUP_FILES = \ $(content_files) \ + $(expand_content_files) \ $(DOC_MAIN_SGML_FILE) \ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt @@ -33,9 +34,9 @@ $(HTML_IMAGES) \ $(SETUP_FILES) -DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ +DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ html-build.stamp pdf-build.stamp \ - tmpl.stamp sgml.stamp html.stamp pdf.stamp + sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -86,21 +87,19 @@ setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ - destdir=`dirname $(abs_builddir)/$$file` ;\ + destdir=`dirname $(abs_builddir)/$$file`; \ test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ - test -d $(abs_srcdir)/tmpl && \ - { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \ - chmod -R u+w $(abs_builddir)/tmpl; } \ fi $(AM_V_at)touch setup-build.stamp + #### scan #### GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) @@ -120,7 +119,7 @@ $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ scanobj_options="--verbose"; \ fi; \ @@ -137,35 +136,14 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -#### templates #### - -GTK_DOC_V_TMPL=$(GTK_DOC_V_TMPL_$(V)) -GTK_DOC_V_TMPL_=$(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_TMPL_0=@echo " DOC Rebuilding template files"; - -tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - if test -w $(abs_srcdir) ; then \ - cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \ - fi \ - fi - $(AM_V_at)touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -$(srcdir)/tmpl/*.sgml: - @true - #### xml #### GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V)) GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_XML_0=@echo " DOC Building XML"; -sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \ +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent + $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ @@ -175,6 +153,17 @@ sgml.stamp: sgml-build.stamp @true +xml/gtkdocentities.ent: Makefile + $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + echo ""; \ + ) > $@ + #### html #### GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V)) @@ -185,17 +174,17 @@ GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkhtml_options="$$mkhtml_options --verbose"; \ fi; \ fi; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ fi; \ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @@ -207,6 +196,7 @@ if test -f $(abs_builddir)/$$file ; then \ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ + test -f $$file && cp $$file $(abs_builddir)/html; \ done; $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) $(AM_V_at)touch html-build.stamp @@ -217,11 +207,11 @@ GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; -pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkpdf_options="$$mkpdf_options --verbose"; \ fi; \ @@ -246,13 +236,15 @@ @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ rm -f $(DOC_MODULE).types; \ fi + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \ + rm -f $(DOC_MODULE)-sections.txt; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ - rm -rf tmpl; \ + rm -f $(SETUP_FILES) $(DOC_MODULE).types; \ fi maintainer-clean-local: @@ -302,9 +294,7 @@ endif dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local - @mkdir $(distdir)/tmpl @mkdir $(distdir)/html - @-cp ./tmpl/*.sgml $(distdir)/tmpl @cp ./html/* $(distdir)/html @-cp ./$(DOC_MODULE).pdf $(distdir)/ @-cp ./$(DOC_MODULE).types $(distdir)/ diff -Nru tumbler-0.1.31/install-sh tumbler-0.1.90/install-sh --- tumbler-0.1.31/install-sh 2015-02-28 16:28:13.000000000 +0000 +++ tumbler-0.1.90/install-sh 2017-05-11 09:08:36.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2014-09-12.12; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,81 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + # $RANDOM is not portable (e.g. dash); use it when possible to + # lower collision chance + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + + # As "mkdir -p" follows symlinks and we work in /tmp possibly; so + # create the $tmpdir first (and fail if unsuccessful) to make sure + # that nobody tries to guess the $tmpdir name. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +377,51 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +456,12 @@ # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +474,24 @@ # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff -Nru tumbler-0.1.31/ltmain.sh tumbler-0.1.90/ltmain.sh --- tumbler-0.1.31/ltmain.sh 2015-02-28 16:28:09.000000000 +0000 +++ tumbler-0.1.90/ltmain.sh 2017-05-11 09:08:32.000000000 +0000 @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.6 +VERSION="2.4.6 Debian-2.4.6-2" package_revision=2.4.6 @@ -2068,12 +2068,12 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname (GNU libtool) 2.4.6 + version: $progname $scriptversion Debian-2.4.6-2 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` Report bugs to . -GNU libtool home page: . +GNU libtool home page: . General help using GNU software: ." exit 0 } @@ -7272,10 +7272,13 @@ # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang + # -fsanitize=* Clang/GCC memory and address sanitizer -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ + -specs=*|-fsanitize=*) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" @@ -7568,7 +7571,10 @@ case $pass in dlopen) libs=$dlfiles ;; dlpreopen) libs=$dlprefiles ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test lib,dlpreopen = "$linkmode,$pass"; then @@ -7887,19 +7893,19 @@ # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done elif test prog != "$linkmode" && test lib != "$linkmode"; then func_fatal_error "'$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done continue fi # $pass = conv @@ -8823,6 +8829,9 @@ revision=$number_minor lt_irix_increment=no ;; + *) + func_fatal_configuration "$modename: unknown library version type '$version_type'" + ;; esac ;; no) diff -Nru tumbler-0.1.31/Makefile.in tumbler-0.1.90/Makefile.in --- tumbler-0.1.31/Makefile.in 2015-02-28 16:28:13.000000000 +0000 +++ tumbler-0.1.90/Makefile.in 2017-05-11 09:08:36.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -33,7 +33,17 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -98,16 +108,13 @@ host_triplet = @host@ target_triplet = @target@ subdir = . -DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in COPYING TODO compile config.guess \ - config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -171,6 +178,9 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \ + COPYING ChangeLog INSTALL NEWS README TODO compile \ + config.guess config.sub install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -237,11 +247,6 @@ CURL_LIBS = @CURL_LIBS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -258,11 +263,14 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ +GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ +GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ @@ -408,6 +416,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -449,7 +458,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -682,15 +690,15 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -726,17 +734,17 @@ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -913,6 +921,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + .PHONY: ChangeLog diff -Nru tumbler-0.1.31/missing tumbler-0.1.90/missing --- tumbler-0.1.31/missing 2015-02-28 16:28:13.000000000 +0000 +++ tumbler-0.1.90/missing 2017-05-11 09:08:36.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff -Nru tumbler-0.1.31/NEWS tumbler-0.1.90/NEWS --- tumbler-0.1.31/NEWS 2015-02-28 16:26:33.000000000 +0000 +++ tumbler-0.1.90/NEWS 2017-05-11 09:06:12.000000000 +0000 @@ -1,3 +1,7 @@ +0.1.90 +====== +- Tumbler relies now on gdbus instead of dbus-glib + 0.1.31 ====== - Use $XDG_CACHE_HOME/thumbnails as per spec change (bug #10613) diff -Nru tumbler-0.1.31/plugins/cover-thumbnailer/Makefile.in tumbler-0.1.90/plugins/cover-thumbnailer/Makefile.in --- tumbler-0.1.31/plugins/cover-thumbnailer/Makefile.in 2015-02-28 16:28:13.000000000 +0000 +++ tumbler-0.1.90/plugins/cover-thumbnailer/Makefile.in 2017-05-11 09:08:36.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +34,17 @@ # Boston, MA 02110-1301, USA. VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -99,13 +109,12 @@ host_triplet = @host@ target_triplet = @target@ subdir = plugins/cover-thumbnailer -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -219,6 +228,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -244,11 +254,6 @@ CURL_LIBS = @CURL_LIBS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -265,11 +270,14 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ +GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ +GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ @@ -415,6 +423,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -485,7 +494,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/cover-thumbnailer/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plugins/cover-thumbnailer/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -807,6 +815,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-tumbler_pluginLTLIBRARIES +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru tumbler-0.1.31/plugins/ffmpeg-thumbnailer/Makefile.in tumbler-0.1.90/plugins/ffmpeg-thumbnailer/Makefile.in --- tumbler-0.1.31/plugins/ffmpeg-thumbnailer/Makefile.in 2015-02-28 16:28:13.000000000 +0000 +++ tumbler-0.1.90/plugins/ffmpeg-thumbnailer/Makefile.in 2017-05-11 09:08:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +34,17 @@ # Boston, MA 02110-1301, USA. VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -99,13 +109,12 @@ host_triplet = @host@ target_triplet = @target@ subdir = plugins/ffmpeg-thumbnailer -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -219,6 +228,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -244,11 +254,6 @@ CURL_LIBS = @CURL_LIBS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -265,11 +270,14 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ +GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ +GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ @@ -415,6 +423,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -485,7 +494,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/ffmpeg-thumbnailer/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plugins/ffmpeg-thumbnailer/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -807,6 +815,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-tumbler_pluginLTLIBRARIES +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru tumbler-0.1.31/plugins/font-thumbnailer/Makefile.in tumbler-0.1.90/plugins/font-thumbnailer/Makefile.in --- tumbler-0.1.31/plugins/font-thumbnailer/Makefile.in 2015-02-28 16:28:13.000000000 +0000 +++ tumbler-0.1.90/plugins/font-thumbnailer/Makefile.in 2017-05-11 09:08:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +34,17 @@ # Boston, MA 02110-1301, USA. VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -99,13 +109,12 @@ host_triplet = @host@ target_triplet = @target@ subdir = plugins/font-thumbnailer -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -219,6 +228,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -244,11 +254,6 @@ CURL_LIBS = @CURL_LIBS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -265,11 +270,14 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ +GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ +GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ @@ -415,6 +423,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -485,7 +494,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/font-thumbnailer/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plugins/font-thumbnailer/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -807,6 +815,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-tumbler_pluginLTLIBRARIES +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru tumbler-0.1.31/plugins/gst-thumbnailer/Makefile.in tumbler-0.1.90/plugins/gst-thumbnailer/Makefile.in --- tumbler-0.1.31/plugins/gst-thumbnailer/Makefile.in 2015-02-28 16:28:13.000000000 +0000 +++ tumbler-0.1.90/plugins/gst-thumbnailer/Makefile.in 2017-05-11 09:08:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +34,17 @@ # Boston, MA 02110-1301, USA. VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -99,13 +109,12 @@ host_triplet = @host@ target_triplet = @target@ subdir = plugins/gst-thumbnailer -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -219,6 +228,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -244,11 +254,6 @@ CURL_LIBS = @CURL_LIBS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -265,11 +270,14 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ +GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ +GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ @@ -415,6 +423,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -487,7 +496,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/gst-thumbnailer/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plugins/gst-thumbnailer/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -809,6 +817,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-tumbler_pluginLTLIBRARIES +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru tumbler-0.1.31/plugins/jpeg-thumbnailer/Makefile.in tumbler-0.1.90/plugins/jpeg-thumbnailer/Makefile.in --- tumbler-0.1.31/plugins/jpeg-thumbnailer/Makefile.in 2015-02-28 16:28:14.000000000 +0000 +++ tumbler-0.1.90/plugins/jpeg-thumbnailer/Makefile.in 2017-05-11 09:08:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +34,17 @@ # Boston, MA 02110-1301, USA. VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -99,13 +109,12 @@ host_triplet = @host@ target_triplet = @target@ subdir = plugins/jpeg-thumbnailer -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -219,6 +228,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -244,11 +254,6 @@ CURL_LIBS = @CURL_LIBS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -265,11 +270,14 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ +GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ +GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ @@ -415,6 +423,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -485,7 +494,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/jpeg-thumbnailer/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plugins/jpeg-thumbnailer/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -807,6 +815,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-tumbler_pluginLTLIBRARIES +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru tumbler-0.1.31/plugins/Makefile.in tumbler-0.1.90/plugins/Makefile.in --- tumbler-0.1.31/plugins/Makefile.in 2015-02-28 16:28:13.000000000 +0000 +++ tumbler-0.1.90/plugins/Makefile.in 2017-05-11 09:08:36.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -33,7 +33,17 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -98,12 +108,12 @@ host_triplet = @host@ target_triplet = @target@ subdir = plugins -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -163,6 +173,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -213,11 +224,6 @@ CURL_LIBS = @CURL_LIBS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -234,11 +240,14 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ +GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ +GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ @@ -384,6 +393,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -423,7 +433,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plugins/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -718,6 +727,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru tumbler-0.1.31/plugins/odf-thumbnailer/Makefile.in tumbler-0.1.90/plugins/odf-thumbnailer/Makefile.in --- tumbler-0.1.31/plugins/odf-thumbnailer/Makefile.in 2015-02-28 16:28:14.000000000 +0000 +++ tumbler-0.1.90/plugins/odf-thumbnailer/Makefile.in 2017-05-11 09:08:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -35,7 +35,17 @@ # Boston, MA 02110-1301, USA. VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -100,13 +110,12 @@ host_triplet = @host@ target_triplet = @target@ subdir = plugins/odf-thumbnailer -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -219,6 +228,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -244,11 +254,6 @@ CURL_LIBS = @CURL_LIBS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -265,11 +270,14 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ +GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ +GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ @@ -415,6 +423,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -485,7 +494,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/odf-thumbnailer/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plugins/odf-thumbnailer/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -807,6 +815,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-tumbler_pluginLTLIBRARIES +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru tumbler-0.1.31/plugins/odf-thumbnailer/odf-thumbnailer.c tumbler-0.1.90/plugins/odf-thumbnailer/odf-thumbnailer.c --- tumbler-0.1.31/plugins/odf-thumbnailer/odf-thumbnailer.c 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/plugins/odf-thumbnailer/odf-thumbnailer.c 2017-05-11 09:06:12.000000000 +0000 @@ -261,7 +261,7 @@ /* read meta data from stream */ meta_data = gsf_doc_meta_data_new (); - err = gsf_msole_metadata_read (summary, meta_data); + err = gsf_doc_meta_data_read_from_msole (meta_data, summary); g_object_unref (summary); if (err != NULL) { diff -Nru tumbler-0.1.31/plugins/pixbuf-thumbnailer/Makefile.in tumbler-0.1.90/plugins/pixbuf-thumbnailer/Makefile.in --- tumbler-0.1.31/plugins/pixbuf-thumbnailer/Makefile.in 2015-02-28 16:28:14.000000000 +0000 +++ tumbler-0.1.90/plugins/pixbuf-thumbnailer/Makefile.in 2017-05-11 09:08:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +34,17 @@ # Boston, MA 02110-1301, USA. VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -99,13 +109,12 @@ host_triplet = @host@ target_triplet = @target@ subdir = plugins/pixbuf-thumbnailer -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -219,6 +228,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -244,11 +254,6 @@ CURL_LIBS = @CURL_LIBS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -265,11 +270,14 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ +GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ +GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ @@ -415,6 +423,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -483,7 +492,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/pixbuf-thumbnailer/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plugins/pixbuf-thumbnailer/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -805,6 +813,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-tumbler_pluginLTLIBRARIES +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru tumbler-0.1.31/plugins/poppler-thumbnailer/Makefile.in tumbler-0.1.90/plugins/poppler-thumbnailer/Makefile.in --- tumbler-0.1.31/plugins/poppler-thumbnailer/Makefile.in 2015-02-28 16:28:14.000000000 +0000 +++ tumbler-0.1.90/plugins/poppler-thumbnailer/Makefile.in 2017-05-11 09:08:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +34,17 @@ # Boston, MA 02110-1301, USA. VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -99,13 +109,12 @@ host_triplet = @host@ target_triplet = @target@ subdir = plugins/poppler-thumbnailer -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -219,6 +228,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -244,11 +254,6 @@ CURL_LIBS = @CURL_LIBS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -265,11 +270,14 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ +GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ +GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ @@ -415,6 +423,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -485,7 +494,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/poppler-thumbnailer/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plugins/poppler-thumbnailer/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -807,6 +815,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-tumbler_pluginLTLIBRARIES +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru tumbler-0.1.31/plugins/raw-thumbnailer/Makefile.in tumbler-0.1.90/plugins/raw-thumbnailer/Makefile.in --- tumbler-0.1.31/plugins/raw-thumbnailer/Makefile.in 2015-02-28 16:28:14.000000000 +0000 +++ tumbler-0.1.90/plugins/raw-thumbnailer/Makefile.in 2017-05-11 09:08:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -35,7 +35,17 @@ # Boston, MA 02110-1301, USA. VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -100,13 +110,12 @@ host_triplet = @host@ target_triplet = @target@ subdir = plugins/raw-thumbnailer -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -219,6 +228,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -244,11 +254,6 @@ CURL_LIBS = @CURL_LIBS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -265,11 +270,14 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ +GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ +GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ @@ -415,6 +423,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -485,7 +494,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/raw-thumbnailer/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plugins/raw-thumbnailer/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -807,6 +815,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-tumbler_pluginLTLIBRARIES +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru tumbler-0.1.31/plugins/xdg-cache/Makefile.in tumbler-0.1.90/plugins/xdg-cache/Makefile.in --- tumbler-0.1.31/plugins/xdg-cache/Makefile.in 2015-02-28 16:28:14.000000000 +0000 +++ tumbler-0.1.90/plugins/xdg-cache/Makefile.in 2017-05-11 09:08:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +34,17 @@ # Boston, MA 02110-1301, USA. VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -99,13 +109,12 @@ host_triplet = @host@ target_triplet = @target@ subdir = plugins/xdg-cache -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -217,6 +226,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -242,11 +252,6 @@ CURL_LIBS = @CURL_LIBS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -263,11 +268,14 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ +GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ +GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ @@ -413,6 +421,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -482,7 +491,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/xdg-cache/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plugins/xdg-cache/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -805,6 +813,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-tumbler_pluginLTLIBRARIES +.PRECIOUS: Makefile + # install symlink to 'tumbler-cache-plugin.so' @TUMBLER_XDG_CACHE_TRUE@install-data-local: diff -Nru tumbler-0.1.31/plugins/xdg-cache/xdg-cache-cache.c tumbler-0.1.90/plugins/xdg-cache/xdg-cache-cache.c --- tumbler-0.1.31/plugins/xdg-cache/xdg-cache-cache.c 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/plugins/xdg-cache/xdg-cache-cache.c 2017-05-11 09:04:46.000000000 +0000 @@ -60,7 +60,6 @@ static gboolean xdg_cache_cache_is_thumbnail (TumblerCache *cache, const gchar *uri); static GList *xdg_cache_cache_get_flavors (TumblerCache *cache); -static const gchar *xdg_cache_cache_get_home (void); @@ -557,14 +556,6 @@ } - -static const gchar * -xdg_cache_cache_get_home (void) -{ - return g_getenv ("HOME") != NULL ? g_getenv ("HOME") : g_get_home_dir (); -} - - GFile * xdg_cache_cache_get_file (const gchar *uri, diff -Nru tumbler-0.1.31/po/ca.po tumbler-0.1.90/po/ca.po --- tumbler-0.1.31/po/ca.po 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/po/ca.po 2017-05-11 09:05:04.000000000 +0000 @@ -3,17 +3,19 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# alavios , 2013 -# carlesmu , 2009,2011 +# Adrián Laviós , 2013 +# Carles Muñoz Gorriz , 2009,2011 # Harald Servat , 2009 +# Davidmp , 2015 +# Robert Antoni Buj i Gelonch , 2016 msgid "" msgstr "" "Project-Id-Version: Tumbler\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-07-02 22:38+0200\n" -"PO-Revision-Date: 2013-07-08 14:33+0000\n" -"Last-Translator: alavios \n" -"Language-Team: Catalan (http://www.transifex.com/projects/p/xfce/language/ca/)\n" +"PO-Revision-Date: 2016-04-29 22:10+0000\n" +"Last-Translator: Robert Antoni Buj i Gelonch \n" +"Language-Team: Catalan (http://www.transifex.com/xfce/tumbler/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,22 +25,22 @@ #: ../tumblerd/tumbler-cache-service.c:413 #, c-format msgid "Another thumbnail cache service is already running" -msgstr "Un altre servei de memòria cau de miniatures ja s'està executant" +msgstr "Ja s'està executant un altre servei de memòria cau de miniatures" #: ../tumblerd/tumbler-group-scheduler.c:486 #: ../tumblerd/tumbler-lifo-scheduler.c:422 #, c-format msgid "No thumbnailer available for \"%s\"" -msgstr "No hi ha cap miniatura disponible per «%s»" +msgstr "No hi ha cap miniatura disponible per a «%s»" #: ../tumblerd/tumbler-lifecycle-manager.c:208 msgid "The thumbnailer service is shutting down" -msgstr "S'està tancant el servei de miniatures" +msgstr "S'està aturant el servei de miniatures" #: ../tumblerd/tumbler-service.c:758 #, c-format msgid "Another generic thumbnailer is already running" -msgstr "Un altres sistema genèric de miniatures ja s'està executant" +msgstr " Ja s'està executant un altre sistema genèric de miniatures" #: ../tumblerd/tumbler-service.c:867 msgid "Unsupported thumbnail flavor requested" @@ -46,12 +48,12 @@ #: ../tumblerd/tumbler-specialized-thumbnailer.c:485 msgid "Failed to call the specialized thumbnailer: timeout" -msgstr "Ha fallat la crida al generador de miniatures: ha expirat el temps" +msgstr "No s'ha pogut cridar al generador de miniatures: ha expirat el temps" #: ../tumblerd/tumbler-specialized-thumbnailer.c:494 #, c-format msgid "Failed to call the specialized thumbnailer: %s" -msgstr "Ha fallat la crida al generador de miniatures: %s" +msgstr "No s'ha pogut cridar al generador de miniatures: %s" #: ../tumblerd/tumbler-manager.c:489 ../tumblerd/tumbler-manager.c:895 #, c-format @@ -62,14 +64,14 @@ #: ../tumblerd/tumbler-manager.c:535 #, c-format msgid "Malformed section \"%s\" in file \"%s\": %s" -msgstr "Secció mal formada «%s» en el fitxer «%s»: %s" +msgstr "Secció amb format erroni «%s» al fitxer «%s»: %s" #: ../tumblerd/tumbler-manager.c:548 #, c-format msgid "" "Malformed section \"%s\" in file \"%s\": Mismatch between section name and " "UriScheme/MimeType" -msgstr "Secció mal formada «%s» en el fitxer «%s»: diferències entre el nom de la secció i el UriScheme/MimeType" +msgstr "Secció amb format erroni «%s» al fitxer «%s»: diferències entre el nom de la secció i UriScheme/MimeType" #: ../tumblerd/tumbler-manager.c:908 ../tumblerd/tumbler-manager.c:922 #: ../tumblerd/tumbler-manager.c:936 @@ -85,11 +87,11 @@ #: ../tumblerd/tumbler-manager.c:1868 #, c-format msgid "Another thumbnailer manager is already running" -msgstr "Un altre gestor de miniatures ja s'està executant" +msgstr "Ja s'està executant un altre gestor de miniatures" #: ../tumblerd/main.c:249 msgid "Couldn't change nice value of process." -msgstr "" +msgstr "No s'ha pogut canviar el valor nice del procés." #. set the application name. Translators: Don't translate "Tumbler". #: ../tumblerd/main.c:258 @@ -99,12 +101,12 @@ #: ../tumblerd/main.c:280 #, c-format msgid "Failed to connect to the D-Bus session bus: %s" -msgstr "No s'ha pogut connectar amb la sessió de bus D-Bus: %s" +msgstr "No s'ha pogut connectar amb la sessió del bus D-Bus: %s" #: ../tumblerd/main.c:363 #, c-format msgid "Failed to load specialized thumbnailers into the registry: %s" -msgstr "No s'ha pogut carregar les miniatures especialitzades al registre: %s" +msgstr "No s'han pogut carregar les miniatures especialitzades al registre: %s" #: ../tumblerd/main.c:375 #, c-format @@ -123,7 +125,7 @@ #: ../tumbler/tumbler-enum-types.c:49 msgid "Invalid format" -msgstr "Format invàlid" +msgstr "El format no és vàlid" #: ../tumbler/tumbler-enum-types.c:50 msgid "PNG" @@ -141,7 +143,7 @@ #: ../tumbler/tumbler-cache-plugin.c:153 #, c-format msgid "Failed to load the cache plugin \"%s\": %s" -msgstr "No s'ha pogut carregar el connector de memòria cau «%s»: %s" +msgstr "No s'ha pogut carregar el connector de la memòria cau «%s»: %s" #: ../tumbler/tumbler-file-info.c:297 #, c-format @@ -170,27 +172,27 @@ #: ../plugins/xdg-cache/xdg-cache-plugin.c:52 #, c-format msgid "Version mismatch: %s" -msgstr "Versió errònia: %s" +msgstr "La versió no coincideix: %s" #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:394 #, c-format msgid "Failed to load the poster image \"%s\"" -msgstr "" +msgstr "No s'ha pogut carregar la imatge del cartell «%s»" #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:430 #, c-format msgid "Failed to load the metadata from \"%s\"" -msgstr "Ha hagut un error en la càrrega de les metadades de \"%s\"" +msgstr "No s'ha pogut carregar les metadades des de «%s»" #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:626 msgid "" "Invalid API key, you must be granted a valid key. The Movie DB backend will " "be disabled." -msgstr "Clau de l'API invàlida: has d'haver sigut proporcionat una clau vàlida. L'extensió Movie DB serà desactivada." +msgstr "La clau de l'API no és vàlida, hauríeu de proporcionar una clau vàlida. L'extensió Movie DB serà desactivada." #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:634 msgid "No poster key found in metadata" -msgstr "" +msgstr "No s'ha trobat la clau del cartell a les metadades" #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:689 msgid "Movie title is too short" @@ -200,7 +202,7 @@ #: ../plugins/font-thumbnailer/font-thumbnailer.c:463 #, c-format msgid "Could not initialize freetype: %s" -msgstr "No s'ha pogut inicialitzar el freetype: %s" +msgstr "No s'ha pogut inicialitzar freetype: %s" #. there was an error, emit error signal #: ../plugins/font-thumbnailer/font-thumbnailer.c:475 @@ -224,7 +226,7 @@ #: ../plugins/font-thumbnailer/font-thumbnailer.c:545 #, c-format msgid "Could not render glyphs: %s" -msgstr "No s'han pogut representar el glif: %s" +msgstr "No s'han pogut representar els glif: %s" #: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer.c:864 #: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer.c:902 @@ -239,15 +241,15 @@ #: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:317 msgid "The document is empty" -msgstr "El document és buit" +msgstr "El document està buit" #: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:329 msgid "First page of the document could not be read" -msgstr "No s'ha pogut llegir la primera plana del document" +msgstr "No s'ha pogut llegir la primera pàgina del document" #: ../plugins/raw-thumbnailer/raw-thumbnailer.c:191 msgid "Only local files are supported" -msgstr "Només es permeten els fitxers locals" +msgstr "Només es permeten fitxers locals" #: ../plugins/xdg-cache/xdg-cache-thumbnail.c:382 #, c-format diff -Nru tumbler-0.1.31/po/da.po tumbler-0.1.90/po/da.po --- tumbler-0.1.31/po/da.po 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/po/da.po 2017-05-11 09:05:04.000000000 +0000 @@ -3,16 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Aputsiaĸ Niels Janussen , 2013 +# Aputsiak Niels Janussen , 2013 # Per Kongstad , 2009 +# scootergrisen, 2017 msgid "" msgstr "" "Project-Id-Version: Tumbler\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-07-02 22:38+0200\n" -"PO-Revision-Date: 2013-11-08 14:50+0000\n" -"Last-Translator: Aputsiaĸ Niels Janussen \n" -"Language-Team: Danish (http://www.transifex.com/projects/p/xfce/language/da/)\n" +"PO-Revision-Date: 2017-01-19 10:31+0000\n" +"Last-Translator: scootergrisen\n" +"Language-Team: Danish (http://www.transifex.com/xfce/tumbler/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -22,7 +23,7 @@ #: ../tumblerd/tumbler-cache-service.c:413 #, c-format msgid "Another thumbnail cache service is already running" -msgstr "En anden tjeneste til cache af miniaturer kører allerede" +msgstr "En anden tjeneste til mellemlagring af miniaturer kører allerede" #: ../tumblerd/tumbler-group-scheduler.c:486 #: ../tumblerd/tumbler-lifo-scheduler.c:422 @@ -32,7 +33,7 @@ #: ../tumblerd/tumbler-lifecycle-manager.c:208 msgid "The thumbnailer service is shutting down" -msgstr "Tjenesten thumbnailer lukker ned" +msgstr "Tjenesten til miniaturer lukker ned" #: ../tumblerd/tumbler-service.c:758 #, c-format @@ -55,7 +56,7 @@ #: ../tumblerd/tumbler-manager.c:489 ../tumblerd/tumbler-manager.c:895 #, c-format msgid "Failed to load the file \"%s\": %s" -msgstr "Kunne ikke indlæse filen \"%s\": %s" +msgstr "Kunne ikke indlæse filen \"%s\": %s" #: ../tumblerd/tumbler-manager.c:507 ../tumblerd/tumbler-manager.c:521 #: ../tumblerd/tumbler-manager.c:535 @@ -93,7 +94,7 @@ #. set the application name. Translators: Don't translate "Tumbler". #: ../tumblerd/main.c:258 msgid "Tumbler Thumbnailing Service" -msgstr "Tumbler Thumbnailing tjeneste" +msgstr "Tumbler tjeneste til miniaturer" #: ../tumblerd/main.c:280 #, c-format @@ -108,7 +109,7 @@ #: ../tumblerd/main.c:375 #, c-format msgid "Failed to start the thumbnail cache service: %s" -msgstr "Kunne ikke starte tjenesten thumbnail cache: %s" +msgstr "Kunne ikke starte tjeneste til mellemlagring af miniaturer: %s" #: ../tumblerd/main.c:385 #, c-format @@ -140,7 +141,7 @@ #: ../tumbler/tumbler-cache-plugin.c:153 #, c-format msgid "Failed to load the cache plugin \"%s\": %s" -msgstr "Kunne ikke indlæse udvidelsesmodul til mellemlager \"%s\": %s" +msgstr "Kunne ikke indlæse udvidelsesmodul til mellemlager \"%s\": %s" #: ../tumbler/tumbler-file-info.c:297 #, c-format @@ -155,7 +156,7 @@ #: ../tumbler/tumbler-provider-plugin.c:143 #, c-format msgid "Failed to load plugin \"%s\": %s" -msgstr "Kunne ikke indlæse udvidelsesmodul \"%s\": %s" +msgstr "Kunne ikke indlæse udvidelsesmodul \"%s\": %s" #: ../plugins/cover-thumbnailer/cover-thumbnailer-plugin.c:59 #: ../plugins/gst-thumbnailer/gst-thumbnailer-plugin.c:59 @@ -242,7 +243,7 @@ #: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:329 msgid "First page of the document could not be read" -msgstr "Første sideaf dokumentet kunne ikke læses" +msgstr "Første side af dokumentet kunne ikke læses" #: ../plugins/raw-thumbnailer/raw-thumbnailer.c:191 msgid "Only local files are supported" diff -Nru tumbler-0.1.31/po/el.po tumbler-0.1.90/po/el.po --- tumbler-0.1.31/po/el.po 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/po/el.po 2017-05-11 09:05:04.000000000 +0000 @@ -3,6 +3,8 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Apóstolos Papaðimitríu , 2016 +# Apóstolos Papaðimitríu , 2017 # Efstathios Iosifidis , 2014 # Efstathios Iosifidis , 2012 # loathingkernel , 2013 @@ -11,9 +13,9 @@ "Project-Id-Version: Tumbler\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-07-02 22:38+0200\n" -"PO-Revision-Date: 2014-12-26 20:10+0000\n" -"Last-Translator: Efstathios Iosifidis \n" -"Language-Team: Greek (http://www.transifex.com/projects/p/tumbler/language/el/)\n" +"PO-Revision-Date: 2017-03-03 23:24+0000\n" +"Last-Translator: Apóstolos Papaðimitríu \n" +"Language-Team: Greek (http://www.transifex.com/xfce/tumbler/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -89,7 +91,7 @@ #: ../tumblerd/main.c:249 msgid "Couldn't change nice value of process." -msgstr "" +msgstr " Αδυναμία φόρτωσης της τιμής «nice» της διεργασίας." #. set the application name. Translators: Don't translate "Tumbler". #: ../tumblerd/main.c:258 @@ -175,7 +177,7 @@ #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:394 #, c-format msgid "Failed to load the poster image \"%s\"" -msgstr "" +msgstr "Αδυναμία φόρτωσης της αφίσας \"%s\"" #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:430 #, c-format @@ -186,11 +188,11 @@ msgid "" "Invalid API key, you must be granted a valid key. The Movie DB backend will " "be disabled." -msgstr "" +msgstr "Άκυρο κλειδί API. Θα πρέπει να λάβετε ένα έγκυρο κλειδί. Το σύστημα υποστήριξης «The Movie DB» θα απενεργοποιηθεί." #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:634 msgid "No poster key found in metadata" -msgstr "" +msgstr "Δεν βρέθηκε poster key στα μεταδεδομένα." #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:689 msgid "Movie title is too short" diff -Nru tumbler-0.1.31/po/eu.po tumbler-0.1.90/po/eu.po --- tumbler-0.1.31/po/eu.po 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/po/eu.po 2017-05-11 09:05:04.000000000 +0000 @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Piarres Beobide , 2010 +# Piarres Beobide , 2010,2016 msgid "" msgstr "" "Project-Id-Version: Tumbler\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-07-02 22:38+0200\n" -"PO-Revision-Date: 2013-07-04 08:07+0000\n" +"PO-Revision-Date: 2016-02-08 15:46+0000\n" "Last-Translator: Piarres Beobide \n" -"Language-Team: Basque (http://www.transifex.com/projects/p/xfce/language/eu/)\n" +"Language-Team: Basque (http://www.transifex.com/xfce/tumbler/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -178,7 +178,7 @@ #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:430 #, c-format msgid "Failed to load the metadata from \"%s\"" -msgstr "" +msgstr "Huts \"%s\"-tik metadata kargatzean" #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:626 msgid "" diff -Nru tumbler-0.1.31/po/gl.po tumbler-0.1.90/po/gl.po --- tumbler-0.1.31/po/gl.po 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/po/gl.po 2017-05-11 09:05:04.000000000 +0000 @@ -5,14 +5,15 @@ # Translators: # Leandro Regueiro , 2009 # Leandro Regueiro , 2013 +# Xosé , 2015,2017 msgid "" msgstr "" "Project-Id-Version: Tumbler\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-07-02 22:38+0200\n" -"PO-Revision-Date: 2013-11-19 12:27+0000\n" -"Last-Translator: Leandro Regueiro \n" -"Language-Team: Galician (http://www.transifex.com/projects/p/xfce/language/gl/)\n" +"PO-Revision-Date: 2017-03-20 21:42+0000\n" +"Last-Translator: Xosé \n" +"Language-Team: Galician (http://www.transifex.com/xfce/tumbler/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -28,7 +29,7 @@ #: ../tumblerd/tumbler-lifo-scheduler.c:422 #, c-format msgid "No thumbnailer available for \"%s\"" -msgstr "Non hai ningún miniaturizador dispoñible para \"%s\"" +msgstr "Non hai ningún miniaturizador dispoñíbel para «%s»" #: ../tumblerd/tumbler-lifecycle-manager.c:208 msgid "The thumbnailer service is shutting down" @@ -41,7 +42,7 @@ #: ../tumblerd/tumbler-service.c:867 msgid "Unsupported thumbnail flavor requested" -msgstr "Solicitouse un tipo de miniatura non soportada" +msgstr "Solicitouse un tipo de miniatura non admitida" #: ../tumblerd/tumbler-specialized-thumbnailer.c:485 msgid "Failed to call the specialized thumbnailer: timeout" @@ -55,36 +56,36 @@ #: ../tumblerd/tumbler-manager.c:489 ../tumblerd/tumbler-manager.c:895 #, c-format msgid "Failed to load the file \"%s\": %s" -msgstr "Produciuse un erro ao cargar o ficheiro \"%s\": %s" +msgstr "Produciuse un erro ao cargar o ficheiro «%s»: %s" #: ../tumblerd/tumbler-manager.c:507 ../tumblerd/tumbler-manager.c:521 #: ../tumblerd/tumbler-manager.c:535 #, c-format msgid "Malformed section \"%s\" in file \"%s\": %s" -msgstr "Sección malformada \"%s\" no ficheiro \"%s\": %s" +msgstr "Sección malformada «%s» no ficheiro «%s»: %s" #: ../tumblerd/tumbler-manager.c:548 #, c-format msgid "" "Malformed section \"%s\" in file \"%s\": Mismatch between section name and " "UriScheme/MimeType" -msgstr "Sección malformada \"%s\" no ficheiro \"%s\": O nome da sección e UriScheme/MimeType non coinciden" +msgstr "Sección mal escrita «%s» no ficheiro «%s»: O nome da sección e UriScheme/MimeType non coinciden" #: ../tumblerd/tumbler-manager.c:908 ../tumblerd/tumbler-manager.c:922 #: ../tumblerd/tumbler-manager.c:936 #, c-format msgid "Malformed file \"%s\": %s" -msgstr "Ficheiro malformado \"%s\": %s" +msgstr "Ficheiro «%s» mal escrito: %s" #: ../tumblerd/tumbler-manager.c:962 #, c-format msgid "Failed to determine last modified time of \"%s\"" -msgstr "Produciuse un erro ao determinar a hora da última modificación de \"%s\"" +msgstr "Produciuse un erro ao determinar a hora da última modificación de «%s»" #: ../tumblerd/tumbler-manager.c:1868 #, c-format msgid "Another thumbnailer manager is already running" -msgstr "Xa está executando outro xestor de miniaturas" +msgstr "Xa se está executando outro xestor de miniaturas" #: ../tumblerd/main.c:249 msgid "Couldn't change nice value of process." @@ -98,7 +99,7 @@ #: ../tumblerd/main.c:280 #, c-format msgid "Failed to connect to the D-Bus session bus: %s" -msgstr "Produciuse un erro ó conectar co bus de sesión de D-BUS: %s" +msgstr "Produciuse un erro ao conectar co bus de sesión de D-BUS: %s" #: ../tumblerd/main.c:363 #, c-format @@ -135,27 +136,27 @@ #: ../tumbler/tumbler-cache-plugin.c:145 #, c-format msgid "Cache plugin \"%s\" lacks required symbols" -msgstr "O engadido de caché \"%s\" carece dos símbolos requiridos." +msgstr "O engadido de caché «%s» carece dos símbolos requiridos." #: ../tumbler/tumbler-cache-plugin.c:153 #, c-format msgid "Failed to load the cache plugin \"%s\": %s" -msgstr "Produciuse un erro ao cargar o engadido de caché \"%s\": %s" +msgstr "Produciuse un erro ao cargar o engadido de caché «%s»: %s" #: ../tumbler/tumbler-file-info.c:297 #, c-format msgid "The file \"%s\" is a thumbnail itself" -msgstr "O ficheiro \"%s\" xa é unha miniatura" +msgstr "O ficheiro «%s» xa é unha miniatura" #: ../tumbler/tumbler-provider-plugin.c:135 #, c-format msgid "Plugin \"%s\" lacks required symbols." -msgstr "O engadido \"%s\" carece dos símbolos requiridos." +msgstr "O engadido «%s» carece dos símbolos requiridos." #: ../tumbler/tumbler-provider-plugin.c:143 #, c-format msgid "Failed to load plugin \"%s\": %s" -msgstr "Fallo ao cargar o engadido \"%s\": %s" +msgstr "Fallo ao cargar o engadido «%s»: %s" #: ../plugins/cover-thumbnailer/cover-thumbnailer-plugin.c:59 #: ../plugins/gst-thumbnailer/gst-thumbnailer-plugin.c:59 @@ -174,22 +175,22 @@ #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:394 #, c-format msgid "Failed to load the poster image \"%s\"" -msgstr "" +msgstr "Produciuse un erro ao cargar a imaxe de póster «%s»" #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:430 #, c-format msgid "Failed to load the metadata from \"%s\"" -msgstr "Produciuse un erro ao cargar os metadatos desdes «%s»" +msgstr "Produciuse un erro ao cargar os metadatos desde «%s»" #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:626 msgid "" "Invalid API key, you must be granted a valid key. The Movie DB backend will " "be disabled." -msgstr "" +msgstr "A chave da API é incorrecta; ten que contar cunha chave válida. Vaise desactivar a infraestrutura de Movie DB." #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:634 msgid "No poster key found in metadata" -msgstr "" +msgstr "Non se atopou chave de póster nos metadatos" #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:689 msgid "Movie title is too short" @@ -199,31 +200,31 @@ #: ../plugins/font-thumbnailer/font-thumbnailer.c:463 #, c-format msgid "Could not initialize freetype: %s" -msgstr "Non se puido iniciar freetype: %s" +msgstr "Non foi posíbel iniciar freetype: %s" #. there was an error, emit error signal #: ../plugins/font-thumbnailer/font-thumbnailer.c:475 #, c-format msgid "Could not load file contents: %s" -msgstr "Non foi posible cargar o ficheiro: %s" +msgstr "Non foi posíbel cargar o ficheiro: %s" #. the font file could not be loaded, emit an error signal #: ../plugins/font-thumbnailer/font-thumbnailer.c:494 #, c-format msgid "Could not open font file: %s" -msgstr "Non se puido cargar o ficheiro de tipo de letra: %s" +msgstr "Non foi posíbel cargar o ficheiro de tipo de letra: %s" #. emit an error signal #: ../plugins/font-thumbnailer/font-thumbnailer.c:518 #, c-format msgid "Could not set the character map: %s" -msgstr "Non se puido definir o mapa de caracteres: %s" +msgstr "Non foi posíbel definir o mapa de caracteres: %s" #. emit an error signal #: ../plugins/font-thumbnailer/font-thumbnailer.c:545 #, c-format msgid "Could not render glyphs: %s" -msgstr "Non foi posible debuxar os glifos: %s" +msgstr "Non foi posíbel debuxar os glifos: %s" #: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer.c:864 #: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer.c:902 @@ -234,7 +235,7 @@ #: ../plugins/raw-thumbnailer/raw-thumbnailer.c:185 #, c-format msgid "Thumbnail could not be inferred from file contents" -msgstr "Non se puido obter a miniatura a partir do contido do ficheiro" +msgstr "Non foi posíbel obter a miniatura a partir do contido do ficheiro" #: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:317 msgid "The document is empty" @@ -242,7 +243,7 @@ #: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:329 msgid "First page of the document could not be read" -msgstr "Non foi posible ler a primeira páxina do documento" +msgstr "Non foi posíbel ler a primeira páxina do documento" #: ../plugins/raw-thumbnailer/raw-thumbnailer.c:191 msgid "Only local files are supported" @@ -251,4 +252,4 @@ #: ../plugins/xdg-cache/xdg-cache-thumbnail.c:382 #, c-format msgid "Could not save thumbnail to \"%s\"" -msgstr "Non se puido gardar a miniatura en \"%s\"" +msgstr "Non foi posíbel gardar a miniatura en «%s»" diff -Nru tumbler-0.1.31/po/he.po tumbler-0.1.90/po/he.po --- tumbler-0.1.31/po/he.po 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/po/he.po 2017-05-11 09:05:04.000000000 +0000 @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Elishai Eliyahu , 2016 # Hezy Amiel , 2010 # Yaron Shahrabani , 2010,2013 msgid "" @@ -10,9 +11,9 @@ "Project-Id-Version: Tumbler\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-07-02 22:38+0200\n" -"PO-Revision-Date: 2013-11-06 08:14+0000\n" -"Last-Translator: Yaron Shahrabani \n" -"Language-Team: Hebrew (http://www.transifex.com/projects/p/xfce/language/he/)\n" +"PO-Revision-Date: 2016-03-07 20:12+0000\n" +"Last-Translator: Elishai Eliyahu \n" +"Language-Team: Hebrew (http://www.transifex.com/xfce/tumbler/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -32,12 +33,12 @@ #: ../tumblerd/tumbler-lifecycle-manager.c:208 msgid "The thumbnailer service is shutting down" -msgstr "שירות מטמון התמונות הממוזערות נכבה" +msgstr "שירות התמונות הממוזערות נכבה" #: ../tumblerd/tumbler-service.c:758 #, c-format msgid "Another generic thumbnailer is already running" -msgstr "שירות תמונות ממוזערות גנרי כבר פעיל" +msgstr "שירות תמונות ממוזערות גנרי אחר כבר פעיל" #: ../tumblerd/tumbler-service.c:867 msgid "Unsupported thumbnail flavor requested" @@ -45,7 +46,7 @@ #: ../tumblerd/tumbler-specialized-thumbnailer.c:485 msgid "Failed to call the specialized thumbnailer: timeout" -msgstr "אירע כשל בקריאה למנהל התמונות הממוזערות המיוחד: פג הזמן המוקצב" +msgstr "אירע כשל בקריאה למנהל התמונות הממוזערות המיוחד: תם הזמן המוקצב" #: ../tumblerd/tumbler-specialized-thumbnailer.c:494 #, c-format @@ -79,7 +80,7 @@ #: ../tumblerd/tumbler-manager.c:962 #, c-format msgid "Failed to determine last modified time of \"%s\"" -msgstr "אירע כשל במציאת זמן העדכון האחרון של \"%s\"" +msgstr "אירע כשל במציאת זמן השינוי האחרון של \"%s\"" #: ../tumblerd/tumbler-manager.c:1868 #, c-format @@ -98,31 +99,31 @@ #: ../tumblerd/main.c:280 #, c-format msgid "Failed to connect to the D-Bus session bus: %s" -msgstr "Failed to connect to the D-Bus session bus: %s" +msgstr "אירע כשל בחיבור אל אפיק סשן אפיק די: %s" #: ../tumblerd/main.c:363 #, c-format msgid "Failed to load specialized thumbnailers into the registry: %s" -msgstr "Failed to load specialized thumbnailers into the registry: %s" +msgstr "אירע כשל בטעינת מנהלי תמונות ממוזערות מיוחדים לתוך מאגר הרישום: %s " #: ../tumblerd/main.c:375 #, c-format msgid "Failed to start the thumbnail cache service: %s" -msgstr "Failed to start the thumbnail cache service: %s" +msgstr "אירע כשל בהפעלת שירות מטמון תמונות ממוזערות: %s " #: ../tumblerd/main.c:385 #, c-format msgid "Failed to start the thumbnailer manager: %s" -msgstr "Failed to start the thumbnailer manager: %s" +msgstr "אירע כשל בהפעלת מנהל תמונות ממוזערות: %s " #: ../tumblerd/main.c:395 #, c-format msgid "Failed to start the thumbnailer service: %s" -msgstr "Failed to start the thumbnailer service: %s" +msgstr "אירע כשל בהפעלת שירות תמונות ממוזערות: %s " #: ../tumbler/tumbler-enum-types.c:49 msgid "Invalid format" -msgstr "המבנה שגוי" +msgstr "פורמט לא חוקי" #: ../tumbler/tumbler-enum-types.c:50 msgid "PNG" @@ -223,7 +224,7 @@ #: ../plugins/font-thumbnailer/font-thumbnailer.c:545 #, c-format msgid "Could not render glyphs: %s" -msgstr "לא ניתן לעבד את האותיות: %s" +msgstr "לא ניתן לממש את הגליפים: %s" #: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer.c:864 #: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer.c:902 diff -Nru tumbler-0.1.31/po/hr.po tumbler-0.1.90/po/hr.po --- tumbler-0.1.31/po/hr.po 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/po/hr.po 2017-05-11 09:05:04.000000000 +0000 @@ -3,16 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# schizo , 2014 +# Edin Veskovic , 2014 # Ivica Kolić , 2013-2014 msgid "" msgstr "" "Project-Id-Version: Tumbler\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-07-02 22:38+0200\n" -"PO-Revision-Date: 2014-03-12 17:55+0000\n" +"PO-Revision-Date: 2017-02-25 22:24+0000\n" "Last-Translator: Ivica Kolić \n" -"Language-Team: Croatian (http://www.transifex.com/projects/p/xfce/language/hr/)\n" +"Language-Team: Croatian (http://www.transifex.com/xfce/tumbler/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru tumbler-0.1.31/po/is.po tumbler-0.1.90/po/is.po --- tumbler-0.1.31/po/is.po 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/po/is.po 2017-05-11 09:05:04.000000000 +0000 @@ -1,55 +1,56 @@ -# translation of is.po to Icelandic +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# -# Sveinn í Felli , 2011, 2012. +# +# Translators: +# Sveinn í Felli , 2014-2015 +# Sveinn í Felli , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: is\n" +"Project-Id-Version: Tumbler\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-05 03:00+0000\n" -"PO-Revision-Date: 2012-07-02 15:25+0000\n" -"Last-Translator: Sveinn í Felli \n" -"Language-Team: Icelandic \n" +"POT-Creation-Date: 2013-07-02 22:38+0200\n" +"PO-Revision-Date: 2015-12-13 12:46+0000\n" +"Last-Translator: Sveinn í Felli \n" +"Language-Team: Icelandic (http://www.transifex.com/xfce/tumbler/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" -"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: KBabel 1.11.4\n" +"Language: is\n" +"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" #: ../tumblerd/tumbler-cache-service.c:413 #, c-format msgid "Another thumbnail cache service is already running" -msgstr "" +msgstr "Önnur smámyndagerðarþjónusta er þegar í keyrslu" -#: ../tumblerd/tumbler-group-scheduler.c:485 -#: ../tumblerd/tumbler-lifo-scheduler.c:421 +#: ../tumblerd/tumbler-group-scheduler.c:486 +#: ../tumblerd/tumbler-lifo-scheduler.c:422 #, c-format msgid "No thumbnailer available for \"%s\"" -msgstr "" +msgstr "Ekkert smámyndagerðaforrit til fyrir \"%s\"" -#: ../tumblerd/tumbler-lifecycle-manager.c:207 +#: ../tumblerd/tumbler-lifecycle-manager.c:208 msgid "The thumbnailer service is shutting down" -msgstr "" +msgstr "Þjónustu fyrir gerð smámynda er að slökkva á sér" #: ../tumblerd/tumbler-service.c:758 #, c-format msgid "Another generic thumbnailer is already running" -msgstr "" +msgstr "Annað almennt smámyndagerðarforrit er þegar í keyrslu" #: ../tumblerd/tumbler-service.c:867 msgid "Unsupported thumbnail flavor requested" -msgstr "" +msgstr "Beðið um óstutt snið smámyndar" -#: ../tumblerd/tumbler-specialized-thumbnailer.c:461 +#: ../tumblerd/tumbler-specialized-thumbnailer.c:485 msgid "Failed to call the specialized thumbnailer: timeout" -msgstr "" +msgstr "Mistókst að hlaða inn sértæku smámyndagerðaforriti: féll á tíma" -#: ../tumblerd/tumbler-specialized-thumbnailer.c:470 +#: ../tumblerd/tumbler-specialized-thumbnailer.c:494 #, c-format msgid "Failed to call the specialized thumbnailer: %s" -msgstr "" +msgstr "Mistókst að hlaða inn sértæku smámyndagerðaforriti: %s" #: ../tumblerd/tumbler-manager.c:489 ../tumblerd/tumbler-manager.c:895 #, c-format @@ -60,14 +61,14 @@ #: ../tumblerd/tumbler-manager.c:535 #, c-format msgid "Malformed section \"%s\" in file \"%s\": %s" -msgstr "" +msgstr "Rangt formaður hluti \"%s\" í skrá \"%s\": %s" #: ../tumblerd/tumbler-manager.c:548 #, c-format msgid "" "Malformed section \"%s\" in file \"%s\": Mismatch between section name and " "UriScheme/MimeType" -msgstr "" +msgstr "Rangt formaður hluti \"%s\" í skrá \"%s\": Ekki er samsvörun á milli nafns hluta og UriScheme/MimeType" #: ../tumblerd/tumbler-manager.c:908 ../tumblerd/tumbler-manager.c:922 #: ../tumblerd/tumbler-manager.c:936 @@ -78,42 +79,46 @@ #: ../tumblerd/tumbler-manager.c:962 #, c-format msgid "Failed to determine last modified time of \"%s\"" -msgstr "" +msgstr "Tókst ekki að finna síðasta breytingartíma \"%s\"" -#: ../tumblerd/tumbler-manager.c:1863 +#: ../tumblerd/tumbler-manager.c:1868 #, c-format msgid "Another thumbnailer manager is already running" -msgstr "" +msgstr "Annað eintak smámyndagerðar er þegar í keyrslu" + +#: ../tumblerd/main.c:249 +msgid "Couldn't change nice value of process." +msgstr "Gat ekki breytt forgangsgildi (nice value) ferlis." #. set the application name. Translators: Don't translate "Tumbler". -#: ../tumblerd/main.c:83 +#: ../tumblerd/main.c:258 msgid "Tumbler Thumbnailing Service" -msgstr "" +msgstr "Tumbler smámyndaþjónusta" -#: ../tumblerd/main.c:98 +#: ../tumblerd/main.c:280 #, c-format msgid "Failed to connect to the D-Bus session bus: %s" -msgstr "" +msgstr "Mistókst að tengjast D-BUS seturásinni: %s" -#: ../tumblerd/main.c:156 +#: ../tumblerd/main.c:363 #, c-format msgid "Failed to load specialized thumbnailers into the registry: %s" -msgstr "" +msgstr "Mistókst að hlaða inn sértækum smámyndagerðaforritum í kerfisskrá (registry): %s" -#: ../tumblerd/main.c:173 +#: ../tumblerd/main.c:375 #, c-format msgid "Failed to start the thumbnail cache service: %s" -msgstr "" +msgstr "Mistókst að ræsa þjónustu fyrir skyndiminni smámynda: %s" -#: ../tumblerd/main.c:190 +#: ../tumblerd/main.c:385 #, c-format msgid "Failed to start the thumbnailer manager: %s" -msgstr "" +msgstr "Mistókst að ræsa smámyndastýringu: %s" -#: ../tumblerd/main.c:207 +#: ../tumblerd/main.c:395 #, c-format msgid "Failed to start the thumbnailer service: %s" -msgstr "" +msgstr "Mistókst að ræsa þjónustu fyrir gerð smámynda: %s" #: ../tumbler/tumbler-enum-types.c:49 msgid "Invalid format" @@ -130,28 +135,29 @@ #: ../tumbler/tumbler-cache-plugin.c:145 #, c-format msgid "Cache plugin \"%s\" lacks required symbols" -msgstr "" +msgstr "Skyndiminnisviðbótina \"%s\" vantar nauðsynleg tákn" #: ../tumbler/tumbler-cache-plugin.c:153 #, c-format msgid "Failed to load the cache plugin \"%s\": %s" -msgstr "" +msgstr "Mistókst að hlaða inn skyndiminnisviðbótinni \"%s\": %s" #: ../tumbler/tumbler-file-info.c:297 #, c-format msgid "The file \"%s\" is a thumbnail itself" -msgstr "" +msgstr "Skráin \"%s\" er sjálf smámynd" #: ../tumbler/tumbler-provider-plugin.c:135 #, c-format msgid "Plugin \"%s\" lacks required symbols." -msgstr "" +msgstr "Viðbótina \"%s\" vantar nauðsynleg tákn." #: ../tumbler/tumbler-provider-plugin.c:143 #, c-format msgid "Failed to load plugin \"%s\": %s" msgstr "Mistókst að hlaða inn viðbótinni \"%s\": %s" +#: ../plugins/cover-thumbnailer/cover-thumbnailer-plugin.c:59 #: ../plugins/gst-thumbnailer/gst-thumbnailer-plugin.c:59 #: ../plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c:57 #: ../plugins/font-thumbnailer/font-thumbnailer-plugin.c:57 @@ -163,38 +169,37 @@ #: ../plugins/xdg-cache/xdg-cache-plugin.c:52 #, c-format msgid "Version mismatch: %s" -msgstr "Mismunandi útgáfur: %s" - -#: ../plugins/gst-thumbnailer/gst-thumbnailer-plugin.c:64 -msgid "Initializing the Tumbler GStreamer Thumbnailer plugin" -msgstr "" +msgstr "Ósamræmi í útgáfum: %s" -#: ../plugins/gst-thumbnailer/gst-thumbnailer-plugin.c:81 -msgid "Shutting down the Tumbler GStreamer Thumbnailer plugin" -msgstr "" - -#: ../plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c:62 -msgid "Initializing the Tumbler Pixbuf Thumbnailer plugin" -msgstr "" - -#: ../plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c:79 -#: ../plugins/poppler-thumbnailer/poppler-thumbnailer-plugin.c:79 -msgid "Shutting down the Tumbler Pixbuf Thumbnailer plugin" -msgstr "" +#: ../plugins/cover-thumbnailer/cover-thumbnailer.c:394 +#, c-format +msgid "Failed to load the poster image \"%s\"" +msgstr "Gat ekki lesið inn kynningarmyndina \"%s\"" -#: ../plugins/font-thumbnailer/font-thumbnailer-plugin.c:62 -msgid "Initializing the Tumbler Font Thumbnailer plugin" -msgstr "" +#: ../plugins/cover-thumbnailer/cover-thumbnailer.c:430 +#, c-format +msgid "Failed to load the metadata from \"%s\"" +msgstr "Mistókst að hlaða inn lýsigögnum úr \"%s\"" -#: ../plugins/font-thumbnailer/font-thumbnailer-plugin.c:79 -msgid "Shutting down the Tumbler Font Thumbnailer plugin" -msgstr "" +#: ../plugins/cover-thumbnailer/cover-thumbnailer.c:626 +msgid "" +"Invalid API key, you must be granted a valid key. The Movie DB backend will " +"be disabled." +msgstr "Ógildur API lykill, þú verður að hafa gildan lykil. Kvikmyndagagnagrunnurinn verður gerður óvirkur." + +#: ../plugins/cover-thumbnailer/cover-thumbnailer.c:634 +msgid "No poster key found in metadata" +msgstr "Engin lykill fyrir kynningarspjald fannst í lýsigögnum" + +#: ../plugins/cover-thumbnailer/cover-thumbnailer.c:689 +msgid "Movie title is too short" +msgstr "Titill kvikmyndar er of stuttur" #. there was an error in the freetype initialization, abort #: ../plugins/font-thumbnailer/font-thumbnailer.c:463 #, c-format msgid "Could not initialize freetype: %s" -msgstr "" +msgstr "Gat ekki frumstillt freetype: %s" #. there was an error, emit error signal #: ../plugins/font-thumbnailer/font-thumbnailer.c:475 @@ -220,8 +225,8 @@ msgid "Could not render glyphs: %s" msgstr "Gat ekki myndgert tákn (glyphs): %s" -#: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer.c:783 -#: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer.c:821 +#: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer.c:864 +#: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer.c:902 #: ../plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer.c:210 #: ../plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer.c:227 #: ../plugins/odf-thumbnailer/odf-thumbnailer.c:257 @@ -229,66 +234,21 @@ #: ../plugins/raw-thumbnailer/raw-thumbnailer.c:185 #, c-format msgid "Thumbnail could not be inferred from file contents" -msgstr "" - -#: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer-plugin.c:62 -msgid "Initializing the Tumbler JPEG Thumbnailer plugin" -msgstr "" - -#: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer-plugin.c:79 -msgid "Shutting down the Tumbler JPEG Thumbnailer plugin" -msgstr "" - -#: ../plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-plugin.c:63 -msgid "Initializing the Tumbler ffmpeg video thumbnailer plugin" -msgstr "" - -#: ../plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-plugin.c:80 -msgid "Shutting down the Tumbler ffmpeg video thumbnailer plugin" -msgstr "" - -#: ../plugins/odf-thumbnailer/odf-thumbnailer-plugin.c:64 -msgid "Initializing the Tumbler ODF Thumbnailer plugin" -msgstr "" +msgstr "Ekki var hægt að útbúa smámynd út frá innihaldi skráar" -#: ../plugins/odf-thumbnailer/odf-thumbnailer-plugin.c:81 -msgid "Shutting down the Tumbler ODF Thumbnailer plugin" -msgstr "" - -#: ../plugins/poppler-thumbnailer/poppler-thumbnailer-plugin.c:62 -msgid "Initializing the Tumbler Poppler PDF/PS Thumbnailer plugin" -msgstr "" - -#: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:305 +#: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:317 msgid "The document is empty" msgstr "Skráin er tóm" -#: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:317 +#: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:329 msgid "First page of the document could not be read" -msgstr "" +msgstr "Ekki var hægt að lesa fyrstu síðu skjalsins" #: ../plugins/raw-thumbnailer/raw-thumbnailer.c:191 msgid "Only local files are supported" msgstr "Aðeins er stuðningur við skrár á þessu skráakerfi" -#: ../plugins/raw-thumbnailer/raw-thumbnailer-plugin.c:62 -msgid "Initializing the Tumbler RAW Thumbnailer plugin" -msgstr "" - -#: ../plugins/raw-thumbnailer/raw-thumbnailer-plugin.c:79 -msgid "Shutting down the Tumbler RAW Thumbnailer plugin" -msgstr "" - #: ../plugins/xdg-cache/xdg-cache-thumbnail.c:382 #, c-format msgid "Could not save thumbnail to \"%s\"" msgstr "Gat ekki vistað smámynd í \"%s\"" - -#: ../plugins/xdg-cache/xdg-cache-plugin.c:57 -msgid "Initializing the Tumbler XDG cache plugin" -msgstr "" - -#: ../plugins/xdg-cache/xdg-cache-plugin.c:71 -msgid "Shutting down the Tumbler XDG cache plugin" -msgstr "" - diff -Nru tumbler-0.1.31/po/lt.po tumbler-0.1.90/po/lt.po --- tumbler-0.1.31/po/lt.po 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/po/lt.po 2017-05-11 09:05:04.000000000 +0000 @@ -4,14 +4,15 @@ # # Translators: # Algimantas Margevičius , 2012 +# Moo, 2015-2016 msgid "" msgstr "" "Project-Id-Version: Tumbler\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-07-02 22:38+0200\n" -"PO-Revision-Date: 2013-11-19 12:27+0000\n" -"Last-Translator: Nick \n" -"Language-Team: Lithuanian (http://www.transifex.com/projects/p/xfce/language/lt/)\n" +"PO-Revision-Date: 2016-03-17 18:15+0000\n" +"Last-Translator: Moo\n" +"Language-Team: Lithuanian (http://www.transifex.com/xfce/tumbler/language/lt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -87,7 +88,7 @@ #: ../tumblerd/main.c:249 msgid "Couldn't change nice value of process." -msgstr "" +msgstr "Nepavyko pakeisti proceso nice reikšmės." #. set the application name. Translators: Don't translate "Tumbler". #: ../tumblerd/main.c:258 @@ -112,7 +113,7 @@ #: ../tumblerd/main.c:385 #, c-format msgid "Failed to start the thumbnailer manager: %s" -msgstr "Nepavyko paleisti miniatiūrų kūrimo tvarkyklės: %s" +msgstr "Nepavyko paleisti miniatiūrų kūrimo tvarkytuvės: %s" #: ../tumblerd/main.c:395 #, c-format @@ -173,26 +174,26 @@ #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:394 #, c-format msgid "Failed to load the poster image \"%s\"" -msgstr "" +msgstr "Nepavyko įkelti plakato paveikslo \"%s\"" #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:430 #, c-format msgid "Failed to load the metadata from \"%s\"" -msgstr "" +msgstr "Nepavyko įkelti meta duomenų iš \"%s\"" #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:626 msgid "" "Invalid API key, you must be granted a valid key. The Movie DB backend will " "be disabled." -msgstr "" +msgstr "Neteisingas API raktas, jums privalo būti suteiktas teisingas raktas. Filmų DB vidinė pusė bus išjungta." #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:634 msgid "No poster key found in metadata" -msgstr "" +msgstr "Meta duomenyse nerastas plakato raktas" #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:689 msgid "Movie title is too short" -msgstr "" +msgstr "Filmo pavadinimas yra pernelyg trumpas" #. there was an error in the freetype initialization, abort #: ../plugins/font-thumbnailer/font-thumbnailer.c:463 @@ -250,4 +251,4 @@ #: ../plugins/xdg-cache/xdg-cache-thumbnail.c:382 #, c-format msgid "Could not save thumbnail to \"%s\"" -msgstr "Nepavyko išsaugoti miniatiūros „%s“" +msgstr "Nepavyko įrašyti miniatiūros „%s“" diff -Nru tumbler-0.1.31/po/Makefile.in.in tumbler-0.1.90/po/Makefile.in.in --- tumbler-0.1.31/po/Makefile.in.in 2015-02-28 16:28:09.000000000 +0000 +++ tumbler-0.1.90/po/Makefile.in.in 2017-05-11 09:08:31.000000000 +0000 @@ -80,7 +80,7 @@ .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox + $(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< diff -Nru tumbler-0.1.31/po/sv.po tumbler-0.1.90/po/sv.po --- tumbler-0.1.31/po/sv.po 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/po/sv.po 2017-05-11 09:05:04.000000000 +0000 @@ -4,14 +4,15 @@ # # Translators: # Daniel Nylander , 2009-2010 +# Påvel Nicklasson, 2015 msgid "" msgstr "" "Project-Id-Version: Tumbler\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-07-02 22:38+0200\n" -"PO-Revision-Date: 2014-02-20 22:16+0000\n" -"Last-Translator: PavelNicklasson \n" -"Language-Team: Swedish (http://www.transifex.com/projects/p/xfce/language/sv/)\n" +"PO-Revision-Date: 2016-04-24 20:20+0000\n" +"Last-Translator: Påvel Nicklasson \n" +"Language-Team: Swedish (http://www.transifex.com/xfce/tumbler/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -87,7 +88,7 @@ #: ../tumblerd/main.c:249 msgid "Couldn't change nice value of process." -msgstr "Kunde inte ändra fint värde för process." +msgstr "Det gick inte att ändra fint värde för process." #. set the application name. Translators: Don't translate "Tumbler". #: ../tumblerd/main.c:258 @@ -192,37 +193,37 @@ #: ../plugins/cover-thumbnailer/cover-thumbnailer.c:689 msgid "Movie title is too short" -msgstr "Filmtitel är för kort" +msgstr "Filmnamn är för kort" #. there was an error in the freetype initialization, abort #: ../plugins/font-thumbnailer/font-thumbnailer.c:463 #, c-format msgid "Could not initialize freetype: %s" -msgstr "Kunde inte initiera freetype: %s" +msgstr "Det gick inte att initiera freetype: %s" #. there was an error, emit error signal #: ../plugins/font-thumbnailer/font-thumbnailer.c:475 #, c-format msgid "Could not load file contents: %s" -msgstr "Kunde inte läsa in filens innehåll: %s" +msgstr "Det gick inte att läsa in filinnehåll: %s" #. the font file could not be loaded, emit an error signal #: ../plugins/font-thumbnailer/font-thumbnailer.c:494 #, c-format msgid "Could not open font file: %s" -msgstr "Kunde inte öppna typsnittsfilen: %s" +msgstr "Det gick inte att öppna typsnittsfil: %s" #. emit an error signal #: ../plugins/font-thumbnailer/font-thumbnailer.c:518 #, c-format msgid "Could not set the character map: %s" -msgstr "Kunde inte ställa in teckenuppsättningen: %s" +msgstr "Det gick inte att ställa in teckenuppsättningen: %s" #. emit an error signal #: ../plugins/font-thumbnailer/font-thumbnailer.c:545 #, c-format msgid "Could not render glyphs: %s" -msgstr "Kunde inte rendera glyfer: %s" +msgstr "Det gick inte att rendera glyfer: %s" #: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer.c:864 #: ../plugins/jpeg-thumbnailer/jpeg-thumbnailer.c:902 @@ -233,7 +234,7 @@ #: ../plugins/raw-thumbnailer/raw-thumbnailer.c:185 #, c-format msgid "Thumbnail could not be inferred from file contents" -msgstr "Miniatyrbilder kunde inte tas från filinnehållet" +msgstr "Miniatyrbilder kunde inte tas från filinnehåll" #: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:317 msgid "The document is empty" @@ -241,7 +242,7 @@ #: ../plugins/poppler-thumbnailer/poppler-thumbnailer.c:329 msgid "First page of the document could not be read" -msgstr "Första sidan i dokumentet kunde inte läsas" +msgstr "Dokumentets första sida kunde inte läsas" #: ../plugins/raw-thumbnailer/raw-thumbnailer.c:191 msgid "Only local files are supported" @@ -250,4 +251,4 @@ #: ../plugins/xdg-cache/xdg-cache-thumbnail.c:382 #, c-format msgid "Could not save thumbnail to \"%s\"" -msgstr "Kunde inte spara miniatyrbild till \"%s\"" +msgstr "Det gick inte att spara miniatyrbild till \"%s\"" diff -Nru tumbler-0.1.31/README tumbler-0.1.90/README --- tumbler-0.1.31/README 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/README 2017-05-11 09:06:12.000000000 +0000 @@ -22,11 +22,9 @@ Tumbler depends on the following packages: - * glib-2.0 >= 2.16.0 - * gio-2.0 >= 2.16.0 - * gthread-2.0 >= 2.16.0 - * dbus-1 >= 1.0.0 - * dbus-glib-1 >= 0.72 + * glib-2.0 >= 2.26.0 + * gio-2.0 >= 2.26.0 + * gthread-2.0 >= 2.26.0 Tumbler can optionally use the following packages: diff -Nru tumbler-0.1.31/tumbler/Makefile.in tumbler-0.1.90/tumbler/Makefile.in --- tumbler-0.1.31/tumbler/Makefile.in 2015-02-28 16:28:14.000000000 +0000 +++ tumbler-0.1.90/tumbler/Makefile.in 2017-05-11 09:08:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -36,7 +36,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -101,14 +111,13 @@ host_triplet = @host@ target_triplet = @target@ subdir = tumbler -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/tumbler-1.pc.in $(srcdir)/tumbler-config.h.in \ - $(top_srcdir)/depcomp $(libtumblerinclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(libtumblerinclude_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = tumbler-1.pc tumbler-config.h @@ -234,6 +243,8 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/tumbler-1.pc.in \ + $(srcdir)/tumbler-config.h.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -259,11 +270,6 @@ CURL_LIBS = @CURL_LIBS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -280,11 +286,14 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ +GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ +GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ @@ -430,6 +439,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -555,7 +565,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tumbler/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu tumbler/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1022,6 +1031,8 @@ uninstall-libLTLIBRARIES uninstall-libtumblerincludeHEADERS \ uninstall-pkgconfigDATA +.PRECIOUS: Makefile + tumbler-marshal.h: stamp-tumbler-marshal.h @true diff -Nru tumbler-0.1.31/tumbler/tumbler-config.h tumbler-0.1.90/tumbler/tumbler-config.h --- tumbler-0.1.31/tumbler/tumbler-config.h 2015-02-28 16:28:19.000000000 +0000 +++ tumbler-0.1.90/tumbler/tumbler-config.h 2017-05-11 09:08:43.000000000 +0000 @@ -31,7 +31,7 @@ #define TUMBLER_MAJOR_VERSION 0 #define TUMBLER_MINOR_VERSION 1 -#define TUMBLER_MICRO_VERSION 31 +#define TUMBLER_MICRO_VERSION 90 #define TUMBLER_CHECK_VERSION(major,minor,micro) \ (TUMBLER_MAJOR_VERSION > (major) \ diff -Nru tumbler-0.1.31/tumbler/tumbler-marshal.c tumbler-0.1.90/tumbler/tumbler-marshal.c --- tumbler-0.1.31/tumbler/tumbler-marshal.c 2015-02-28 16:28:39.000000000 +0000 +++ tumbler-0.1.90/tumbler/tumbler-marshal.c 2017-05-11 09:08:44.000000000 +0000 @@ -64,9 +64,9 @@ gint arg_2, gpointer arg_3, gpointer data2); - register GMarshalFunc_VOID__STRING_INT_STRING callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; + GMarshalFunc_VOID__STRING_INT_STRING callback; + GCClosure *cc = (GCClosure*) closure; + gpointer data1, data2; g_return_if_fail (n_param_values == 4); @@ -104,9 +104,9 @@ gint arg_3, gpointer arg_4, gpointer data2); - register GMarshalFunc_VOID__UINT_STRING_INT_STRING callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; + GMarshalFunc_VOID__UINT_STRING_INT_STRING callback; + GCClosure *cc = (GCClosure*) closure; + gpointer data1, data2; g_return_if_fail (n_param_values == 5); @@ -146,9 +146,9 @@ gpointer arg_4, gpointer arg_5, gpointer data2); - register GMarshalFunc_VOID__UINT_BOXED_INT_STRING_STRING callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; + GMarshalFunc_VOID__UINT_BOXED_INT_STRING_STRING callback; + GCClosure *cc = (GCClosure*) closure; + gpointer data1, data2; g_return_if_fail (n_param_values == 6); @@ -189,9 +189,9 @@ gpointer arg_2, gpointer arg_3, gpointer data2); - register GMarshalFunc_VOID__UINT_BOXED_STRING callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; + GMarshalFunc_VOID__UINT_BOXED_STRING callback; + GCClosure *cc = (GCClosure*) closure; + gpointer data1, data2; g_return_if_fail (n_param_values == 4); @@ -227,9 +227,9 @@ guint arg_1, gpointer arg_2, gpointer data2); - register GMarshalFunc_VOID__UINT_STRING callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; + GMarshalFunc_VOID__UINT_STRING callback; + GCClosure *cc = (GCClosure*) closure; + gpointer data1, data2; g_return_if_fail (n_param_values == 3); @@ -266,9 +266,9 @@ gint arg_3, gpointer arg_4, gpointer data2); - register GMarshalFunc_VOID__UINT_POINTER_INT_STRING callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; + GMarshalFunc_VOID__UINT_POINTER_INT_STRING callback; + GCClosure *cc = (GCClosure*) closure; + gpointer data1, data2; g_return_if_fail (n_param_values == 5); diff -Nru tumbler-0.1.31/tumblerd/main.c tumbler-0.1.90/tumblerd/main.c --- tumbler-0.1.31/tumblerd/main.c 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/tumblerd/main.c 2017-05-11 09:06:12.000000000 +0000 @@ -1,7 +1,8 @@ /* vi:set et ai sw=2 sts=2 ts=2: */ /*- * Copyright (c) 2009-2012 Jannis Pohlmann - * + * Copyright (c) 2015 Ali Abdallah + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of @@ -38,8 +39,6 @@ #include #include -#include - #include #include @@ -214,7 +213,17 @@ return locations; } +static void +on_dbus_name_lost (GDBusConnection *connection, + const gchar *name, + gpointer user_data) +{ + GMainLoop *main_loop; + g_critical (_("Name %s lost on the message dbus, exiting."),name); + main_loop = (GMainLoop*)user_data; + g_main_loop_quit(main_loop); +} int main (int argc, @@ -222,7 +231,7 @@ { TumblerLifecycleManager *lifecycle_manager; TumblerProviderFactory *provider_factory; - DBusGConnection *connection; + GDBusConnection *connection; TumblerRegistry *registry; TumblerManager *manager; TumblerService *service; @@ -268,21 +277,17 @@ g_thread_init (NULL); #endif - /* initial the D-Bus threading system */ - dbus_g_thread_init (); - - /* try to connect to the D-Bus session bus */ - connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); - /* print an error and exit if the connection could not be established */ - if (connection == NULL) + connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); + + if (error != NULL) { - g_warning (_("Failed to connect to the D-Bus session bus: %s"), error->message); + g_critical ("error getting session bus: %s", error->message); g_error_free (error); - - return EXIT_FAILURE; + + return EXIT_FAILURE; } - + /* create the lifecycle manager */ lifecycle_manager = tumbler_lifecycle_manager_new (); @@ -369,49 +374,57 @@ goto exit_tumbler; } - /* try to start the service and exit if that fails */ - if (!tumbler_cache_service_start (cache_service, &error)) - { - g_warning (_("Failed to start the thumbnail cache service: %s"), error->message); - g_error_free (error); - - /* service already running, exit gracefully to not break clients */ - goto exit_tumbler; - } - - /* try to start the service and exit if that fails */ - if (!tumbler_manager_start (manager, &error)) - { - g_warning (_("Failed to start the thumbnailer manager: %s"), error->message); - g_error_free (error); - - /* service already running, exit gracefully to not break clients */ - goto exit_tumbler; - } - - /* try to start the service and exit if that fails */ - if (!tumbler_service_start (service, &error)) - { - g_warning (_("Failed to start the thumbnailer service: %s"), error->message); - g_error_free (error); - - /* service already running, exit gracefully to not break clients */ - goto exit_tumbler; - } - /* create a new main loop */ main_loop = g_main_loop_new (NULL, FALSE); + + + /* Acquire the cache service dbus name */ + g_bus_own_name_on_connection (connection, + "org.freedesktop.thumbnails.Cache1", + G_BUS_NAME_OWNER_FLAGS_REPLACE, + NULL, /* We dont need to do anything on name acquired*/ + on_dbus_name_lost, + main_loop, + NULL); + + /* Acquire the manager dbus name */ + g_bus_own_name_on_connection (connection, + "org.freedesktop.thumbnails.Manager1", + G_BUS_NAME_OWNER_FLAGS_REPLACE, + NULL, /* We dont need to do anything on name acquired*/ + on_dbus_name_lost, + main_loop, + NULL); + + /* Acquire the thumbnailer service dbus name */ + g_bus_own_name_on_connection (connection, + "org.freedesktop.thumbnails.Thumbnailer1", + G_BUS_NAME_OWNER_FLAGS_REPLACE, + NULL, /* We dont need to do anything on name acquired*/ + on_dbus_name_lost, + main_loop, + NULL); + + /* check to see if all services are successfully exported on the bus */ + if (tumbler_manager_is_exported(manager) && + tumbler_service_is_exported(service) && + tumbler_cache_service_is_exported(cache_service)) + { + /* Let the manager initializes the thumbnailer + * directory objects, directory monitors */ + tumbler_manager_load (manager); + + /* quit the main loop when the lifecycle manager asks us to shut down */ + g_signal_connect (lifecycle_manager, "shutdown", + G_CALLBACK (shutdown_tumbler), main_loop); - /* quit the main loop when the lifecycle manager asks us to shut down */ - g_signal_connect (lifecycle_manager, "shutdown", - G_CALLBACK (shutdown_tumbler), main_loop); - - /* start the lifecycle manager */ - tumbler_lifecycle_manager_start (lifecycle_manager); - - /* enter the main loop, thereby making the tumbler service available */ - g_main_loop_run (main_loop); + /* start the lifecycle manager */ + tumbler_lifecycle_manager_start (lifecycle_manager); + /* enter the main loop, thereby making the tumbler service available */ + g_main_loop_run (main_loop); + } + exit_tumbler: /* shut our services down and release all objects */ @@ -421,8 +434,8 @@ g_object_unref (registry); g_object_unref (lifecycle_manager); - /* disconnect from the D-Bus session bus */ - dbus_g_connection_unref (connection); + /* free the dbus session bus connection */ + g_object_unref (connection); /* we're done, all fine */ return retval; diff -Nru tumbler-0.1.31/tumblerd/Makefile.am tumbler-0.1.90/tumblerd/Makefile.am --- tumbler-0.1.31/tumblerd/Makefile.am 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/tumblerd/Makefile.am 2017-05-11 09:06:12.000000000 +0000 @@ -24,9 +24,13 @@ tumblerd tumblerd_built_sources = \ - tumbler-cache-service-dbus-bindings.h \ - tumbler-manager-dbus-bindings.h \ - tumbler-service-dbus-bindings.h + tumbler-manager-gdbus.c \ + tumbler-manager-gdbus.h \ + tumbler-service-gdbus.c \ + tumbler-service-gdbus.h \ + tumbler-cache-service-gdbus.h \ + tumbler-cache-service-gdbus.c + tumblerd_SOURCES = \ main.c \ @@ -57,10 +61,9 @@ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ -DG_LOG_DOMAIN=\"tumblerd\" \ -I$(top_srcdir) \ - $(DBUS_CFLAGS) \ - $(DBUS_GLIB_CFLAGS) \ $(GDK_PIXBUF_CFLAGS) \ $(GIO_CFLAGS) \ + $(GIO_UNIX_CFLAGS) \ $(GLIB_CFLAGS) \ $(GTHREAD_CFLAGS) \ $(PLATFORM_CFLAGS) \ @@ -74,10 +77,9 @@ $(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la tumblerd_LDADD = \ - $(DBUS_LIBS) \ - $(DBUS_GLIB_LIBS) \ $(GDK_PIXBUF_LIBS) \ $(GIO_LIBS) \ + $(GIO_UNIX_LIBS) \ $(GLIB_LIBS) \ $(GTHREAD_LIBS) \ $(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la @@ -114,11 +116,26 @@ BUILT_SOURCES = \ $(tumblerd_built_sources) -tumbler-cache-service-dbus-bindings.h: tumbler-cache-service-dbus.xml Makefile - $(AM_V_GEN) $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=tumbler_cache_service $< > $@ - -tumbler-manager-dbus-bindings.h: tumbler-manager-dbus.xml Makefile - $(AM_V_GEN) $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=tumbler_manager $< > $@ - -tumbler-service-dbus-bindings.h: tumbler-service-dbus.xml Makefile - $(AM_V_GEN) $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=tumbler_service $< > $@ +tumbler-manager-gdbus.h: +tumbler-manager-gdbus.c: tumbler-manager-dbus.xml Makefile + $(AM_V_GEN) $(GDBUS_CODEGEN) \ + --interface-prefix org.freedesktop.thumbnails.Manager1 \ + --c-namespace Tumbler \ + --generate-c-code tumbler-manager-gdbus \ + $(srcdir)/tumbler-manager-dbus.xml + +tumbler-service-gdbus.h: +tumbler-service-gdbus.c: tumbler-service-dbus.xml Makefile + $(AM_V_GEN) $(GDBUS_CODEGEN) \ + --interface-prefix org.freedesktop.thumbnails.Thumbnailer1 \ + --c-namespace Tumbler \ + --generate-c-code tumbler-service-gdbus \ + $(srcdir)/tumbler-service-dbus.xml + +tumbler-cache-service-gdbus.h: +tumbler-cache-service-gdbus.c: tumbler-cache-service-dbus.xml Makefile + $(AM_V_GEN) $(GDBUS_CODEGEN) \ + --interface-prefix org.freedesktop.thumbnails.Cache1 \ + --c-namespace Tumbler \ + --generate-c-code tumbler-cache-service-gdbus \ + $(srcdir)/tumbler-cache-service-dbus.xml \ No newline at end of file diff -Nru tumbler-0.1.31/tumblerd/Makefile.in tumbler-0.1.90/tumblerd/Makefile.in --- tumbler-0.1.31/tumblerd/Makefile.in 2015-02-28 16:28:14.000000000 +0000 +++ tumbler-0.1.90/tumblerd/Makefile.in 2017-05-11 09:08:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -35,7 +35,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -101,13 +111,12 @@ target_triplet = @target@ tumblerd_PROGRAMS = tumblerd$(EXEEXT) subdir = tumblerd -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -115,7 +124,9 @@ am__installdirs = "$(DESTDIR)$(tumblerddir)" "$(DESTDIR)$(confdir)" \ "$(DESTDIR)$(servicedir)" PROGRAMS = $(tumblerd_PROGRAMS) -am__objects_1 = +am__objects_1 = tumblerd-tumbler-manager-gdbus.$(OBJEXT) \ + tumblerd-tumbler-service-gdbus.$(OBJEXT) \ + tumblerd-tumbler-cache-service-gdbus.$(OBJEXT) am_tumblerd_OBJECTS = tumblerd-main.$(OBJEXT) \ tumblerd-tumbler-cache-service.$(OBJEXT) \ tumblerd-tumbler-component.$(OBJEXT) \ @@ -224,6 +235,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -249,11 +261,6 @@ CURL_LIBS = @CURL_LIBS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ -DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@ -DBUS_CFLAGS = @DBUS_CFLAGS@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -270,11 +277,14 @@ FREETYPE_CFLAGS = @FREETYPE_CFLAGS@ FREETYPE_CONFIG = @FREETYPE_CONFIG@ FREETYPE_LIBS = @FREETYPE_LIBS@ +GDBUS_CODEGEN = @GDBUS_CODEGEN@ GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ +GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ +GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ @@ -420,6 +430,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -436,9 +447,12 @@ $(libdir)/tumbler-$(TUMBLER_VERSION_API) tumblerd_built_sources = \ - tumbler-cache-service-dbus-bindings.h \ - tumbler-manager-dbus-bindings.h \ - tumbler-service-dbus-bindings.h + tumbler-manager-gdbus.c \ + tumbler-manager-gdbus.h \ + tumbler-service-gdbus.c \ + tumbler-service-gdbus.h \ + tumbler-cache-service-gdbus.h \ + tumbler-cache-service-gdbus.c tumblerd_SOURCES = \ main.c \ @@ -469,10 +483,9 @@ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ -DG_LOG_DOMAIN=\"tumblerd\" \ -I$(top_srcdir) \ - $(DBUS_CFLAGS) \ - $(DBUS_GLIB_CFLAGS) \ $(GDK_PIXBUF_CFLAGS) \ $(GIO_CFLAGS) \ + $(GIO_UNIX_CFLAGS) \ $(GLIB_CFLAGS) \ $(GTHREAD_CFLAGS) \ $(PLATFORM_CFLAGS) \ @@ -486,10 +499,9 @@ $(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la tumblerd_LDADD = \ - $(DBUS_LIBS) \ - $(DBUS_GLIB_LIBS) \ $(GDK_PIXBUF_LIBS) \ $(GIO_LIBS) \ + $(GIO_UNIX_LIBS) \ $(GLIB_LIBS) \ $(GTHREAD_LIBS) \ $(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la @@ -538,7 +550,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tumblerd/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu tumblerd/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -617,14 +628,17 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tumblerd-main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tumblerd-tumbler-cache-service-gdbus.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tumblerd-tumbler-cache-service.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tumblerd-tumbler-component.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tumblerd-tumbler-group-scheduler.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tumblerd-tumbler-lifecycle-manager.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tumblerd-tumbler-lifo-scheduler.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tumblerd-tumbler-manager-gdbus.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tumblerd-tumbler-manager.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tumblerd-tumbler-registry.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tumblerd-tumbler-scheduler.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tumblerd-tumbler-service-gdbus.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tumblerd-tumbler-service.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tumblerd-tumbler-specialized-thumbnailer.Po@am__quote@ @@ -803,6 +817,48 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tumblerd_CFLAGS) $(CFLAGS) -c -o tumblerd-tumbler-group-scheduler.obj `if test -f 'tumbler-group-scheduler.c'; then $(CYGPATH_W) 'tumbler-group-scheduler.c'; else $(CYGPATH_W) '$(srcdir)/tumbler-group-scheduler.c'; fi` +tumblerd-tumbler-manager-gdbus.o: tumbler-manager-gdbus.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tumblerd_CFLAGS) $(CFLAGS) -MT tumblerd-tumbler-manager-gdbus.o -MD -MP -MF $(DEPDIR)/tumblerd-tumbler-manager-gdbus.Tpo -c -o tumblerd-tumbler-manager-gdbus.o `test -f 'tumbler-manager-gdbus.c' || echo '$(srcdir)/'`tumbler-manager-gdbus.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tumblerd-tumbler-manager-gdbus.Tpo $(DEPDIR)/tumblerd-tumbler-manager-gdbus.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tumbler-manager-gdbus.c' object='tumblerd-tumbler-manager-gdbus.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tumblerd_CFLAGS) $(CFLAGS) -c -o tumblerd-tumbler-manager-gdbus.o `test -f 'tumbler-manager-gdbus.c' || echo '$(srcdir)/'`tumbler-manager-gdbus.c + +tumblerd-tumbler-manager-gdbus.obj: tumbler-manager-gdbus.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tumblerd_CFLAGS) $(CFLAGS) -MT tumblerd-tumbler-manager-gdbus.obj -MD -MP -MF $(DEPDIR)/tumblerd-tumbler-manager-gdbus.Tpo -c -o tumblerd-tumbler-manager-gdbus.obj `if test -f 'tumbler-manager-gdbus.c'; then $(CYGPATH_W) 'tumbler-manager-gdbus.c'; else $(CYGPATH_W) '$(srcdir)/tumbler-manager-gdbus.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tumblerd-tumbler-manager-gdbus.Tpo $(DEPDIR)/tumblerd-tumbler-manager-gdbus.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tumbler-manager-gdbus.c' object='tumblerd-tumbler-manager-gdbus.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tumblerd_CFLAGS) $(CFLAGS) -c -o tumblerd-tumbler-manager-gdbus.obj `if test -f 'tumbler-manager-gdbus.c'; then $(CYGPATH_W) 'tumbler-manager-gdbus.c'; else $(CYGPATH_W) '$(srcdir)/tumbler-manager-gdbus.c'; fi` + +tumblerd-tumbler-service-gdbus.o: tumbler-service-gdbus.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tumblerd_CFLAGS) $(CFLAGS) -MT tumblerd-tumbler-service-gdbus.o -MD -MP -MF $(DEPDIR)/tumblerd-tumbler-service-gdbus.Tpo -c -o tumblerd-tumbler-service-gdbus.o `test -f 'tumbler-service-gdbus.c' || echo '$(srcdir)/'`tumbler-service-gdbus.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tumblerd-tumbler-service-gdbus.Tpo $(DEPDIR)/tumblerd-tumbler-service-gdbus.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tumbler-service-gdbus.c' object='tumblerd-tumbler-service-gdbus.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tumblerd_CFLAGS) $(CFLAGS) -c -o tumblerd-tumbler-service-gdbus.o `test -f 'tumbler-service-gdbus.c' || echo '$(srcdir)/'`tumbler-service-gdbus.c + +tumblerd-tumbler-service-gdbus.obj: tumbler-service-gdbus.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tumblerd_CFLAGS) $(CFLAGS) -MT tumblerd-tumbler-service-gdbus.obj -MD -MP -MF $(DEPDIR)/tumblerd-tumbler-service-gdbus.Tpo -c -o tumblerd-tumbler-service-gdbus.obj `if test -f 'tumbler-service-gdbus.c'; then $(CYGPATH_W) 'tumbler-service-gdbus.c'; else $(CYGPATH_W) '$(srcdir)/tumbler-service-gdbus.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tumblerd-tumbler-service-gdbus.Tpo $(DEPDIR)/tumblerd-tumbler-service-gdbus.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tumbler-service-gdbus.c' object='tumblerd-tumbler-service-gdbus.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tumblerd_CFLAGS) $(CFLAGS) -c -o tumblerd-tumbler-service-gdbus.obj `if test -f 'tumbler-service-gdbus.c'; then $(CYGPATH_W) 'tumbler-service-gdbus.c'; else $(CYGPATH_W) '$(srcdir)/tumbler-service-gdbus.c'; fi` + +tumblerd-tumbler-cache-service-gdbus.o: tumbler-cache-service-gdbus.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tumblerd_CFLAGS) $(CFLAGS) -MT tumblerd-tumbler-cache-service-gdbus.o -MD -MP -MF $(DEPDIR)/tumblerd-tumbler-cache-service-gdbus.Tpo -c -o tumblerd-tumbler-cache-service-gdbus.o `test -f 'tumbler-cache-service-gdbus.c' || echo '$(srcdir)/'`tumbler-cache-service-gdbus.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tumblerd-tumbler-cache-service-gdbus.Tpo $(DEPDIR)/tumblerd-tumbler-cache-service-gdbus.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tumbler-cache-service-gdbus.c' object='tumblerd-tumbler-cache-service-gdbus.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tumblerd_CFLAGS) $(CFLAGS) -c -o tumblerd-tumbler-cache-service-gdbus.o `test -f 'tumbler-cache-service-gdbus.c' || echo '$(srcdir)/'`tumbler-cache-service-gdbus.c + +tumblerd-tumbler-cache-service-gdbus.obj: tumbler-cache-service-gdbus.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tumblerd_CFLAGS) $(CFLAGS) -MT tumblerd-tumbler-cache-service-gdbus.obj -MD -MP -MF $(DEPDIR)/tumblerd-tumbler-cache-service-gdbus.Tpo -c -o tumblerd-tumbler-cache-service-gdbus.obj `if test -f 'tumbler-cache-service-gdbus.c'; then $(CYGPATH_W) 'tumbler-cache-service-gdbus.c'; else $(CYGPATH_W) '$(srcdir)/tumbler-cache-service-gdbus.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tumblerd-tumbler-cache-service-gdbus.Tpo $(DEPDIR)/tumblerd-tumbler-cache-service-gdbus.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tumbler-cache-service-gdbus.c' object='tumblerd-tumbler-cache-service-gdbus.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tumblerd_CFLAGS) $(CFLAGS) -c -o tumblerd-tumbler-cache-service-gdbus.obj `if test -f 'tumbler-cache-service-gdbus.c'; then $(CYGPATH_W) 'tumbler-cache-service-gdbus.c'; else $(CYGPATH_W) '$(srcdir)/tumbler-cache-service-gdbus.c'; fi` + mostlyclean-libtool: -rm -f *.lo @@ -1066,19 +1122,36 @@ tags tags-am uninstall uninstall-am uninstall-confDATA \ uninstall-serviceDATA uninstall-tumblerdPROGRAMS +.PRECIOUS: Makefile + %.service: %.service.in sed -e "s,\@libdir\@,$(libdir),g" \ -e "s,\@TUMBLER_VERSION_API\@,$(TUMBLER_VERSION_API),g" < $< > $@ -tumbler-cache-service-dbus-bindings.h: tumbler-cache-service-dbus.xml Makefile - $(AM_V_GEN) $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=tumbler_cache_service $< > $@ - -tumbler-manager-dbus-bindings.h: tumbler-manager-dbus.xml Makefile - $(AM_V_GEN) $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=tumbler_manager $< > $@ - -tumbler-service-dbus-bindings.h: tumbler-service-dbus.xml Makefile - $(AM_V_GEN) $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=tumbler_service $< > $@ +tumbler-manager-gdbus.h: +tumbler-manager-gdbus.c: tumbler-manager-dbus.xml Makefile + $(AM_V_GEN) $(GDBUS_CODEGEN) \ + --interface-prefix org.freedesktop.thumbnails.Manager1 \ + --c-namespace Tumbler \ + --generate-c-code tumbler-manager-gdbus \ + $(srcdir)/tumbler-manager-dbus.xml + +tumbler-service-gdbus.h: +tumbler-service-gdbus.c: tumbler-service-dbus.xml Makefile + $(AM_V_GEN) $(GDBUS_CODEGEN) \ + --interface-prefix org.freedesktop.thumbnails.Thumbnailer1 \ + --c-namespace Tumbler \ + --generate-c-code tumbler-service-gdbus \ + $(srcdir)/tumbler-service-dbus.xml + +tumbler-cache-service-gdbus.h: +tumbler-cache-service-gdbus.c: tumbler-cache-service-dbus.xml Makefile + $(AM_V_GEN) $(GDBUS_CODEGEN) \ + --interface-prefix org.freedesktop.thumbnails.Cache1 \ + --c-namespace Tumbler \ + --generate-c-code tumbler-cache-service-gdbus \ + $(srcdir)/tumbler-cache-service-dbus.xml # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru tumbler-0.1.31/tumblerd/tumbler-cache-service.c tumbler-0.1.90/tumblerd/tumbler-cache-service.c --- tumbler-0.1.31/tumblerd/tumbler-cache-service.c 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-cache-service.c 2017-05-11 09:06:12.000000000 +0000 @@ -25,19 +25,18 @@ #include #include #include - -#include -#include -#include +#include #include #include #include -#include +#include #include - +#define THUMBNAILER_CACHE_PATH "/org/freedesktop/thumbnails/Cache1" +#define THUMBNAILER_CACHE_SERVICE "org.freedesktop.thumbnails.Cache1" +#define THUMBNAILER_CACHE_IFACE "org.freedesktop.thumbnails.Cache1" typedef struct _MoveRequest MoveRequest; typedef struct _CopyRequest CopyRequest; @@ -76,6 +75,28 @@ +static gboolean tumbler_cache_service_cleanup (TumblerExportedCacheService *skeleton, + GDBusMethodInvocation *invocation, + const gchar *const *base_uris, + guint32 since, + TumblerCacheService *service); +static gboolean tumbler_cache_service_delete (TumblerExportedCacheService *skeleton, + GDBusMethodInvocation *invocation, + const gchar *const *uris, + TumblerCacheService *service); + +static gboolean tumbler_cache_service_copy (TumblerExportedCacheService *skeleton, + GDBusMethodInvocation *invocation, + const gchar *const *from_uris, + const gchar *const *to_uris, + TumblerCacheService *service); + +static gboolean tumbler_cache_service_move (TumblerExportedCacheService *skeleton, + GDBusMethodInvocation *invocation, + const gchar *const *from_uris, + const gchar *const *to_uris, + TumblerCacheService *service); + struct _TumblerCacheServiceClass { TumblerComponentClass __parent__; @@ -83,45 +104,51 @@ struct _TumblerCacheService { - TumblerComponent __parent__; - - DBusGConnection *connection; + TumblerComponent __parent__; - TumblerCache *cache; + GDBusConnection *connection; + TumblerExportedCacheService *skeleton; + gboolean dbus_interface_exported; + + TumblerCache *cache; + + GThreadPool *move_pool; + GThreadPool *copy_pool; + GThreadPool *delete_pool; + GThreadPool *cleanup_pool; - GThreadPool *move_pool; - GThreadPool *copy_pool; - GThreadPool *delete_pool; - GThreadPool *cleanup_pool; - - TUMBLER_MUTEX (mutex); + TUMBLER_MUTEX (mutex); }; struct _MoveRequest { - gchar **from_uris; - gchar **to_uris; - DBusGMethodInvocation *context; + TumblerExportedCacheService *skeleton; + gchar **from_uris; + gchar **to_uris; + GDBusMethodInvocation *invocation; }; struct _CopyRequest { - gchar **from_uris; - gchar **to_uris; - DBusGMethodInvocation *context; + TumblerExportedCacheService *skeleton; + gchar **from_uris; + gchar **to_uris; + GDBusMethodInvocation *invocation; }; struct _DeleteRequest { - gchar **uris; - DBusGMethodInvocation *context; + TumblerExportedCacheService *skeleton; + gchar **uris; + GDBusMethodInvocation *invocation; }; struct _CleanupRequest { - guint32 since; - gchar **base_uris; - DBusGMethodInvocation *context; + TumblerExportedCacheService *skeleton; + guint32 since; + gchar **base_uris; + GDBusMethodInvocation *invocation; }; @@ -142,9 +169,10 @@ gobject_class->set_property = tumbler_cache_service_set_property; g_object_class_install_property (gobject_class, PROP_CONNECTION, - g_param_spec_pointer ("connection", + g_param_spec_object ("connection", "connection", "connection", + G_TYPE_DBUS_CONNECTION, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); } @@ -163,6 +191,7 @@ tumbler_cache_service_constructed (GObject *object) { TumblerCacheService *service = TUMBLER_CACHE_SERVICE (object); + GError *error = NULL; /* chain up to parent classes */ if (G_OBJECT_CLASS (tumbler_cache_service_parent_class)->constructed != NULL) @@ -178,15 +207,36 @@ service, 1, FALSE, NULL); service->cleanup_pool = g_thread_pool_new (tumbler_cache_service_cleanup_thread, service, 1, FALSE, NULL); - + + service->skeleton = tumbler_exported_cache_service_skeleton_new(); + /* everything's fine, install the cache type D-Bus info */ - dbus_g_object_type_install_info (G_OBJECT_TYPE (service), - &dbus_glib_tumbler_cache_service_object_info); - - /* register the cache instance as a handler of the cache interface */ - dbus_g_connection_register_g_object (service->connection, - "/org/freedesktop/thumbnails/Cache1", - G_OBJECT (service)); + g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON(service->skeleton), + service->connection, + THUMBNAILER_CACHE_PATH, + &error); + if (error != NULL) + { + g_critical ("error exporting thumbnail cache service on session bus: %s", error->message); + g_error_free (error); + service->dbus_interface_exported = FALSE; + } + else + { + service->dbus_interface_exported = TRUE; + + g_signal_connect (service->skeleton, "handle-move", + G_CALLBACK(tumbler_cache_service_move), service); + + g_signal_connect (service->skeleton, "handle-copy", + G_CALLBACK(tumbler_cache_service_copy), service); + + g_signal_connect (service->skeleton, "handle-delete", + G_CALLBACK(tumbler_cache_service_delete), service); + + g_signal_connect (service->skeleton, "handle-cleanup", + G_CALLBACK(tumbler_cache_service_cleanup), service); + } } @@ -204,7 +254,18 @@ if (service->cache != NULL) g_object_unref (service->cache); - dbus_g_connection_unref (service->connection); + /* Unexport from dbus */ + if (service->dbus_interface_exported) + g_dbus_interface_skeleton_unexport_from_connection + ( + G_DBUS_INTERFACE_SKELETON (service->skeleton), + service->connection + ); + + /* release the Skeleton object */ + g_object_unref (service->skeleton); + + g_object_unref (service->connection); tumbler_mutex_free (service->mutex); @@ -224,7 +285,7 @@ switch (prop_id) { case PROP_CONNECTION: - g_value_set_pointer (value, service->connection); + g_value_set_object (value, service->connection); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -245,7 +306,7 @@ switch (prop_id) { case PROP_CONNECTION: - service->connection = dbus_g_connection_ref (g_value_get_pointer (value)); + service->connection = g_object_ref (g_value_get_object (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -274,7 +335,7 @@ (const gchar *const *)request->to_uris); } - dbus_g_method_return (request->context); + tumbler_exported_cache_service_complete_move (request->skeleton, request->invocation); g_strfreev (request->from_uris); g_strfreev (request->to_uris); @@ -308,7 +369,7 @@ (const gchar *const *)request->to_uris); } - dbus_g_method_return (request->context); + tumbler_exported_cache_service_complete_copy (request->skeleton, request->invocation); g_strfreev (request->from_uris); g_strfreev (request->to_uris); @@ -338,7 +399,7 @@ if (service->cache != NULL) tumbler_cache_delete (service->cache, (const gchar *const *)request->uris); - dbus_g_method_return (request->context); + tumbler_exported_cache_service_complete_delete (request->skeleton, request->invocation); g_strfreev (request->uris); g_slice_free (DeleteRequest, request); @@ -371,7 +432,7 @@ request->since); } - dbus_g_method_return (request->context); + tumbler_exported_cache_service_complete_cleanup (request->skeleton, request->invocation); g_strfreev (request->base_uris); g_slice_free (CleanupRequest, request); @@ -386,7 +447,7 @@ TumblerCacheService * -tumbler_cache_service_new (DBusGConnection *connection, +tumbler_cache_service_new (GDBusConnection *connection, TumblerLifecycleManager *lifecycle_manager) { return g_object_new (TUMBLER_TYPE_CACHE_SERVICE, @@ -397,58 +458,20 @@ -gboolean -tumbler_cache_service_start (TumblerCacheService *service, - GError **error) -{ - DBusConnection *connection; - gint result; - - g_return_val_if_fail (TUMBLER_IS_CACHE_SERVICE (service), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - tumbler_mutex_lock (service->mutex); - - /* get the native D-Bus connection */ - connection = dbus_g_connection_get_connection (service->connection); - - /* request ownership for the cache interface */ - result = dbus_bus_request_name (connection, "org.freedesktop.thumbnails.Cache1", - DBUS_NAME_FLAG_DO_NOT_QUEUE, NULL); - - /* check if that failed */ - if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) - { - if (error != NULL) - { - g_set_error (error, DBUS_GERROR, DBUS_GERROR_FAILED, - _("Another thumbnail cache service is already running")); - } - - tumbler_mutex_unlock (service->mutex); - - return FALSE; - } - - tumbler_mutex_unlock (service->mutex); - return TRUE; -} - - - -void -tumbler_cache_service_move (TumblerCacheService *service, - const gchar *const *from_uris, - const gchar *const *to_uris, - DBusGMethodInvocation *context) +gboolean +tumbler_cache_service_move (TumblerExportedCacheService *skeleton, + GDBusMethodInvocation *invocation, + const gchar *const *from_uris, + const gchar *const *to_uris, + TumblerCacheService *service) { MoveRequest *request; - dbus_async_return_if_fail (TUMBLER_IS_CACHE_SERVICE (service), context); - dbus_async_return_if_fail (from_uris != NULL, context); - dbus_async_return_if_fail (to_uris != NULL, context); - dbus_async_return_if_fail (g_strv_length ((gchar **)from_uris) == g_strv_length ((gchar **)to_uris), context); + g_dbus_async_return_val_if_fail (TUMBLER_IS_CACHE_SERVICE (service), invocation, FALSE); + g_dbus_async_return_val_if_fail (from_uris != NULL, invocation, FALSE); + g_dbus_async_return_val_if_fail (to_uris != NULL, invocation, FALSE); + g_dbus_async_return_val_if_fail (g_strv_length ((gchar **)from_uris) == g_strv_length ((gchar **)to_uris), invocation, FALSE); /* prevent the lifecycle manager to shut tumbler down before the * move request has been processed */ @@ -457,29 +480,32 @@ request = g_slice_new0 (MoveRequest); request->from_uris = g_strdupv ((gchar **)from_uris); request->to_uris = g_strdupv ((gchar **)to_uris); - request->context = context; + request->invocation = invocation; g_thread_pool_push (service->move_pool, request, NULL); /* try to keep tumbler alive */ tumbler_component_keep_alive (TUMBLER_COMPONENT (service), NULL); + + return TRUE; } -void -tumbler_cache_service_copy (TumblerCacheService *service, - const gchar *const *from_uris, - const gchar *const *to_uris, - DBusGMethodInvocation *context) +gboolean +tumbler_cache_service_copy (TumblerExportedCacheService *skeleton, + GDBusMethodInvocation *invocation, + const gchar *const *from_uris, + const gchar *const *to_uris, + TumblerCacheService *service) { CopyRequest *request; - - dbus_async_return_if_fail (TUMBLER_IS_CACHE_SERVICE (service), context); - dbus_async_return_if_fail (from_uris != NULL, context); - dbus_async_return_if_fail (to_uris != NULL, context); - dbus_async_return_if_fail (g_strv_length ((gchar **)from_uris) == g_strv_length ((gchar **)to_uris), context); - + + g_dbus_async_return_val_if_fail (TUMBLER_IS_CACHE_SERVICE (service), invocation, FALSE); + g_dbus_async_return_val_if_fail (from_uris != NULL, invocation, FALSE); + g_dbus_async_return_val_if_fail (to_uris != NULL, invocation, FALSE); + g_dbus_async_return_val_if_fail (g_strv_length ((gchar **)from_uris) == g_strv_length ((gchar **)to_uris), invocation, FALSE); + /* prevent the lifecycle manager to shut tumbler down before the * copy request has been processed */ tumbler_component_increment_use_count (TUMBLER_COMPONENT (service)); @@ -487,25 +513,28 @@ request = g_slice_new0 (CopyRequest); request->from_uris = g_strdupv ((gchar **)from_uris); request->to_uris = g_strdupv ((gchar **)to_uris); - request->context = context; + request->invocation = invocation; g_thread_pool_push (service->copy_pool, request, NULL); /* try to keep tumbler alive */ tumbler_component_keep_alive (TUMBLER_COMPONENT (service), NULL); + + return TRUE; } -void -tumbler_cache_service_delete (TumblerCacheService *service, - const gchar *const *uris, - DBusGMethodInvocation *context) +gboolean +tumbler_cache_service_delete (TumblerExportedCacheService *skeleton, + GDBusMethodInvocation *invocation, + const gchar *const *uris, + TumblerCacheService *service) { DeleteRequest *request; - - dbus_async_return_if_fail (TUMBLER_IS_CACHE_SERVICE (service), context); - dbus_async_return_if_fail (uris != NULL, context); + + g_dbus_async_return_val_if_fail (TUMBLER_IS_CACHE_SERVICE (service), invocation, FALSE); + g_dbus_async_return_val_if_fail (uris != NULL, invocation, FALSE); /* prevent the lifecycle manager to shut tumbler down before the * delete request has been processed */ @@ -513,26 +542,29 @@ request = g_slice_new0 (DeleteRequest); request->uris = g_strdupv ((gchar **)uris); - request->context = context; + request->invocation = invocation; g_thread_pool_push (service->delete_pool, request, NULL); /* try to keep tumbler alive */ tumbler_component_keep_alive (TUMBLER_COMPONENT (service), NULL); + + return TRUE; } -void -tumbler_cache_service_cleanup (TumblerCacheService *service, - const gchar *const *base_uris, - guint32 since, - DBusGMethodInvocation *context) +gboolean +tumbler_cache_service_cleanup (TumblerExportedCacheService *skeleton, + GDBusMethodInvocation *invocation, + const gchar *const *base_uris, + guint32 since, + TumblerCacheService *service) { CleanupRequest *request; - dbus_async_return_if_fail (TUMBLER_IS_CACHE_SERVICE (service), context); - + g_dbus_async_return_val_if_fail (TUMBLER_IS_CACHE_SERVICE (service), invocation, FALSE); + /* prevent the lifecycle manager to shut tumbler down before the * cleanup request has been processed */ tumbler_component_increment_use_count (TUMBLER_COMPONENT (service)); @@ -540,10 +572,18 @@ request = g_slice_new0 (CleanupRequest); request->base_uris = g_strdupv ((gchar **)base_uris); request->since = since; - request->context = context; + request->invocation = invocation; g_thread_pool_push (service->cleanup_pool, request, NULL); /* try to keep tumbler alive */ tumbler_component_keep_alive (TUMBLER_COMPONENT (service), NULL); + + return TRUE; +} + +gboolean tumbler_cache_service_is_exported (TumblerCacheService *service) +{ + g_return_val_if_fail (TUMBLER_IS_CACHE_SERVICE(service), FALSE); + return service->dbus_interface_exported; } diff -Nru tumbler-0.1.31/tumblerd/tumbler-cache-service-dbus-bindings.h tumbler-0.1.90/tumblerd/tumbler-cache-service-dbus-bindings.h --- tumbler-0.1.31/tumblerd/tumbler-cache-service-dbus-bindings.h 2015-02-28 16:28:41.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-cache-service-dbus-bindings.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,213 +0,0 @@ -/* Generated by dbus-binding-tool; do not edit! */ - - -#ifndef __dbus_glib_marshal_tumbler_cache_service_MARSHAL_H__ -#define __dbus_glib_marshal_tumbler_cache_service_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_schar (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#define g_marshal_value_peek_variant(v) g_value_get_variant (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* NONE:BOXED,UINT,POINTER */ -extern void dbus_glib_marshal_tumbler_cache_service_VOID__BOXED_UINT_POINTER (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -void -dbus_glib_marshal_tumbler_cache_service_VOID__BOXED_UINT_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__BOXED_UINT_POINTER) (gpointer data1, - gpointer arg_1, - guint arg_2, - gpointer arg_3, - gpointer data2); - register GMarshalFunc_VOID__BOXED_UINT_POINTER callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 4); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__BOXED_UINT_POINTER) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_boxed (param_values + 1), - g_marshal_value_peek_uint (param_values + 2), - g_marshal_value_peek_pointer (param_values + 3), - data2); -} -#define dbus_glib_marshal_tumbler_cache_service_NONE__BOXED_UINT_POINTER dbus_glib_marshal_tumbler_cache_service_VOID__BOXED_UINT_POINTER - -/* NONE:BOXED,BOXED,POINTER */ -extern void dbus_glib_marshal_tumbler_cache_service_VOID__BOXED_BOXED_POINTER (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -void -dbus_glib_marshal_tumbler_cache_service_VOID__BOXED_BOXED_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__BOXED_BOXED_POINTER) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - gpointer arg_3, - gpointer data2); - register GMarshalFunc_VOID__BOXED_BOXED_POINTER callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 4); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__BOXED_BOXED_POINTER) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_boxed (param_values + 1), - g_marshal_value_peek_boxed (param_values + 2), - g_marshal_value_peek_pointer (param_values + 3), - data2); -} -#define dbus_glib_marshal_tumbler_cache_service_NONE__BOXED_BOXED_POINTER dbus_glib_marshal_tumbler_cache_service_VOID__BOXED_BOXED_POINTER - -/* NONE:BOXED,POINTER */ -extern void dbus_glib_marshal_tumbler_cache_service_VOID__BOXED_POINTER (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -void -dbus_glib_marshal_tumbler_cache_service_VOID__BOXED_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__BOXED_POINTER) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - gpointer data2); - register GMarshalFunc_VOID__BOXED_POINTER callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__BOXED_POINTER) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_boxed (param_values + 1), - g_marshal_value_peek_pointer (param_values + 2), - data2); -} -#define dbus_glib_marshal_tumbler_cache_service_NONE__BOXED_POINTER dbus_glib_marshal_tumbler_cache_service_VOID__BOXED_POINTER - -G_END_DECLS - -#endif /* __dbus_glib_marshal_tumbler_cache_service_MARSHAL_H__ */ - -#include -static const DBusGMethodInfo dbus_glib_tumbler_cache_service_methods[] = { - { (GCallback) tumbler_cache_service_move, dbus_glib_marshal_tumbler_cache_service_NONE__BOXED_BOXED_POINTER, 0 }, - { (GCallback) tumbler_cache_service_copy, dbus_glib_marshal_tumbler_cache_service_NONE__BOXED_BOXED_POINTER, 70 }, - { (GCallback) tumbler_cache_service_delete, dbus_glib_marshal_tumbler_cache_service_NONE__BOXED_POINTER, 140 }, - { (GCallback) tumbler_cache_service_cleanup, dbus_glib_marshal_tumbler_cache_service_NONE__BOXED_UINT_POINTER, 194 }, -}; - -const DBusGObjectInfo dbus_glib_tumbler_cache_service_object_info = { 1, - dbus_glib_tumbler_cache_service_methods, - 4, -"org.freedesktop.thumbnails.Cache1\0Move\0A\0from_uris\0I\0as\0to_uris\0I\0as\0\0org.freedesktop.thumbnails.Cache1\0Copy\0A\0from_uris\0I\0as\0to_uris\0I\0as\0\0org.freedesktop.thumbnails.Cache1\0Delete\0A\0uris\0I\0as\0\0org.freedesktop.thumbnails.Cache1\0Cleanup\0A\0base_uris\0I\0as\0since\0I\0u\0\0\0", -"\0", -"\0" -}; - diff -Nru tumbler-0.1.31/tumblerd/tumbler-cache-service-dbus.xml tumbler-0.1.90/tumblerd/tumbler-cache-service-dbus.xml --- tumbler-0.1.31/tumblerd/tumbler-cache-service-dbus.xml 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-cache-service-dbus.xml 2017-05-11 09:06:12.000000000 +0000 @@ -1,25 +1,24 @@ + + - - - + - diff -Nru tumbler-0.1.31/tumblerd/tumbler-cache-service-gdbus.c tumbler-0.1.90/tumblerd/tumbler-cache-service-gdbus.c --- tumbler-0.1.31/tumblerd/tumbler-cache-service-gdbus.c 1970-01-01 00:00:00.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-cache-service-gdbus.c 2017-05-11 09:08:51.000000000 +0000 @@ -0,0 +1,1607 @@ +/* + * Generated by gdbus-codegen 2.50.3. DO NOT EDIT. + * + * The license of this code is the same as for the source it was derived from. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "tumbler-cache-service-gdbus.h" + +#include +#ifdef G_OS_UNIX +# include +#endif + +typedef struct +{ + GDBusArgInfo parent_struct; + gboolean use_gvariant; +} _ExtendedGDBusArgInfo; + +typedef struct +{ + GDBusMethodInfo parent_struct; + const gchar *signal_name; + gboolean pass_fdlist; +} _ExtendedGDBusMethodInfo; + +typedef struct +{ + GDBusSignalInfo parent_struct; + const gchar *signal_name; +} _ExtendedGDBusSignalInfo; + +typedef struct +{ + GDBusPropertyInfo parent_struct; + const gchar *hyphen_name; + gboolean use_gvariant; +} _ExtendedGDBusPropertyInfo; + +typedef struct +{ + GDBusInterfaceInfo parent_struct; + const gchar *hyphen_name; +} _ExtendedGDBusInterfaceInfo; + +typedef struct +{ + const _ExtendedGDBusPropertyInfo *info; + guint prop_id; + GValue orig_value; /* the value before the change */ +} ChangedProperty; + +static void +_changed_property_free (ChangedProperty *data) +{ + g_value_unset (&data->orig_value); + g_free (data); +} + +static gboolean +_g_strv_equal0 (gchar **a, gchar **b) +{ + gboolean ret = FALSE; + guint n; + if (a == NULL && b == NULL) + { + ret = TRUE; + goto out; + } + if (a == NULL || b == NULL) + goto out; + if (g_strv_length (a) != g_strv_length (b)) + goto out; + for (n = 0; a[n] != NULL; n++) + if (g_strcmp0 (a[n], b[n]) != 0) + goto out; + ret = TRUE; +out: + return ret; +} + +static gboolean +_g_variant_equal0 (GVariant *a, GVariant *b) +{ + gboolean ret = FALSE; + if (a == NULL && b == NULL) + { + ret = TRUE; + goto out; + } + if (a == NULL || b == NULL) + goto out; + ret = g_variant_equal (a, b); +out: + return ret; +} + +G_GNUC_UNUSED static gboolean +_g_value_equal (const GValue *a, const GValue *b) +{ + gboolean ret = FALSE; + g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b)); + switch (G_VALUE_TYPE (a)) + { + case G_TYPE_BOOLEAN: + ret = (g_value_get_boolean (a) == g_value_get_boolean (b)); + break; + case G_TYPE_UCHAR: + ret = (g_value_get_uchar (a) == g_value_get_uchar (b)); + break; + case G_TYPE_INT: + ret = (g_value_get_int (a) == g_value_get_int (b)); + break; + case G_TYPE_UINT: + ret = (g_value_get_uint (a) == g_value_get_uint (b)); + break; + case G_TYPE_INT64: + ret = (g_value_get_int64 (a) == g_value_get_int64 (b)); + break; + case G_TYPE_UINT64: + ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b)); + break; + case G_TYPE_DOUBLE: + { + /* Avoid -Wfloat-equal warnings by doing a direct bit compare */ + gdouble da = g_value_get_double (a); + gdouble db = g_value_get_double (b); + ret = memcmp (&da, &db, sizeof (gdouble)) == 0; + } + break; + case G_TYPE_STRING: + ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0); + break; + case G_TYPE_VARIANT: + ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b)); + break; + default: + if (G_VALUE_TYPE (a) == G_TYPE_STRV) + ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b)); + else + g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a))); + break; + } + return ret; +} + +/* ------------------------------------------------------------------------ + * Code for interface org.freedesktop.thumbnails.Cache1 + * ------------------------------------------------------------------------ + */ + +/** + * SECTION:TumblerExportedCacheService + * @title: TumblerExportedCacheService + * @short_description: Generated C code for the org.freedesktop.thumbnails.Cache1 D-Bus interface + * + * This section contains code for working with the org.freedesktop.thumbnails.Cache1 D-Bus interface in C. + */ + +/* ---- Introspection data for org.freedesktop.thumbnails.Cache1 ---- */ + +static const _ExtendedGDBusArgInfo _tumbler_exported_cache_service_method_info_move_IN_ARG_from_uris = +{ + { + -1, + (gchar *) "from_uris", + (gchar *) "as", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_cache_service_method_info_move_IN_ARG_to_uris = +{ + { + -1, + (gchar *) "to_uris", + (gchar *) "as", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _tumbler_exported_cache_service_method_info_move_IN_ARG_pointers[] = +{ + &_tumbler_exported_cache_service_method_info_move_IN_ARG_from_uris, + &_tumbler_exported_cache_service_method_info_move_IN_ARG_to_uris, + NULL +}; + +static const _ExtendedGDBusMethodInfo _tumbler_exported_cache_service_method_info_move = +{ + { + -1, + (gchar *) "Move", + (GDBusArgInfo **) &_tumbler_exported_cache_service_method_info_move_IN_ARG_pointers, + NULL, + NULL + }, + "handle-move", + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_cache_service_method_info_copy_IN_ARG_from_uris = +{ + { + -1, + (gchar *) "from_uris", + (gchar *) "as", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_cache_service_method_info_copy_IN_ARG_to_uris = +{ + { + -1, + (gchar *) "to_uris", + (gchar *) "as", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _tumbler_exported_cache_service_method_info_copy_IN_ARG_pointers[] = +{ + &_tumbler_exported_cache_service_method_info_copy_IN_ARG_from_uris, + &_tumbler_exported_cache_service_method_info_copy_IN_ARG_to_uris, + NULL +}; + +static const _ExtendedGDBusMethodInfo _tumbler_exported_cache_service_method_info_copy = +{ + { + -1, + (gchar *) "Copy", + (GDBusArgInfo **) &_tumbler_exported_cache_service_method_info_copy_IN_ARG_pointers, + NULL, + NULL + }, + "handle-copy", + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_cache_service_method_info_delete_IN_ARG_uris = +{ + { + -1, + (gchar *) "uris", + (gchar *) "as", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _tumbler_exported_cache_service_method_info_delete_IN_ARG_pointers[] = +{ + &_tumbler_exported_cache_service_method_info_delete_IN_ARG_uris, + NULL +}; + +static const _ExtendedGDBusMethodInfo _tumbler_exported_cache_service_method_info_delete = +{ + { + -1, + (gchar *) "Delete", + (GDBusArgInfo **) &_tumbler_exported_cache_service_method_info_delete_IN_ARG_pointers, + NULL, + NULL + }, + "handle-delete", + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_cache_service_method_info_cleanup_IN_ARG_base_uris = +{ + { + -1, + (gchar *) "base_uris", + (gchar *) "as", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_cache_service_method_info_cleanup_IN_ARG_since = +{ + { + -1, + (gchar *) "since", + (gchar *) "u", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _tumbler_exported_cache_service_method_info_cleanup_IN_ARG_pointers[] = +{ + &_tumbler_exported_cache_service_method_info_cleanup_IN_ARG_base_uris, + &_tumbler_exported_cache_service_method_info_cleanup_IN_ARG_since, + NULL +}; + +static const _ExtendedGDBusMethodInfo _tumbler_exported_cache_service_method_info_cleanup = +{ + { + -1, + (gchar *) "Cleanup", + (GDBusArgInfo **) &_tumbler_exported_cache_service_method_info_cleanup_IN_ARG_pointers, + NULL, + NULL + }, + "handle-cleanup", + FALSE +}; + +static const _ExtendedGDBusMethodInfo * const _tumbler_exported_cache_service_method_info_pointers[] = +{ + &_tumbler_exported_cache_service_method_info_move, + &_tumbler_exported_cache_service_method_info_copy, + &_tumbler_exported_cache_service_method_info_delete, + &_tumbler_exported_cache_service_method_info_cleanup, + NULL +}; + +static const _ExtendedGDBusInterfaceInfo _tumbler_exported_cache_service_interface_info = +{ + { + -1, + (gchar *) "org.freedesktop.thumbnails.Cache1", + (GDBusMethodInfo **) &_tumbler_exported_cache_service_method_info_pointers, + NULL, + NULL, + NULL + }, + "exported-cache-service", +}; + + +/** + * tumbler_exported_cache_service_interface_info: + * + * Gets a machine-readable description of the org.freedesktop.thumbnails.Cache1 D-Bus interface. + * + * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free. + */ +GDBusInterfaceInfo * +tumbler_exported_cache_service_interface_info (void) +{ + return (GDBusInterfaceInfo *) &_tumbler_exported_cache_service_interface_info.parent_struct; +} + +/** + * tumbler_exported_cache_service_override_properties: + * @klass: The class structure for a #GObject-derived class. + * @property_id_begin: The property id to assign to the first overridden property. + * + * Overrides all #GObject properties in the #TumblerExportedCacheService interface for a concrete class. + * The properties are overridden in the order they are defined. + * + * Returns: The last property id. + */ +guint +tumbler_exported_cache_service_override_properties (GObjectClass *klass, guint property_id_begin) +{ + return property_id_begin - 1; +} + + + +/** + * TumblerExportedCacheService: + * + * Abstract interface type for the D-Bus interface org.freedesktop.thumbnails.Cache1. + */ + +/** + * TumblerExportedCacheServiceIface: + * @parent_iface: The parent interface. + * @handle_cleanup: Handler for the #TumblerExportedCacheService::handle-cleanup signal. + * @handle_copy: Handler for the #TumblerExportedCacheService::handle-copy signal. + * @handle_delete: Handler for the #TumblerExportedCacheService::handle-delete signal. + * @handle_move: Handler for the #TumblerExportedCacheService::handle-move signal. + * + * Virtual table for the D-Bus interface org.freedesktop.thumbnails.Cache1. + */ + +typedef TumblerExportedCacheServiceIface TumblerExportedCacheServiceInterface; +G_DEFINE_INTERFACE (TumblerExportedCacheService, tumbler_exported_cache_service, G_TYPE_OBJECT); + +static void +tumbler_exported_cache_service_default_init (TumblerExportedCacheServiceIface *iface) +{ + /* GObject signals for incoming D-Bus method calls: */ + /** + * TumblerExportedCacheService::handle-move: + * @object: A #TumblerExportedCacheService. + * @invocation: A #GDBusMethodInvocation. + * @arg_from_uris: Argument passed by remote caller. + * @arg_to_uris: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the Move() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call tumbler_exported_cache_service_complete_move() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + g_signal_new ("handle-move", + G_TYPE_FROM_INTERFACE (iface), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (TumblerExportedCacheServiceIface, handle_move), + g_signal_accumulator_true_handled, + NULL, + g_cclosure_marshal_generic, + G_TYPE_BOOLEAN, + 3, + G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRV, G_TYPE_STRV); + + /** + * TumblerExportedCacheService::handle-copy: + * @object: A #TumblerExportedCacheService. + * @invocation: A #GDBusMethodInvocation. + * @arg_from_uris: Argument passed by remote caller. + * @arg_to_uris: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the Copy() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call tumbler_exported_cache_service_complete_copy() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + g_signal_new ("handle-copy", + G_TYPE_FROM_INTERFACE (iface), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (TumblerExportedCacheServiceIface, handle_copy), + g_signal_accumulator_true_handled, + NULL, + g_cclosure_marshal_generic, + G_TYPE_BOOLEAN, + 3, + G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRV, G_TYPE_STRV); + + /** + * TumblerExportedCacheService::handle-delete: + * @object: A #TumblerExportedCacheService. + * @invocation: A #GDBusMethodInvocation. + * @arg_uris: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the Delete() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call tumbler_exported_cache_service_complete_delete() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + g_signal_new ("handle-delete", + G_TYPE_FROM_INTERFACE (iface), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (TumblerExportedCacheServiceIface, handle_delete), + g_signal_accumulator_true_handled, + NULL, + g_cclosure_marshal_generic, + G_TYPE_BOOLEAN, + 2, + G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRV); + + /** + * TumblerExportedCacheService::handle-cleanup: + * @object: A #TumblerExportedCacheService. + * @invocation: A #GDBusMethodInvocation. + * @arg_base_uris: Argument passed by remote caller. + * @arg_since: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the Cleanup() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call tumbler_exported_cache_service_complete_cleanup() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + g_signal_new ("handle-cleanup", + G_TYPE_FROM_INTERFACE (iface), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (TumblerExportedCacheServiceIface, handle_cleanup), + g_signal_accumulator_true_handled, + NULL, + g_cclosure_marshal_generic, + G_TYPE_BOOLEAN, + 3, + G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRV, G_TYPE_UINT); + +} + +/** + * tumbler_exported_cache_service_call_move: + * @proxy: A #TumblerExportedCacheServiceProxy. + * @arg_from_uris: Argument to pass with the method invocation. + * @arg_to_uris: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the Move() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call tumbler_exported_cache_service_call_move_finish() to get the result of the operation. + * + * See tumbler_exported_cache_service_call_move_sync() for the synchronous, blocking version of this method. + */ +void +tumbler_exported_cache_service_call_move ( + TumblerExportedCacheService *proxy, + const gchar *const *arg_from_uris, + const gchar *const *arg_to_uris, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_dbus_proxy_call (G_DBUS_PROXY (proxy), + "Move", + g_variant_new ("(^as^as)", + arg_from_uris, + arg_to_uris), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + callback, + user_data); +} + +/** + * tumbler_exported_cache_service_call_move_finish: + * @proxy: A #TumblerExportedCacheServiceProxy. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to tumbler_exported_cache_service_call_move(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with tumbler_exported_cache_service_call_move(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_cache_service_call_move_finish ( + TumblerExportedCacheService *proxy, + GAsyncResult *res, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "()"); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_cache_service_call_move_sync: + * @proxy: A #TumblerExportedCacheServiceProxy. + * @arg_from_uris: Argument to pass with the method invocation. + * @arg_to_uris: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the Move() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See tumbler_exported_cache_service_call_move() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_cache_service_call_move_sync ( + TumblerExportedCacheService *proxy, + const gchar *const *arg_from_uris, + const gchar *const *arg_to_uris, + GCancellable *cancellable, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), + "Move", + g_variant_new ("(^as^as)", + arg_from_uris, + arg_to_uris), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "()"); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_cache_service_call_copy: + * @proxy: A #TumblerExportedCacheServiceProxy. + * @arg_from_uris: Argument to pass with the method invocation. + * @arg_to_uris: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the Copy() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call tumbler_exported_cache_service_call_copy_finish() to get the result of the operation. + * + * See tumbler_exported_cache_service_call_copy_sync() for the synchronous, blocking version of this method. + */ +void +tumbler_exported_cache_service_call_copy ( + TumblerExportedCacheService *proxy, + const gchar *const *arg_from_uris, + const gchar *const *arg_to_uris, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_dbus_proxy_call (G_DBUS_PROXY (proxy), + "Copy", + g_variant_new ("(^as^as)", + arg_from_uris, + arg_to_uris), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + callback, + user_data); +} + +/** + * tumbler_exported_cache_service_call_copy_finish: + * @proxy: A #TumblerExportedCacheServiceProxy. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to tumbler_exported_cache_service_call_copy(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with tumbler_exported_cache_service_call_copy(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_cache_service_call_copy_finish ( + TumblerExportedCacheService *proxy, + GAsyncResult *res, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "()"); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_cache_service_call_copy_sync: + * @proxy: A #TumblerExportedCacheServiceProxy. + * @arg_from_uris: Argument to pass with the method invocation. + * @arg_to_uris: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the Copy() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See tumbler_exported_cache_service_call_copy() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_cache_service_call_copy_sync ( + TumblerExportedCacheService *proxy, + const gchar *const *arg_from_uris, + const gchar *const *arg_to_uris, + GCancellable *cancellable, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), + "Copy", + g_variant_new ("(^as^as)", + arg_from_uris, + arg_to_uris), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "()"); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_cache_service_call_delete: + * @proxy: A #TumblerExportedCacheServiceProxy. + * @arg_uris: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the Delete() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call tumbler_exported_cache_service_call_delete_finish() to get the result of the operation. + * + * See tumbler_exported_cache_service_call_delete_sync() for the synchronous, blocking version of this method. + */ +void +tumbler_exported_cache_service_call_delete ( + TumblerExportedCacheService *proxy, + const gchar *const *arg_uris, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_dbus_proxy_call (G_DBUS_PROXY (proxy), + "Delete", + g_variant_new ("(^as)", + arg_uris), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + callback, + user_data); +} + +/** + * tumbler_exported_cache_service_call_delete_finish: + * @proxy: A #TumblerExportedCacheServiceProxy. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to tumbler_exported_cache_service_call_delete(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with tumbler_exported_cache_service_call_delete(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_cache_service_call_delete_finish ( + TumblerExportedCacheService *proxy, + GAsyncResult *res, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "()"); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_cache_service_call_delete_sync: + * @proxy: A #TumblerExportedCacheServiceProxy. + * @arg_uris: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the Delete() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See tumbler_exported_cache_service_call_delete() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_cache_service_call_delete_sync ( + TumblerExportedCacheService *proxy, + const gchar *const *arg_uris, + GCancellable *cancellable, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), + "Delete", + g_variant_new ("(^as)", + arg_uris), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "()"); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_cache_service_call_cleanup: + * @proxy: A #TumblerExportedCacheServiceProxy. + * @arg_base_uris: Argument to pass with the method invocation. + * @arg_since: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the Cleanup() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call tumbler_exported_cache_service_call_cleanup_finish() to get the result of the operation. + * + * See tumbler_exported_cache_service_call_cleanup_sync() for the synchronous, blocking version of this method. + */ +void +tumbler_exported_cache_service_call_cleanup ( + TumblerExportedCacheService *proxy, + const gchar *const *arg_base_uris, + guint arg_since, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_dbus_proxy_call (G_DBUS_PROXY (proxy), + "Cleanup", + g_variant_new ("(^asu)", + arg_base_uris, + arg_since), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + callback, + user_data); +} + +/** + * tumbler_exported_cache_service_call_cleanup_finish: + * @proxy: A #TumblerExportedCacheServiceProxy. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to tumbler_exported_cache_service_call_cleanup(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with tumbler_exported_cache_service_call_cleanup(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_cache_service_call_cleanup_finish ( + TumblerExportedCacheService *proxy, + GAsyncResult *res, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "()"); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_cache_service_call_cleanup_sync: + * @proxy: A #TumblerExportedCacheServiceProxy. + * @arg_base_uris: Argument to pass with the method invocation. + * @arg_since: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the Cleanup() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See tumbler_exported_cache_service_call_cleanup() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_cache_service_call_cleanup_sync ( + TumblerExportedCacheService *proxy, + const gchar *const *arg_base_uris, + guint arg_since, + GCancellable *cancellable, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), + "Cleanup", + g_variant_new ("(^asu)", + arg_base_uris, + arg_since), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "()"); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_cache_service_complete_move: + * @object: A #TumblerExportedCacheService. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * + * Helper function used in service implementations to finish handling invocations of the Move() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ +void +tumbler_exported_cache_service_complete_move ( + TumblerExportedCacheService *object, + GDBusMethodInvocation *invocation) +{ + g_dbus_method_invocation_return_value (invocation, + g_variant_new ("()")); +} + +/** + * tumbler_exported_cache_service_complete_copy: + * @object: A #TumblerExportedCacheService. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * + * Helper function used in service implementations to finish handling invocations of the Copy() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ +void +tumbler_exported_cache_service_complete_copy ( + TumblerExportedCacheService *object, + GDBusMethodInvocation *invocation) +{ + g_dbus_method_invocation_return_value (invocation, + g_variant_new ("()")); +} + +/** + * tumbler_exported_cache_service_complete_delete: + * @object: A #TumblerExportedCacheService. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * + * Helper function used in service implementations to finish handling invocations of the Delete() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ +void +tumbler_exported_cache_service_complete_delete ( + TumblerExportedCacheService *object, + GDBusMethodInvocation *invocation) +{ + g_dbus_method_invocation_return_value (invocation, + g_variant_new ("()")); +} + +/** + * tumbler_exported_cache_service_complete_cleanup: + * @object: A #TumblerExportedCacheService. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * + * Helper function used in service implementations to finish handling invocations of the Cleanup() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ +void +tumbler_exported_cache_service_complete_cleanup ( + TumblerExportedCacheService *object, + GDBusMethodInvocation *invocation) +{ + g_dbus_method_invocation_return_value (invocation, + g_variant_new ("()")); +} + +/* ------------------------------------------------------------------------ */ + +/** + * TumblerExportedCacheServiceProxy: + * + * The #TumblerExportedCacheServiceProxy structure contains only private data and should only be accessed using the provided API. + */ + +/** + * TumblerExportedCacheServiceProxyClass: + * @parent_class: The parent class. + * + * Class structure for #TumblerExportedCacheServiceProxy. + */ + +struct _TumblerExportedCacheServiceProxyPrivate +{ + GData *qdata; +}; + +static void tumbler_exported_cache_service_proxy_iface_init (TumblerExportedCacheServiceIface *iface); + +#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 +G_DEFINE_TYPE_WITH_CODE (TumblerExportedCacheServiceProxy, tumbler_exported_cache_service_proxy, G_TYPE_DBUS_PROXY, + G_ADD_PRIVATE (TumblerExportedCacheServiceProxy) + G_IMPLEMENT_INTERFACE (TUMBLER_TYPE_EXPORTED_CACHE_SERVICE, tumbler_exported_cache_service_proxy_iface_init)); + +#else +G_DEFINE_TYPE_WITH_CODE (TumblerExportedCacheServiceProxy, tumbler_exported_cache_service_proxy, G_TYPE_DBUS_PROXY, + G_IMPLEMENT_INTERFACE (TUMBLER_TYPE_EXPORTED_CACHE_SERVICE, tumbler_exported_cache_service_proxy_iface_init)); + +#endif +static void +tumbler_exported_cache_service_proxy_finalize (GObject *object) +{ + TumblerExportedCacheServiceProxy *proxy = TUMBLER_EXPORTED_CACHE_SERVICE_PROXY (object); + g_datalist_clear (&proxy->priv->qdata); + G_OBJECT_CLASS (tumbler_exported_cache_service_proxy_parent_class)->finalize (object); +} + +static void +tumbler_exported_cache_service_proxy_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec G_GNUC_UNUSED) +{ +} + +static void +tumbler_exported_cache_service_proxy_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec G_GNUC_UNUSED) +{ +} + +static void +tumbler_exported_cache_service_proxy_g_signal (GDBusProxy *proxy, + const gchar *sender_name G_GNUC_UNUSED, + const gchar *signal_name, + GVariant *parameters) +{ + _ExtendedGDBusSignalInfo *info; + GVariantIter iter; + GVariant *child; + GValue *paramv; + guint num_params; + guint n; + guint signal_id; + info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_tumbler_exported_cache_service_interface_info.parent_struct, signal_name); + if (info == NULL) + return; + num_params = g_variant_n_children (parameters); + paramv = g_new0 (GValue, num_params + 1); + g_value_init (¶mv[0], TUMBLER_TYPE_EXPORTED_CACHE_SERVICE); + g_value_set_object (¶mv[0], proxy); + g_variant_iter_init (&iter, parameters); + n = 1; + while ((child = g_variant_iter_next_value (&iter)) != NULL) + { + _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1]; + if (arg_info->use_gvariant) + { + g_value_init (¶mv[n], G_TYPE_VARIANT); + g_value_set_variant (¶mv[n], child); + n++; + } + else + g_dbus_gvariant_to_gvalue (child, ¶mv[n++]); + g_variant_unref (child); + } + signal_id = g_signal_lookup (info->signal_name, TUMBLER_TYPE_EXPORTED_CACHE_SERVICE); + g_signal_emitv (paramv, signal_id, 0, NULL); + for (n = 0; n < num_params + 1; n++) + g_value_unset (¶mv[n]); + g_free (paramv); +} + +static void +tumbler_exported_cache_service_proxy_g_properties_changed (GDBusProxy *_proxy, + GVariant *changed_properties, + const gchar *const *invalidated_properties) +{ + TumblerExportedCacheServiceProxy *proxy = TUMBLER_EXPORTED_CACHE_SERVICE_PROXY (_proxy); + guint n; + const gchar *key; + GVariantIter *iter; + _ExtendedGDBusPropertyInfo *info; + g_variant_get (changed_properties, "a{sv}", &iter); + while (g_variant_iter_next (iter, "{&sv}", &key, NULL)) + { + info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_tumbler_exported_cache_service_interface_info.parent_struct, key); + g_datalist_remove_data (&proxy->priv->qdata, key); + if (info != NULL) + g_object_notify (G_OBJECT (proxy), info->hyphen_name); + } + g_variant_iter_free (iter); + for (n = 0; invalidated_properties[n] != NULL; n++) + { + info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_tumbler_exported_cache_service_interface_info.parent_struct, invalidated_properties[n]); + g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]); + if (info != NULL) + g_object_notify (G_OBJECT (proxy), info->hyphen_name); + } +} + +static void +tumbler_exported_cache_service_proxy_init (TumblerExportedCacheServiceProxy *proxy) +{ +#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 + proxy->priv = tumbler_exported_cache_service_proxy_get_instance_private (proxy); +#else + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_PROXY, TumblerExportedCacheServiceProxyPrivate); +#endif + + g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), tumbler_exported_cache_service_interface_info ()); +} + +static void +tumbler_exported_cache_service_proxy_class_init (TumblerExportedCacheServiceProxyClass *klass) +{ + GObjectClass *gobject_class; + GDBusProxyClass *proxy_class; + + gobject_class = G_OBJECT_CLASS (klass); + gobject_class->finalize = tumbler_exported_cache_service_proxy_finalize; + gobject_class->get_property = tumbler_exported_cache_service_proxy_get_property; + gobject_class->set_property = tumbler_exported_cache_service_proxy_set_property; + + proxy_class = G_DBUS_PROXY_CLASS (klass); + proxy_class->g_signal = tumbler_exported_cache_service_proxy_g_signal; + proxy_class->g_properties_changed = tumbler_exported_cache_service_proxy_g_properties_changed; + +#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38 + g_type_class_add_private (klass, sizeof (TumblerExportedCacheServiceProxyPrivate)); +#endif +} + +static void +tumbler_exported_cache_service_proxy_iface_init (TumblerExportedCacheServiceIface *iface) +{ +} + +/** + * tumbler_exported_cache_service_proxy_new: + * @connection: A #GDBusConnection. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied. + * @user_data: User data to pass to @callback. + * + * Asynchronously creates a proxy for the D-Bus interface org.freedesktop.thumbnails.Cache1. See g_dbus_proxy_new() for more details. + * + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call tumbler_exported_cache_service_proxy_new_finish() to get the result of the operation. + * + * See tumbler_exported_cache_service_proxy_new_sync() for the synchronous, blocking version of this constructor. + */ +void +tumbler_exported_cache_service_proxy_new ( + GDBusConnection *connection, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_async_initable_new_async (TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.thumbnails.Cache1", NULL); +} + +/** + * tumbler_exported_cache_service_proxy_new_finish: + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to tumbler_exported_cache_service_proxy_new(). + * @error: Return location for error or %NULL + * + * Finishes an operation started with tumbler_exported_cache_service_proxy_new(). + * + * Returns: (transfer full) (type TumblerExportedCacheServiceProxy): The constructed proxy object or %NULL if @error is set. + */ +TumblerExportedCacheService * +tumbler_exported_cache_service_proxy_new_finish ( + GAsyncResult *res, + GError **error) +{ + GObject *ret; + GObject *source_object; + source_object = g_async_result_get_source_object (res); + ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error); + g_object_unref (source_object); + if (ret != NULL) + return TUMBLER_EXPORTED_CACHE_SERVICE (ret); + else + return NULL; +} + +/** + * tumbler_exported_cache_service_proxy_new_sync: + * @connection: A #GDBusConnection. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL + * + * Synchronously creates a proxy for the D-Bus interface org.freedesktop.thumbnails.Cache1. See g_dbus_proxy_new_sync() for more details. + * + * The calling thread is blocked until a reply is received. + * + * See tumbler_exported_cache_service_proxy_new() for the asynchronous version of this constructor. + * + * Returns: (transfer full) (type TumblerExportedCacheServiceProxy): The constructed proxy object or %NULL if @error is set. + */ +TumblerExportedCacheService * +tumbler_exported_cache_service_proxy_new_sync ( + GDBusConnection *connection, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GError **error) +{ + GInitable *ret; + ret = g_initable_new (TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.thumbnails.Cache1", NULL); + if (ret != NULL) + return TUMBLER_EXPORTED_CACHE_SERVICE (ret); + else + return NULL; +} + + +/** + * tumbler_exported_cache_service_proxy_new_for_bus: + * @bus_type: A #GBusType. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: A bus name (well-known or unique). + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied. + * @user_data: User data to pass to @callback. + * + * Like tumbler_exported_cache_service_proxy_new() but takes a #GBusType instead of a #GDBusConnection. + * + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call tumbler_exported_cache_service_proxy_new_for_bus_finish() to get the result of the operation. + * + * See tumbler_exported_cache_service_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor. + */ +void +tumbler_exported_cache_service_proxy_new_for_bus ( + GBusType bus_type, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_async_initable_new_async (TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.thumbnails.Cache1", NULL); +} + +/** + * tumbler_exported_cache_service_proxy_new_for_bus_finish: + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to tumbler_exported_cache_service_proxy_new_for_bus(). + * @error: Return location for error or %NULL + * + * Finishes an operation started with tumbler_exported_cache_service_proxy_new_for_bus(). + * + * Returns: (transfer full) (type TumblerExportedCacheServiceProxy): The constructed proxy object or %NULL if @error is set. + */ +TumblerExportedCacheService * +tumbler_exported_cache_service_proxy_new_for_bus_finish ( + GAsyncResult *res, + GError **error) +{ + GObject *ret; + GObject *source_object; + source_object = g_async_result_get_source_object (res); + ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error); + g_object_unref (source_object); + if (ret != NULL) + return TUMBLER_EXPORTED_CACHE_SERVICE (ret); + else + return NULL; +} + +/** + * tumbler_exported_cache_service_proxy_new_for_bus_sync: + * @bus_type: A #GBusType. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: A bus name (well-known or unique). + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL + * + * Like tumbler_exported_cache_service_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection. + * + * The calling thread is blocked until a reply is received. + * + * See tumbler_exported_cache_service_proxy_new_for_bus() for the asynchronous version of this constructor. + * + * Returns: (transfer full) (type TumblerExportedCacheServiceProxy): The constructed proxy object or %NULL if @error is set. + */ +TumblerExportedCacheService * +tumbler_exported_cache_service_proxy_new_for_bus_sync ( + GBusType bus_type, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GError **error) +{ + GInitable *ret; + ret = g_initable_new (TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.thumbnails.Cache1", NULL); + if (ret != NULL) + return TUMBLER_EXPORTED_CACHE_SERVICE (ret); + else + return NULL; +} + + +/* ------------------------------------------------------------------------ */ + +/** + * TumblerExportedCacheServiceSkeleton: + * + * The #TumblerExportedCacheServiceSkeleton structure contains only private data and should only be accessed using the provided API. + */ + +/** + * TumblerExportedCacheServiceSkeletonClass: + * @parent_class: The parent class. + * + * Class structure for #TumblerExportedCacheServiceSkeleton. + */ + +struct _TumblerExportedCacheServiceSkeletonPrivate +{ + GValue *properties; + GList *changed_properties; + GSource *changed_properties_idle_source; + GMainContext *context; + GMutex lock; +}; + +static void +_tumbler_exported_cache_service_skeleton_handle_method_call ( + GDBusConnection *connection G_GNUC_UNUSED, + const gchar *sender G_GNUC_UNUSED, + const gchar *object_path G_GNUC_UNUSED, + const gchar *interface_name, + const gchar *method_name, + GVariant *parameters, + GDBusMethodInvocation *invocation, + gpointer user_data) +{ + TumblerExportedCacheServiceSkeleton *skeleton = TUMBLER_EXPORTED_CACHE_SERVICE_SKELETON (user_data); + _ExtendedGDBusMethodInfo *info; + GVariantIter iter; + GVariant *child; + GValue *paramv; + guint num_params; + guint num_extra; + guint n; + guint signal_id; + GValue return_value = G_VALUE_INIT; + info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation); + g_assert (info != NULL); + num_params = g_variant_n_children (parameters); + num_extra = info->pass_fdlist ? 3 : 2; paramv = g_new0 (GValue, num_params + num_extra); + n = 0; + g_value_init (¶mv[n], TUMBLER_TYPE_EXPORTED_CACHE_SERVICE); + g_value_set_object (¶mv[n++], skeleton); + g_value_init (¶mv[n], G_TYPE_DBUS_METHOD_INVOCATION); + g_value_set_object (¶mv[n++], invocation); + if (info->pass_fdlist) + { +#ifdef G_OS_UNIX + g_value_init (¶mv[n], G_TYPE_UNIX_FD_LIST); + g_value_set_object (¶mv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation))); +#else + g_assert_not_reached (); +#endif + } + g_variant_iter_init (&iter, parameters); + while ((child = g_variant_iter_next_value (&iter)) != NULL) + { + _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - num_extra]; + if (arg_info->use_gvariant) + { + g_value_init (¶mv[n], G_TYPE_VARIANT); + g_value_set_variant (¶mv[n], child); + n++; + } + else + g_dbus_gvariant_to_gvalue (child, ¶mv[n++]); + g_variant_unref (child); + } + signal_id = g_signal_lookup (info->signal_name, TUMBLER_TYPE_EXPORTED_CACHE_SERVICE); + g_value_init (&return_value, G_TYPE_BOOLEAN); + g_signal_emitv (paramv, signal_id, 0, &return_value); + if (!g_value_get_boolean (&return_value)) + g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name); + g_value_unset (&return_value); + for (n = 0; n < num_params + num_extra; n++) + g_value_unset (¶mv[n]); + g_free (paramv); +} + +static GVariant * +_tumbler_exported_cache_service_skeleton_handle_get_property ( + GDBusConnection *connection G_GNUC_UNUSED, + const gchar *sender G_GNUC_UNUSED, + const gchar *object_path G_GNUC_UNUSED, + const gchar *interface_name G_GNUC_UNUSED, + const gchar *property_name, + GError **error, + gpointer user_data) +{ + TumblerExportedCacheServiceSkeleton *skeleton = TUMBLER_EXPORTED_CACHE_SERVICE_SKELETON (user_data); + GValue value = G_VALUE_INIT; + GParamSpec *pspec; + _ExtendedGDBusPropertyInfo *info; + GVariant *ret; + ret = NULL; + info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_tumbler_exported_cache_service_interface_info.parent_struct, property_name); + g_assert (info != NULL); + pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name); + if (pspec == NULL) + { + g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name); + } + else + { + g_value_init (&value, pspec->value_type); + g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value); + ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature)); + g_value_unset (&value); + } + return ret; +} + +static gboolean +_tumbler_exported_cache_service_skeleton_handle_set_property ( + GDBusConnection *connection G_GNUC_UNUSED, + const gchar *sender G_GNUC_UNUSED, + const gchar *object_path G_GNUC_UNUSED, + const gchar *interface_name G_GNUC_UNUSED, + const gchar *property_name, + GVariant *variant, + GError **error, + gpointer user_data) +{ + TumblerExportedCacheServiceSkeleton *skeleton = TUMBLER_EXPORTED_CACHE_SERVICE_SKELETON (user_data); + GValue value = G_VALUE_INIT; + GParamSpec *pspec; + _ExtendedGDBusPropertyInfo *info; + gboolean ret; + ret = FALSE; + info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_tumbler_exported_cache_service_interface_info.parent_struct, property_name); + g_assert (info != NULL); + pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name); + if (pspec == NULL) + { + g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name); + } + else + { + if (info->use_gvariant) + g_value_set_variant (&value, variant); + else + g_dbus_gvariant_to_gvalue (variant, &value); + g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value); + g_value_unset (&value); + ret = TRUE; + } + return ret; +} + +static const GDBusInterfaceVTable _tumbler_exported_cache_service_skeleton_vtable = +{ + _tumbler_exported_cache_service_skeleton_handle_method_call, + _tumbler_exported_cache_service_skeleton_handle_get_property, + _tumbler_exported_cache_service_skeleton_handle_set_property, + {NULL} +}; + +static GDBusInterfaceInfo * +tumbler_exported_cache_service_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED) +{ + return tumbler_exported_cache_service_interface_info (); +} + +static GDBusInterfaceVTable * +tumbler_exported_cache_service_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED) +{ + return (GDBusInterfaceVTable *) &_tumbler_exported_cache_service_skeleton_vtable; +} + +static GVariant * +tumbler_exported_cache_service_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton) +{ + TumblerExportedCacheServiceSkeleton *skeleton = TUMBLER_EXPORTED_CACHE_SERVICE_SKELETON (_skeleton); + + GVariantBuilder builder; + guint n; + g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}")); + if (_tumbler_exported_cache_service_interface_info.parent_struct.properties == NULL) + goto out; + for (n = 0; _tumbler_exported_cache_service_interface_info.parent_struct.properties[n] != NULL; n++) + { + GDBusPropertyInfo *info = _tumbler_exported_cache_service_interface_info.parent_struct.properties[n]; + if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE) + { + GVariant *value; + value = _tumbler_exported_cache_service_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.freedesktop.thumbnails.Cache1", info->name, NULL, skeleton); + if (value != NULL) + { + g_variant_take_ref (value); + g_variant_builder_add (&builder, "{sv}", info->name, value); + g_variant_unref (value); + } + } + } +out: + return g_variant_builder_end (&builder); +} + +static void +tumbler_exported_cache_service_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton) +{ +} + +static void tumbler_exported_cache_service_skeleton_iface_init (TumblerExportedCacheServiceIface *iface); +#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 +G_DEFINE_TYPE_WITH_CODE (TumblerExportedCacheServiceSkeleton, tumbler_exported_cache_service_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON, + G_ADD_PRIVATE (TumblerExportedCacheServiceSkeleton) + G_IMPLEMENT_INTERFACE (TUMBLER_TYPE_EXPORTED_CACHE_SERVICE, tumbler_exported_cache_service_skeleton_iface_init)); + +#else +G_DEFINE_TYPE_WITH_CODE (TumblerExportedCacheServiceSkeleton, tumbler_exported_cache_service_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON, + G_IMPLEMENT_INTERFACE (TUMBLER_TYPE_EXPORTED_CACHE_SERVICE, tumbler_exported_cache_service_skeleton_iface_init)); + +#endif +static void +tumbler_exported_cache_service_skeleton_finalize (GObject *object) +{ + TumblerExportedCacheServiceSkeleton *skeleton = TUMBLER_EXPORTED_CACHE_SERVICE_SKELETON (object); + g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free); + if (skeleton->priv->changed_properties_idle_source != NULL) + g_source_destroy (skeleton->priv->changed_properties_idle_source); + g_main_context_unref (skeleton->priv->context); + g_mutex_clear (&skeleton->priv->lock); + G_OBJECT_CLASS (tumbler_exported_cache_service_skeleton_parent_class)->finalize (object); +} + +static void +tumbler_exported_cache_service_skeleton_init (TumblerExportedCacheServiceSkeleton *skeleton) +{ +#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 + skeleton->priv = tumbler_exported_cache_service_skeleton_get_instance_private (skeleton); +#else + skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_SKELETON, TumblerExportedCacheServiceSkeletonPrivate); +#endif + + g_mutex_init (&skeleton->priv->lock); + skeleton->priv->context = g_main_context_ref_thread_default (); +} + +static void +tumbler_exported_cache_service_skeleton_class_init (TumblerExportedCacheServiceSkeletonClass *klass) +{ + GObjectClass *gobject_class; + GDBusInterfaceSkeletonClass *skeleton_class; + + gobject_class = G_OBJECT_CLASS (klass); + gobject_class->finalize = tumbler_exported_cache_service_skeleton_finalize; + + skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass); + skeleton_class->get_info = tumbler_exported_cache_service_skeleton_dbus_interface_get_info; + skeleton_class->get_properties = tumbler_exported_cache_service_skeleton_dbus_interface_get_properties; + skeleton_class->flush = tumbler_exported_cache_service_skeleton_dbus_interface_flush; + skeleton_class->get_vtable = tumbler_exported_cache_service_skeleton_dbus_interface_get_vtable; + +#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38 + g_type_class_add_private (klass, sizeof (TumblerExportedCacheServiceSkeletonPrivate)); +#endif +} + +static void +tumbler_exported_cache_service_skeleton_iface_init (TumblerExportedCacheServiceIface *iface) +{ +} + +/** + * tumbler_exported_cache_service_skeleton_new: + * + * Creates a skeleton object for the D-Bus interface org.freedesktop.thumbnails.Cache1. + * + * Returns: (transfer full) (type TumblerExportedCacheServiceSkeleton): The skeleton object. + */ +TumblerExportedCacheService * +tumbler_exported_cache_service_skeleton_new (void) +{ + return TUMBLER_EXPORTED_CACHE_SERVICE (g_object_new (TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_SKELETON, NULL)); +} + diff -Nru tumbler-0.1.31/tumblerd/tumbler-cache-service-gdbus.h tumbler-0.1.90/tumblerd/tumbler-cache-service-gdbus.h --- tumbler-0.1.31/tumblerd/tumbler-cache-service-gdbus.h 1970-01-01 00:00:00.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-cache-service-gdbus.h 2017-05-11 09:08:51.000000000 +0000 @@ -0,0 +1,268 @@ +/* + * Generated by gdbus-codegen 2.50.3. DO NOT EDIT. + * + * The license of this code is the same as for the source it was derived from. + */ + +#ifndef __TUMBLER_CACHE_SERVICE_GDBUS_H__ +#define __TUMBLER_CACHE_SERVICE_GDBUS_H__ + +#include + +G_BEGIN_DECLS + + +/* ------------------------------------------------------------------------ */ +/* Declarations for org.freedesktop.thumbnails.Cache1 */ + +#define TUMBLER_TYPE_EXPORTED_CACHE_SERVICE (tumbler_exported_cache_service_get_type ()) +#define TUMBLER_EXPORTED_CACHE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TUMBLER_TYPE_EXPORTED_CACHE_SERVICE, TumblerExportedCacheService)) +#define TUMBLER_IS_EXPORTED_CACHE_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TUMBLER_TYPE_EXPORTED_CACHE_SERVICE)) +#define TUMBLER_EXPORTED_CACHE_SERVICE_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), TUMBLER_TYPE_EXPORTED_CACHE_SERVICE, TumblerExportedCacheServiceIface)) + +struct _TumblerExportedCacheService; +typedef struct _TumblerExportedCacheService TumblerExportedCacheService; +typedef struct _TumblerExportedCacheServiceIface TumblerExportedCacheServiceIface; + +struct _TumblerExportedCacheServiceIface +{ + GTypeInterface parent_iface; + + gboolean (*handle_cleanup) ( + TumblerExportedCacheService *object, + GDBusMethodInvocation *invocation, + const gchar *const *arg_base_uris, + guint arg_since); + + gboolean (*handle_copy) ( + TumblerExportedCacheService *object, + GDBusMethodInvocation *invocation, + const gchar *const *arg_from_uris, + const gchar *const *arg_to_uris); + + gboolean (*handle_delete) ( + TumblerExportedCacheService *object, + GDBusMethodInvocation *invocation, + const gchar *const *arg_uris); + + gboolean (*handle_move) ( + TumblerExportedCacheService *object, + GDBusMethodInvocation *invocation, + const gchar *const *arg_from_uris, + const gchar *const *arg_to_uris); + +}; + +GType tumbler_exported_cache_service_get_type (void) G_GNUC_CONST; + +GDBusInterfaceInfo *tumbler_exported_cache_service_interface_info (void); +guint tumbler_exported_cache_service_override_properties (GObjectClass *klass, guint property_id_begin); + + +/* D-Bus method call completion functions: */ +void tumbler_exported_cache_service_complete_move ( + TumblerExportedCacheService *object, + GDBusMethodInvocation *invocation); + +void tumbler_exported_cache_service_complete_copy ( + TumblerExportedCacheService *object, + GDBusMethodInvocation *invocation); + +void tumbler_exported_cache_service_complete_delete ( + TumblerExportedCacheService *object, + GDBusMethodInvocation *invocation); + +void tumbler_exported_cache_service_complete_cleanup ( + TumblerExportedCacheService *object, + GDBusMethodInvocation *invocation); + + + +/* D-Bus method calls: */ +void tumbler_exported_cache_service_call_move ( + TumblerExportedCacheService *proxy, + const gchar *const *arg_from_uris, + const gchar *const *arg_to_uris, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean tumbler_exported_cache_service_call_move_finish ( + TumblerExportedCacheService *proxy, + GAsyncResult *res, + GError **error); + +gboolean tumbler_exported_cache_service_call_move_sync ( + TumblerExportedCacheService *proxy, + const gchar *const *arg_from_uris, + const gchar *const *arg_to_uris, + GCancellable *cancellable, + GError **error); + +void tumbler_exported_cache_service_call_copy ( + TumblerExportedCacheService *proxy, + const gchar *const *arg_from_uris, + const gchar *const *arg_to_uris, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean tumbler_exported_cache_service_call_copy_finish ( + TumblerExportedCacheService *proxy, + GAsyncResult *res, + GError **error); + +gboolean tumbler_exported_cache_service_call_copy_sync ( + TumblerExportedCacheService *proxy, + const gchar *const *arg_from_uris, + const gchar *const *arg_to_uris, + GCancellable *cancellable, + GError **error); + +void tumbler_exported_cache_service_call_delete ( + TumblerExportedCacheService *proxy, + const gchar *const *arg_uris, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean tumbler_exported_cache_service_call_delete_finish ( + TumblerExportedCacheService *proxy, + GAsyncResult *res, + GError **error); + +gboolean tumbler_exported_cache_service_call_delete_sync ( + TumblerExportedCacheService *proxy, + const gchar *const *arg_uris, + GCancellable *cancellable, + GError **error); + +void tumbler_exported_cache_service_call_cleanup ( + TumblerExportedCacheService *proxy, + const gchar *const *arg_base_uris, + guint arg_since, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean tumbler_exported_cache_service_call_cleanup_finish ( + TumblerExportedCacheService *proxy, + GAsyncResult *res, + GError **error); + +gboolean tumbler_exported_cache_service_call_cleanup_sync ( + TumblerExportedCacheService *proxy, + const gchar *const *arg_base_uris, + guint arg_since, + GCancellable *cancellable, + GError **error); + + + +/* ---- */ + +#define TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_PROXY (tumbler_exported_cache_service_proxy_get_type ()) +#define TUMBLER_EXPORTED_CACHE_SERVICE_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_PROXY, TumblerExportedCacheServiceProxy)) +#define TUMBLER_EXPORTED_CACHE_SERVICE_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_PROXY, TumblerExportedCacheServiceProxyClass)) +#define TUMBLER_EXPORTED_CACHE_SERVICE_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_PROXY, TumblerExportedCacheServiceProxyClass)) +#define TUMBLER_IS_EXPORTED_CACHE_SERVICE_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_PROXY)) +#define TUMBLER_IS_EXPORTED_CACHE_SERVICE_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_PROXY)) + +typedef struct _TumblerExportedCacheServiceProxy TumblerExportedCacheServiceProxy; +typedef struct _TumblerExportedCacheServiceProxyClass TumblerExportedCacheServiceProxyClass; +typedef struct _TumblerExportedCacheServiceProxyPrivate TumblerExportedCacheServiceProxyPrivate; + +struct _TumblerExportedCacheServiceProxy +{ + /*< private >*/ + GDBusProxy parent_instance; + TumblerExportedCacheServiceProxyPrivate *priv; +}; + +struct _TumblerExportedCacheServiceProxyClass +{ + GDBusProxyClass parent_class; +}; + +GType tumbler_exported_cache_service_proxy_get_type (void) G_GNUC_CONST; + +#if GLIB_CHECK_VERSION(2, 44, 0) +G_DEFINE_AUTOPTR_CLEANUP_FUNC (TumblerExportedCacheServiceProxy, g_object_unref) +#endif + +void tumbler_exported_cache_service_proxy_new ( + GDBusConnection *connection, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +TumblerExportedCacheService *tumbler_exported_cache_service_proxy_new_finish ( + GAsyncResult *res, + GError **error); +TumblerExportedCacheService *tumbler_exported_cache_service_proxy_new_sync ( + GDBusConnection *connection, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GError **error); + +void tumbler_exported_cache_service_proxy_new_for_bus ( + GBusType bus_type, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +TumblerExportedCacheService *tumbler_exported_cache_service_proxy_new_for_bus_finish ( + GAsyncResult *res, + GError **error); +TumblerExportedCacheService *tumbler_exported_cache_service_proxy_new_for_bus_sync ( + GBusType bus_type, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GError **error); + + +/* ---- */ + +#define TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_SKELETON (tumbler_exported_cache_service_skeleton_get_type ()) +#define TUMBLER_EXPORTED_CACHE_SERVICE_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_SKELETON, TumblerExportedCacheServiceSkeleton)) +#define TUMBLER_EXPORTED_CACHE_SERVICE_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_SKELETON, TumblerExportedCacheServiceSkeletonClass)) +#define TUMBLER_EXPORTED_CACHE_SERVICE_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_SKELETON, TumblerExportedCacheServiceSkeletonClass)) +#define TUMBLER_IS_EXPORTED_CACHE_SERVICE_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_SKELETON)) +#define TUMBLER_IS_EXPORTED_CACHE_SERVICE_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TUMBLER_TYPE_EXPORTED_CACHE_SERVICE_SKELETON)) + +typedef struct _TumblerExportedCacheServiceSkeleton TumblerExportedCacheServiceSkeleton; +typedef struct _TumblerExportedCacheServiceSkeletonClass TumblerExportedCacheServiceSkeletonClass; +typedef struct _TumblerExportedCacheServiceSkeletonPrivate TumblerExportedCacheServiceSkeletonPrivate; + +struct _TumblerExportedCacheServiceSkeleton +{ + /*< private >*/ + GDBusInterfaceSkeleton parent_instance; + TumblerExportedCacheServiceSkeletonPrivate *priv; +}; + +struct _TumblerExportedCacheServiceSkeletonClass +{ + GDBusInterfaceSkeletonClass parent_class; +}; + +GType tumbler_exported_cache_service_skeleton_get_type (void) G_GNUC_CONST; + +#if GLIB_CHECK_VERSION(2, 44, 0) +G_DEFINE_AUTOPTR_CLEANUP_FUNC (TumblerExportedCacheServiceSkeleton, g_object_unref) +#endif + +TumblerExportedCacheService *tumbler_exported_cache_service_skeleton_new (void); + + +G_END_DECLS + +#endif /* __TUMBLER_CACHE_SERVICE_GDBUS_H__ */ diff -Nru tumbler-0.1.31/tumblerd/tumbler-cache-service.h tumbler-0.1.90/tumblerd/tumbler-cache-service.h --- tumbler-0.1.31/tumblerd/tumbler-cache-service.h 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-cache-service.h 2017-05-11 09:06:12.000000000 +0000 @@ -23,8 +23,6 @@ #include -#include - #include G_BEGIN_DECLS; @@ -41,26 +39,10 @@ GType tumbler_cache_service_get_type (void) G_GNUC_CONST; -TumblerCacheService *tumbler_cache_service_new (DBusGConnection *connection, +TumblerCacheService *tumbler_cache_service_new (GDBusConnection *connection, TumblerLifecycleManager *lifecycle_manager) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; -gboolean tumbler_cache_service_start (TumblerCacheService *service, - GError **error); -void tumbler_cache_service_move (TumblerCacheService *service, - const gchar *const *from_uris, - const gchar *const *to_uris, - DBusGMethodInvocation *context); -void tumbler_cache_service_copy (TumblerCacheService *service, - const gchar *const *from_uris, - const gchar *const *to_uris, - DBusGMethodInvocation *context); -void tumbler_cache_service_delete (TumblerCacheService *service, - const gchar *const *uris, - DBusGMethodInvocation *context); -void tumbler_cache_service_cleanup (TumblerCacheService *service, - const gchar *const *uri_prefix, - guint32 since, - DBusGMethodInvocation *context); +gboolean tumbler_cache_service_is_exported (TumblerCacheService *service); G_END_DECLS; diff -Nru tumbler-0.1.31/tumblerd/tumbler-manager.c tumbler-0.1.90/tumblerd/tumbler-manager.c --- tumbler-0.1.31/tumblerd/tumbler-manager.c 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-manager.c 2017-05-11 09:06:12.000000000 +0000 @@ -1,6 +1,7 @@ /* vi:set et ai sw=2 sts=2 ts=2: */ /*- * Copyright (c) 2009-2011 Jannis Pohlmann + * Copyright (c) 2015 Ali Abdallah * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -36,18 +37,13 @@ #include -#include -#include -#include - #include #include -#include +#include #include #include - /* Property identifiers */ enum { @@ -73,6 +69,11 @@ guint prop_id, const GValue *value, GParamSpec *pspec); +static gboolean tumbler_manager_register_cb (TumblerExportedManager *skeleton, + GDBusMethodInvocation *invocation, + const gchar *const *uri_schemes, + const gchar *const *mime_types, + TumblerManager *manager); static void tumbler_manager_monitor_unref (GFileMonitor *monitor, TumblerManager *manager); static void tumbler_manager_load_thumbnailers (TumblerManager *manager, @@ -105,9 +106,12 @@ struct _TumblerManager { TumblerComponent __parent__; - - DBusGConnection *connection; - TumblerRegistry *registry; + GDBusConnection *connection; + TumblerExportedManager *skeleton; + + gboolean dbus_interface_exported; + + TumblerRegistry *registry; /* Directory and monitor objects for the thumbnailer dirs in * XDG_DATA_HOME and XDG_DATA_DIRS */ @@ -157,7 +161,7 @@ tumbler_manager_class_init (TumblerManagerClass *klass) { GObjectClass *gobject_class; - + gobject_class = G_OBJECT_CLASS (klass); gobject_class->constructed = tumbler_manager_constructed; gobject_class->finalize = tumbler_manager_finalize; @@ -165,11 +169,12 @@ gobject_class->set_property = tumbler_manager_set_property; g_object_class_install_property (gobject_class, PROP_CONNECTION, - g_param_spec_pointer ("connection", - "connection", - "connection", - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY)); + g_param_spec_object ("connection", + "connection", + "connection", + G_TYPE_DBUS_CONNECTION, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property (gobject_class, PROP_REGISTRY, g_param_spec_object ("registry", @@ -205,19 +210,31 @@ static void tumbler_manager_constructed (GObject *object) { - TumblerManager *manager = TUMBLER_MANAGER (object); - - /* everything's fine, install the manager type D-Bus info */ - dbus_g_object_type_install_info (G_OBJECT_TYPE (manager), - &dbus_glib_tumbler_manager_object_info); - - /* register the manager instance as a handler of the manager interface */ - dbus_g_connection_register_g_object (manager->connection, - "/org/freedesktop/thumbnails/Manager1", - G_OBJECT (manager)); -} + TumblerManager *manager; + GError *error = NULL; + + manager = TUMBLER_MANAGER (object); + manager->skeleton = tumbler_exported_manager_skeleton_new (); + g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON(manager->skeleton), + manager->connection, + "/org/freedesktop/thumbnails/Manager1", + &error); + + if (error != NULL) + { + g_critical ("error exporting thumbnail manager on session bus: %s", error->message); + g_error_free (error); + manager->dbus_interface_exported = FALSE; + } + else + { + manager->dbus_interface_exported = TRUE; + g_signal_connect(manager->skeleton, "handle-register", + G_CALLBACK(tumbler_manager_register_cb), manager); + } +} static void tumbler_manager_finalize (GObject *object) @@ -241,9 +258,20 @@ /* release the registry */ g_object_unref (manager->registry); - /* release the D-Bus connection object */ - dbus_g_connection_unref (manager->connection); + /* Unexport from dbus */ + if (manager->dbus_interface_exported) + g_dbus_interface_skeleton_unexport_from_connection + ( + G_DBUS_INTERFACE_SKELETON (manager->skeleton), + manager->connection + ); + /* release the Skeleton object */ + g_object_unref (manager->skeleton); + + /* release the D-Bus connection object */ + g_object_unref (manager->connection); + tumbler_mutex_unlock (manager->mutex); /* destroy the mutex */ @@ -265,7 +293,7 @@ switch (prop_id) { case PROP_CONNECTION: - g_value_set_pointer (value, manager->connection); + g_value_set_object (value, manager->connection); break; case PROP_REGISTRY: g_value_set_object (value, manager->registry); @@ -289,7 +317,7 @@ switch (prop_id) { case PROP_CONNECTION: - manager->connection = dbus_g_connection_ref (g_value_get_pointer (value)); + manager->connection = g_object_ref (g_value_get_object (value)); break; case PROP_REGISTRY: manager->registry = g_value_dup_object (value); @@ -300,7 +328,38 @@ } } - +static gboolean +tumbler_manager_register_cb (TumblerExportedManager *skeleton, + GDBusMethodInvocation *invocation, + const gchar *const *uri_schemes, + const gchar *const *mime_types, + TumblerManager *manager) +{ + TumblerThumbnailer *thumbnailer; + const gchar *sender_name; + + g_return_val_if_fail (TUMBLER_IS_MANAGER (manager), FALSE); + g_return_val_if_fail (uri_schemes != NULL, FALSE); + g_return_val_if_fail (mime_types != NULL, FALSE); + + sender_name = g_dbus_method_invocation_get_sender (invocation); + + tumbler_mutex_lock (manager->mutex); + + thumbnailer = tumbler_specialized_thumbnailer_new_foreign (manager->connection, + sender_name, uri_schemes, + mime_types); + + tumbler_registry_add (manager->registry, thumbnailer); + + g_object_unref (thumbnailer); + + tumbler_mutex_unlock (manager->mutex); + + tumbler_exported_manager_complete_register(skeleton, invocation); + + return TRUE; +} static void tumbler_manager_monitor_unref (GFileMonitor *monitor, @@ -1176,7 +1235,7 @@ * directory objects, directory monitors, override infos and thumbnailer * infos. */ -static void +void tumbler_manager_load (TumblerManager *manager) { const gchar *const *data_dirs; @@ -1827,7 +1886,7 @@ TumblerManager * -tumbler_manager_new (DBusGConnection *connection, +tumbler_manager_new (GDBusConnection *connection, TumblerLifecycleManager *lifecycle_manager, TumblerRegistry *registry) { @@ -1838,81 +1897,9 @@ NULL); } - - -gboolean -tumbler_manager_start (TumblerManager *manager, - GError **error) +gboolean tumbler_manager_is_exported (TumblerManager *manager) { - DBusConnection *connection; - gint result; - g_return_val_if_fail (TUMBLER_IS_MANAGER (manager), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - tumbler_mutex_lock (manager->mutex); - - /* get the native D-Bus connection */ - connection = dbus_g_connection_get_connection (manager->connection); - - /* request ownership for the manager interface */ - result = dbus_bus_request_name (connection, "org.freedesktop.thumbnails.Manager1", - DBUS_NAME_FLAG_DO_NOT_QUEUE, NULL); - - /* check if that failed */ - if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) - { - if (error != NULL) - { - g_set_error (error, DBUS_GERROR, DBUS_GERROR_FAILED, - _("Another thumbnailer manager is already running")); - } - - tumbler_mutex_unlock (manager->mutex); - - /* i can't work like this! */ - return FALSE; - } - - tumbler_mutex_unlock (manager->mutex); - - /* load thumbnailers installed into the system permanently */ - tumbler_manager_load (manager); - - /* done initializing and loading all permanent thumbnailers */ - return TRUE; -} - - - -void -tumbler_manager_register (TumblerManager *manager, - const gchar *const *uri_schemes, - const gchar *const *mime_types, - DBusGMethodInvocation *context) -{ - TumblerThumbnailer *thumbnailer; - gchar *sender_name; - - dbus_async_return_if_fail (TUMBLER_IS_MANAGER (manager), context); - dbus_async_return_if_fail (uri_schemes != NULL, context); - dbus_async_return_if_fail (mime_types != NULL, context); - - sender_name = dbus_g_method_get_sender (context); - - tumbler_mutex_lock (manager->mutex); - - thumbnailer = tumbler_specialized_thumbnailer_new_foreign (manager->connection, - sender_name, uri_schemes, - mime_types); - - tumbler_registry_add (manager->registry, thumbnailer); - - g_object_unref (thumbnailer); - - tumbler_mutex_unlock (manager->mutex); - - g_free (sender_name); - - dbus_g_method_return (context); + + return manager->dbus_interface_exported; } diff -Nru tumbler-0.1.31/tumblerd/tumbler-manager-dbus-bindings.h tumbler-0.1.90/tumblerd/tumbler-manager-dbus-bindings.h --- tumbler-0.1.31/tumblerd/tumbler-manager-dbus-bindings.h 2015-02-28 16:28:41.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-manager-dbus-bindings.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,120 +0,0 @@ -/* Generated by dbus-binding-tool; do not edit! */ - - -#ifndef __dbus_glib_marshal_tumbler_manager_MARSHAL_H__ -#define __dbus_glib_marshal_tumbler_manager_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_schar (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#define g_marshal_value_peek_variant(v) g_value_get_variant (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* NONE:STRING,STRING,POINTER */ -extern void dbus_glib_marshal_tumbler_manager_VOID__STRING_STRING_POINTER (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -void -dbus_glib_marshal_tumbler_manager_VOID__STRING_STRING_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__STRING_STRING_POINTER) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - gpointer arg_3, - gpointer data2); - register GMarshalFunc_VOID__STRING_STRING_POINTER callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 4); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__STRING_STRING_POINTER) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_string (param_values + 1), - g_marshal_value_peek_string (param_values + 2), - g_marshal_value_peek_pointer (param_values + 3), - data2); -} -#define dbus_glib_marshal_tumbler_manager_NONE__STRING_STRING_POINTER dbus_glib_marshal_tumbler_manager_VOID__STRING_STRING_POINTER - -G_END_DECLS - -#endif /* __dbus_glib_marshal_tumbler_manager_MARSHAL_H__ */ - -#include -static const DBusGMethodInfo dbus_glib_tumbler_manager_methods[] = { - { (GCallback) tumbler_manager_register, dbus_glib_marshal_tumbler_manager_NONE__STRING_STRING_POINTER, 0 }, -}; - -const DBusGObjectInfo dbus_glib_tumbler_manager_object_info = { 1, - dbus_glib_tumbler_manager_methods, - 1, -"org.freedesktop.thumbnails.Manager1\0Register\0A\0uri_scheme\0I\0s\0mime_type\0I\0s\0\0\0", -"\0", -"\0" -}; - diff -Nru tumbler-0.1.31/tumblerd/tumbler-manager-dbus.xml tumbler-0.1.90/tumblerd/tumbler-manager-dbus.xml --- tumbler-0.1.31/tumblerd/tumbler-manager-dbus.xml 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-manager-dbus.xml 2017-05-11 09:06:12.000000000 +0000 @@ -1,10 +1,13 @@ + + + - + diff -Nru tumbler-0.1.31/tumblerd/tumbler-manager-gdbus.c tumbler-0.1.90/tumblerd/tumbler-manager-gdbus.c --- tumbler-0.1.31/tumblerd/tumbler-manager-gdbus.c 1970-01-01 00:00:00.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-manager-gdbus.c 2017-05-11 09:08:51.000000000 +0000 @@ -0,0 +1,1056 @@ +/* + * Generated by gdbus-codegen 2.50.3. DO NOT EDIT. + * + * The license of this code is the same as for the source it was derived from. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "tumbler-manager-gdbus.h" + +#include +#ifdef G_OS_UNIX +# include +#endif + +typedef struct +{ + GDBusArgInfo parent_struct; + gboolean use_gvariant; +} _ExtendedGDBusArgInfo; + +typedef struct +{ + GDBusMethodInfo parent_struct; + const gchar *signal_name; + gboolean pass_fdlist; +} _ExtendedGDBusMethodInfo; + +typedef struct +{ + GDBusSignalInfo parent_struct; + const gchar *signal_name; +} _ExtendedGDBusSignalInfo; + +typedef struct +{ + GDBusPropertyInfo parent_struct; + const gchar *hyphen_name; + gboolean use_gvariant; +} _ExtendedGDBusPropertyInfo; + +typedef struct +{ + GDBusInterfaceInfo parent_struct; + const gchar *hyphen_name; +} _ExtendedGDBusInterfaceInfo; + +typedef struct +{ + const _ExtendedGDBusPropertyInfo *info; + guint prop_id; + GValue orig_value; /* the value before the change */ +} ChangedProperty; + +static void +_changed_property_free (ChangedProperty *data) +{ + g_value_unset (&data->orig_value); + g_free (data); +} + +static gboolean +_g_strv_equal0 (gchar **a, gchar **b) +{ + gboolean ret = FALSE; + guint n; + if (a == NULL && b == NULL) + { + ret = TRUE; + goto out; + } + if (a == NULL || b == NULL) + goto out; + if (g_strv_length (a) != g_strv_length (b)) + goto out; + for (n = 0; a[n] != NULL; n++) + if (g_strcmp0 (a[n], b[n]) != 0) + goto out; + ret = TRUE; +out: + return ret; +} + +static gboolean +_g_variant_equal0 (GVariant *a, GVariant *b) +{ + gboolean ret = FALSE; + if (a == NULL && b == NULL) + { + ret = TRUE; + goto out; + } + if (a == NULL || b == NULL) + goto out; + ret = g_variant_equal (a, b); +out: + return ret; +} + +G_GNUC_UNUSED static gboolean +_g_value_equal (const GValue *a, const GValue *b) +{ + gboolean ret = FALSE; + g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b)); + switch (G_VALUE_TYPE (a)) + { + case G_TYPE_BOOLEAN: + ret = (g_value_get_boolean (a) == g_value_get_boolean (b)); + break; + case G_TYPE_UCHAR: + ret = (g_value_get_uchar (a) == g_value_get_uchar (b)); + break; + case G_TYPE_INT: + ret = (g_value_get_int (a) == g_value_get_int (b)); + break; + case G_TYPE_UINT: + ret = (g_value_get_uint (a) == g_value_get_uint (b)); + break; + case G_TYPE_INT64: + ret = (g_value_get_int64 (a) == g_value_get_int64 (b)); + break; + case G_TYPE_UINT64: + ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b)); + break; + case G_TYPE_DOUBLE: + { + /* Avoid -Wfloat-equal warnings by doing a direct bit compare */ + gdouble da = g_value_get_double (a); + gdouble db = g_value_get_double (b); + ret = memcmp (&da, &db, sizeof (gdouble)) == 0; + } + break; + case G_TYPE_STRING: + ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0); + break; + case G_TYPE_VARIANT: + ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b)); + break; + default: + if (G_VALUE_TYPE (a) == G_TYPE_STRV) + ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b)); + else + g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a))); + break; + } + return ret; +} + +/* ------------------------------------------------------------------------ + * Code for interface org.freedesktop.thumbnails.Manager1 + * ------------------------------------------------------------------------ + */ + +/** + * SECTION:TumblerExportedManager + * @title: TumblerExportedManager + * @short_description: Generated C code for the org.freedesktop.thumbnails.Manager1 D-Bus interface + * + * This section contains code for working with the org.freedesktop.thumbnails.Manager1 D-Bus interface in C. + */ + +/* ---- Introspection data for org.freedesktop.thumbnails.Manager1 ---- */ + +static const _ExtendedGDBusArgInfo _tumbler_exported_manager_method_info_register_IN_ARG_uri_scheme = +{ + { + -1, + (gchar *) "uri_scheme", + (gchar *) "s", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_manager_method_info_register_IN_ARG_mime_type = +{ + { + -1, + (gchar *) "mime_type", + (gchar *) "s", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _tumbler_exported_manager_method_info_register_IN_ARG_pointers[] = +{ + &_tumbler_exported_manager_method_info_register_IN_ARG_uri_scheme, + &_tumbler_exported_manager_method_info_register_IN_ARG_mime_type, + NULL +}; + +static const _ExtendedGDBusMethodInfo _tumbler_exported_manager_method_info_register = +{ + { + -1, + (gchar *) "Register", + (GDBusArgInfo **) &_tumbler_exported_manager_method_info_register_IN_ARG_pointers, + NULL, + NULL + }, + "handle-register", + FALSE +}; + +static const _ExtendedGDBusMethodInfo * const _tumbler_exported_manager_method_info_pointers[] = +{ + &_tumbler_exported_manager_method_info_register, + NULL +}; + +static const _ExtendedGDBusInterfaceInfo _tumbler_exported_manager_interface_info = +{ + { + -1, + (gchar *) "org.freedesktop.thumbnails.Manager1", + (GDBusMethodInfo **) &_tumbler_exported_manager_method_info_pointers, + NULL, + NULL, + NULL + }, + "exported-manager", +}; + + +/** + * tumbler_exported_manager_interface_info: + * + * Gets a machine-readable description of the org.freedesktop.thumbnails.Manager1 D-Bus interface. + * + * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free. + */ +GDBusInterfaceInfo * +tumbler_exported_manager_interface_info (void) +{ + return (GDBusInterfaceInfo *) &_tumbler_exported_manager_interface_info.parent_struct; +} + +/** + * tumbler_exported_manager_override_properties: + * @klass: The class structure for a #GObject-derived class. + * @property_id_begin: The property id to assign to the first overridden property. + * + * Overrides all #GObject properties in the #TumblerExportedManager interface for a concrete class. + * The properties are overridden in the order they are defined. + * + * Returns: The last property id. + */ +guint +tumbler_exported_manager_override_properties (GObjectClass *klass, guint property_id_begin) +{ + return property_id_begin - 1; +} + + + +/** + * TumblerExportedManager: + * + * Abstract interface type for the D-Bus interface org.freedesktop.thumbnails.Manager1. + */ + +/** + * TumblerExportedManagerIface: + * @parent_iface: The parent interface. + * @handle_register: Handler for the #TumblerExportedManager::handle-register signal. + * + * Virtual table for the D-Bus interface org.freedesktop.thumbnails.Manager1. + */ + +typedef TumblerExportedManagerIface TumblerExportedManagerInterface; +G_DEFINE_INTERFACE (TumblerExportedManager, tumbler_exported_manager, G_TYPE_OBJECT); + +static void +tumbler_exported_manager_default_init (TumblerExportedManagerIface *iface) +{ + /* GObject signals for incoming D-Bus method calls: */ + /** + * TumblerExportedManager::handle-register: + * @object: A #TumblerExportedManager. + * @invocation: A #GDBusMethodInvocation. + * @arg_uri_scheme: Argument passed by remote caller. + * @arg_mime_type: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the Register() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call tumbler_exported_manager_complete_register() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + g_signal_new ("handle-register", + G_TYPE_FROM_INTERFACE (iface), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (TumblerExportedManagerIface, handle_register), + g_signal_accumulator_true_handled, + NULL, + g_cclosure_marshal_generic, + G_TYPE_BOOLEAN, + 3, + G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING, G_TYPE_STRING); + +} + +/** + * tumbler_exported_manager_call_register: + * @proxy: A #TumblerExportedManagerProxy. + * @arg_uri_scheme: Argument to pass with the method invocation. + * @arg_mime_type: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the Register() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call tumbler_exported_manager_call_register_finish() to get the result of the operation. + * + * See tumbler_exported_manager_call_register_sync() for the synchronous, blocking version of this method. + */ +void +tumbler_exported_manager_call_register ( + TumblerExportedManager *proxy, + const gchar *arg_uri_scheme, + const gchar *arg_mime_type, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_dbus_proxy_call (G_DBUS_PROXY (proxy), + "Register", + g_variant_new ("(ss)", + arg_uri_scheme, + arg_mime_type), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + callback, + user_data); +} + +/** + * tumbler_exported_manager_call_register_finish: + * @proxy: A #TumblerExportedManagerProxy. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to tumbler_exported_manager_call_register(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with tumbler_exported_manager_call_register(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_manager_call_register_finish ( + TumblerExportedManager *proxy, + GAsyncResult *res, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "()"); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_manager_call_register_sync: + * @proxy: A #TumblerExportedManagerProxy. + * @arg_uri_scheme: Argument to pass with the method invocation. + * @arg_mime_type: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the Register() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See tumbler_exported_manager_call_register() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_manager_call_register_sync ( + TumblerExportedManager *proxy, + const gchar *arg_uri_scheme, + const gchar *arg_mime_type, + GCancellable *cancellable, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), + "Register", + g_variant_new ("(ss)", + arg_uri_scheme, + arg_mime_type), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "()"); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_manager_complete_register: + * @object: A #TumblerExportedManager. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * + * Helper function used in service implementations to finish handling invocations of the Register() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ +void +tumbler_exported_manager_complete_register ( + TumblerExportedManager *object, + GDBusMethodInvocation *invocation) +{ + g_dbus_method_invocation_return_value (invocation, + g_variant_new ("()")); +} + +/* ------------------------------------------------------------------------ */ + +/** + * TumblerExportedManagerProxy: + * + * The #TumblerExportedManagerProxy structure contains only private data and should only be accessed using the provided API. + */ + +/** + * TumblerExportedManagerProxyClass: + * @parent_class: The parent class. + * + * Class structure for #TumblerExportedManagerProxy. + */ + +struct _TumblerExportedManagerProxyPrivate +{ + GData *qdata; +}; + +static void tumbler_exported_manager_proxy_iface_init (TumblerExportedManagerIface *iface); + +#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 +G_DEFINE_TYPE_WITH_CODE (TumblerExportedManagerProxy, tumbler_exported_manager_proxy, G_TYPE_DBUS_PROXY, + G_ADD_PRIVATE (TumblerExportedManagerProxy) + G_IMPLEMENT_INTERFACE (TUMBLER_TYPE_EXPORTED_MANAGER, tumbler_exported_manager_proxy_iface_init)); + +#else +G_DEFINE_TYPE_WITH_CODE (TumblerExportedManagerProxy, tumbler_exported_manager_proxy, G_TYPE_DBUS_PROXY, + G_IMPLEMENT_INTERFACE (TUMBLER_TYPE_EXPORTED_MANAGER, tumbler_exported_manager_proxy_iface_init)); + +#endif +static void +tumbler_exported_manager_proxy_finalize (GObject *object) +{ + TumblerExportedManagerProxy *proxy = TUMBLER_EXPORTED_MANAGER_PROXY (object); + g_datalist_clear (&proxy->priv->qdata); + G_OBJECT_CLASS (tumbler_exported_manager_proxy_parent_class)->finalize (object); +} + +static void +tumbler_exported_manager_proxy_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec G_GNUC_UNUSED) +{ +} + +static void +tumbler_exported_manager_proxy_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec G_GNUC_UNUSED) +{ +} + +static void +tumbler_exported_manager_proxy_g_signal (GDBusProxy *proxy, + const gchar *sender_name G_GNUC_UNUSED, + const gchar *signal_name, + GVariant *parameters) +{ + _ExtendedGDBusSignalInfo *info; + GVariantIter iter; + GVariant *child; + GValue *paramv; + guint num_params; + guint n; + guint signal_id; + info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_tumbler_exported_manager_interface_info.parent_struct, signal_name); + if (info == NULL) + return; + num_params = g_variant_n_children (parameters); + paramv = g_new0 (GValue, num_params + 1); + g_value_init (¶mv[0], TUMBLER_TYPE_EXPORTED_MANAGER); + g_value_set_object (¶mv[0], proxy); + g_variant_iter_init (&iter, parameters); + n = 1; + while ((child = g_variant_iter_next_value (&iter)) != NULL) + { + _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1]; + if (arg_info->use_gvariant) + { + g_value_init (¶mv[n], G_TYPE_VARIANT); + g_value_set_variant (¶mv[n], child); + n++; + } + else + g_dbus_gvariant_to_gvalue (child, ¶mv[n++]); + g_variant_unref (child); + } + signal_id = g_signal_lookup (info->signal_name, TUMBLER_TYPE_EXPORTED_MANAGER); + g_signal_emitv (paramv, signal_id, 0, NULL); + for (n = 0; n < num_params + 1; n++) + g_value_unset (¶mv[n]); + g_free (paramv); +} + +static void +tumbler_exported_manager_proxy_g_properties_changed (GDBusProxy *_proxy, + GVariant *changed_properties, + const gchar *const *invalidated_properties) +{ + TumblerExportedManagerProxy *proxy = TUMBLER_EXPORTED_MANAGER_PROXY (_proxy); + guint n; + const gchar *key; + GVariantIter *iter; + _ExtendedGDBusPropertyInfo *info; + g_variant_get (changed_properties, "a{sv}", &iter); + while (g_variant_iter_next (iter, "{&sv}", &key, NULL)) + { + info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_tumbler_exported_manager_interface_info.parent_struct, key); + g_datalist_remove_data (&proxy->priv->qdata, key); + if (info != NULL) + g_object_notify (G_OBJECT (proxy), info->hyphen_name); + } + g_variant_iter_free (iter); + for (n = 0; invalidated_properties[n] != NULL; n++) + { + info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_tumbler_exported_manager_interface_info.parent_struct, invalidated_properties[n]); + g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]); + if (info != NULL) + g_object_notify (G_OBJECT (proxy), info->hyphen_name); + } +} + +static void +tumbler_exported_manager_proxy_init (TumblerExportedManagerProxy *proxy) +{ +#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 + proxy->priv = tumbler_exported_manager_proxy_get_instance_private (proxy); +#else + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, TUMBLER_TYPE_EXPORTED_MANAGER_PROXY, TumblerExportedManagerProxyPrivate); +#endif + + g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), tumbler_exported_manager_interface_info ()); +} + +static void +tumbler_exported_manager_proxy_class_init (TumblerExportedManagerProxyClass *klass) +{ + GObjectClass *gobject_class; + GDBusProxyClass *proxy_class; + + gobject_class = G_OBJECT_CLASS (klass); + gobject_class->finalize = tumbler_exported_manager_proxy_finalize; + gobject_class->get_property = tumbler_exported_manager_proxy_get_property; + gobject_class->set_property = tumbler_exported_manager_proxy_set_property; + + proxy_class = G_DBUS_PROXY_CLASS (klass); + proxy_class->g_signal = tumbler_exported_manager_proxy_g_signal; + proxy_class->g_properties_changed = tumbler_exported_manager_proxy_g_properties_changed; + +#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38 + g_type_class_add_private (klass, sizeof (TumblerExportedManagerProxyPrivate)); +#endif +} + +static void +tumbler_exported_manager_proxy_iface_init (TumblerExportedManagerIface *iface) +{ +} + +/** + * tumbler_exported_manager_proxy_new: + * @connection: A #GDBusConnection. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied. + * @user_data: User data to pass to @callback. + * + * Asynchronously creates a proxy for the D-Bus interface org.freedesktop.thumbnails.Manager1. See g_dbus_proxy_new() for more details. + * + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call tumbler_exported_manager_proxy_new_finish() to get the result of the operation. + * + * See tumbler_exported_manager_proxy_new_sync() for the synchronous, blocking version of this constructor. + */ +void +tumbler_exported_manager_proxy_new ( + GDBusConnection *connection, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_async_initable_new_async (TUMBLER_TYPE_EXPORTED_MANAGER_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.thumbnails.Manager1", NULL); +} + +/** + * tumbler_exported_manager_proxy_new_finish: + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to tumbler_exported_manager_proxy_new(). + * @error: Return location for error or %NULL + * + * Finishes an operation started with tumbler_exported_manager_proxy_new(). + * + * Returns: (transfer full) (type TumblerExportedManagerProxy): The constructed proxy object or %NULL if @error is set. + */ +TumblerExportedManager * +tumbler_exported_manager_proxy_new_finish ( + GAsyncResult *res, + GError **error) +{ + GObject *ret; + GObject *source_object; + source_object = g_async_result_get_source_object (res); + ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error); + g_object_unref (source_object); + if (ret != NULL) + return TUMBLER_EXPORTED_MANAGER (ret); + else + return NULL; +} + +/** + * tumbler_exported_manager_proxy_new_sync: + * @connection: A #GDBusConnection. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL + * + * Synchronously creates a proxy for the D-Bus interface org.freedesktop.thumbnails.Manager1. See g_dbus_proxy_new_sync() for more details. + * + * The calling thread is blocked until a reply is received. + * + * See tumbler_exported_manager_proxy_new() for the asynchronous version of this constructor. + * + * Returns: (transfer full) (type TumblerExportedManagerProxy): The constructed proxy object or %NULL if @error is set. + */ +TumblerExportedManager * +tumbler_exported_manager_proxy_new_sync ( + GDBusConnection *connection, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GError **error) +{ + GInitable *ret; + ret = g_initable_new (TUMBLER_TYPE_EXPORTED_MANAGER_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.thumbnails.Manager1", NULL); + if (ret != NULL) + return TUMBLER_EXPORTED_MANAGER (ret); + else + return NULL; +} + + +/** + * tumbler_exported_manager_proxy_new_for_bus: + * @bus_type: A #GBusType. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: A bus name (well-known or unique). + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied. + * @user_data: User data to pass to @callback. + * + * Like tumbler_exported_manager_proxy_new() but takes a #GBusType instead of a #GDBusConnection. + * + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call tumbler_exported_manager_proxy_new_for_bus_finish() to get the result of the operation. + * + * See tumbler_exported_manager_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor. + */ +void +tumbler_exported_manager_proxy_new_for_bus ( + GBusType bus_type, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_async_initable_new_async (TUMBLER_TYPE_EXPORTED_MANAGER_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.thumbnails.Manager1", NULL); +} + +/** + * tumbler_exported_manager_proxy_new_for_bus_finish: + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to tumbler_exported_manager_proxy_new_for_bus(). + * @error: Return location for error or %NULL + * + * Finishes an operation started with tumbler_exported_manager_proxy_new_for_bus(). + * + * Returns: (transfer full) (type TumblerExportedManagerProxy): The constructed proxy object or %NULL if @error is set. + */ +TumblerExportedManager * +tumbler_exported_manager_proxy_new_for_bus_finish ( + GAsyncResult *res, + GError **error) +{ + GObject *ret; + GObject *source_object; + source_object = g_async_result_get_source_object (res); + ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error); + g_object_unref (source_object); + if (ret != NULL) + return TUMBLER_EXPORTED_MANAGER (ret); + else + return NULL; +} + +/** + * tumbler_exported_manager_proxy_new_for_bus_sync: + * @bus_type: A #GBusType. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: A bus name (well-known or unique). + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL + * + * Like tumbler_exported_manager_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection. + * + * The calling thread is blocked until a reply is received. + * + * See tumbler_exported_manager_proxy_new_for_bus() for the asynchronous version of this constructor. + * + * Returns: (transfer full) (type TumblerExportedManagerProxy): The constructed proxy object or %NULL if @error is set. + */ +TumblerExportedManager * +tumbler_exported_manager_proxy_new_for_bus_sync ( + GBusType bus_type, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GError **error) +{ + GInitable *ret; + ret = g_initable_new (TUMBLER_TYPE_EXPORTED_MANAGER_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.thumbnails.Manager1", NULL); + if (ret != NULL) + return TUMBLER_EXPORTED_MANAGER (ret); + else + return NULL; +} + + +/* ------------------------------------------------------------------------ */ + +/** + * TumblerExportedManagerSkeleton: + * + * The #TumblerExportedManagerSkeleton structure contains only private data and should only be accessed using the provided API. + */ + +/** + * TumblerExportedManagerSkeletonClass: + * @parent_class: The parent class. + * + * Class structure for #TumblerExportedManagerSkeleton. + */ + +struct _TumblerExportedManagerSkeletonPrivate +{ + GValue *properties; + GList *changed_properties; + GSource *changed_properties_idle_source; + GMainContext *context; + GMutex lock; +}; + +static void +_tumbler_exported_manager_skeleton_handle_method_call ( + GDBusConnection *connection G_GNUC_UNUSED, + const gchar *sender G_GNUC_UNUSED, + const gchar *object_path G_GNUC_UNUSED, + const gchar *interface_name, + const gchar *method_name, + GVariant *parameters, + GDBusMethodInvocation *invocation, + gpointer user_data) +{ + TumblerExportedManagerSkeleton *skeleton = TUMBLER_EXPORTED_MANAGER_SKELETON (user_data); + _ExtendedGDBusMethodInfo *info; + GVariantIter iter; + GVariant *child; + GValue *paramv; + guint num_params; + guint num_extra; + guint n; + guint signal_id; + GValue return_value = G_VALUE_INIT; + info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation); + g_assert (info != NULL); + num_params = g_variant_n_children (parameters); + num_extra = info->pass_fdlist ? 3 : 2; paramv = g_new0 (GValue, num_params + num_extra); + n = 0; + g_value_init (¶mv[n], TUMBLER_TYPE_EXPORTED_MANAGER); + g_value_set_object (¶mv[n++], skeleton); + g_value_init (¶mv[n], G_TYPE_DBUS_METHOD_INVOCATION); + g_value_set_object (¶mv[n++], invocation); + if (info->pass_fdlist) + { +#ifdef G_OS_UNIX + g_value_init (¶mv[n], G_TYPE_UNIX_FD_LIST); + g_value_set_object (¶mv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation))); +#else + g_assert_not_reached (); +#endif + } + g_variant_iter_init (&iter, parameters); + while ((child = g_variant_iter_next_value (&iter)) != NULL) + { + _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - num_extra]; + if (arg_info->use_gvariant) + { + g_value_init (¶mv[n], G_TYPE_VARIANT); + g_value_set_variant (¶mv[n], child); + n++; + } + else + g_dbus_gvariant_to_gvalue (child, ¶mv[n++]); + g_variant_unref (child); + } + signal_id = g_signal_lookup (info->signal_name, TUMBLER_TYPE_EXPORTED_MANAGER); + g_value_init (&return_value, G_TYPE_BOOLEAN); + g_signal_emitv (paramv, signal_id, 0, &return_value); + if (!g_value_get_boolean (&return_value)) + g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name); + g_value_unset (&return_value); + for (n = 0; n < num_params + num_extra; n++) + g_value_unset (¶mv[n]); + g_free (paramv); +} + +static GVariant * +_tumbler_exported_manager_skeleton_handle_get_property ( + GDBusConnection *connection G_GNUC_UNUSED, + const gchar *sender G_GNUC_UNUSED, + const gchar *object_path G_GNUC_UNUSED, + const gchar *interface_name G_GNUC_UNUSED, + const gchar *property_name, + GError **error, + gpointer user_data) +{ + TumblerExportedManagerSkeleton *skeleton = TUMBLER_EXPORTED_MANAGER_SKELETON (user_data); + GValue value = G_VALUE_INIT; + GParamSpec *pspec; + _ExtendedGDBusPropertyInfo *info; + GVariant *ret; + ret = NULL; + info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_tumbler_exported_manager_interface_info.parent_struct, property_name); + g_assert (info != NULL); + pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name); + if (pspec == NULL) + { + g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name); + } + else + { + g_value_init (&value, pspec->value_type); + g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value); + ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature)); + g_value_unset (&value); + } + return ret; +} + +static gboolean +_tumbler_exported_manager_skeleton_handle_set_property ( + GDBusConnection *connection G_GNUC_UNUSED, + const gchar *sender G_GNUC_UNUSED, + const gchar *object_path G_GNUC_UNUSED, + const gchar *interface_name G_GNUC_UNUSED, + const gchar *property_name, + GVariant *variant, + GError **error, + gpointer user_data) +{ + TumblerExportedManagerSkeleton *skeleton = TUMBLER_EXPORTED_MANAGER_SKELETON (user_data); + GValue value = G_VALUE_INIT; + GParamSpec *pspec; + _ExtendedGDBusPropertyInfo *info; + gboolean ret; + ret = FALSE; + info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_tumbler_exported_manager_interface_info.parent_struct, property_name); + g_assert (info != NULL); + pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name); + if (pspec == NULL) + { + g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name); + } + else + { + if (info->use_gvariant) + g_value_set_variant (&value, variant); + else + g_dbus_gvariant_to_gvalue (variant, &value); + g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value); + g_value_unset (&value); + ret = TRUE; + } + return ret; +} + +static const GDBusInterfaceVTable _tumbler_exported_manager_skeleton_vtable = +{ + _tumbler_exported_manager_skeleton_handle_method_call, + _tumbler_exported_manager_skeleton_handle_get_property, + _tumbler_exported_manager_skeleton_handle_set_property, + {NULL} +}; + +static GDBusInterfaceInfo * +tumbler_exported_manager_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED) +{ + return tumbler_exported_manager_interface_info (); +} + +static GDBusInterfaceVTable * +tumbler_exported_manager_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED) +{ + return (GDBusInterfaceVTable *) &_tumbler_exported_manager_skeleton_vtable; +} + +static GVariant * +tumbler_exported_manager_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton) +{ + TumblerExportedManagerSkeleton *skeleton = TUMBLER_EXPORTED_MANAGER_SKELETON (_skeleton); + + GVariantBuilder builder; + guint n; + g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}")); + if (_tumbler_exported_manager_interface_info.parent_struct.properties == NULL) + goto out; + for (n = 0; _tumbler_exported_manager_interface_info.parent_struct.properties[n] != NULL; n++) + { + GDBusPropertyInfo *info = _tumbler_exported_manager_interface_info.parent_struct.properties[n]; + if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE) + { + GVariant *value; + value = _tumbler_exported_manager_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.freedesktop.thumbnails.Manager1", info->name, NULL, skeleton); + if (value != NULL) + { + g_variant_take_ref (value); + g_variant_builder_add (&builder, "{sv}", info->name, value); + g_variant_unref (value); + } + } + } +out: + return g_variant_builder_end (&builder); +} + +static void +tumbler_exported_manager_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton) +{ +} + +static void tumbler_exported_manager_skeleton_iface_init (TumblerExportedManagerIface *iface); +#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 +G_DEFINE_TYPE_WITH_CODE (TumblerExportedManagerSkeleton, tumbler_exported_manager_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON, + G_ADD_PRIVATE (TumblerExportedManagerSkeleton) + G_IMPLEMENT_INTERFACE (TUMBLER_TYPE_EXPORTED_MANAGER, tumbler_exported_manager_skeleton_iface_init)); + +#else +G_DEFINE_TYPE_WITH_CODE (TumblerExportedManagerSkeleton, tumbler_exported_manager_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON, + G_IMPLEMENT_INTERFACE (TUMBLER_TYPE_EXPORTED_MANAGER, tumbler_exported_manager_skeleton_iface_init)); + +#endif +static void +tumbler_exported_manager_skeleton_finalize (GObject *object) +{ + TumblerExportedManagerSkeleton *skeleton = TUMBLER_EXPORTED_MANAGER_SKELETON (object); + g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free); + if (skeleton->priv->changed_properties_idle_source != NULL) + g_source_destroy (skeleton->priv->changed_properties_idle_source); + g_main_context_unref (skeleton->priv->context); + g_mutex_clear (&skeleton->priv->lock); + G_OBJECT_CLASS (tumbler_exported_manager_skeleton_parent_class)->finalize (object); +} + +static void +tumbler_exported_manager_skeleton_init (TumblerExportedManagerSkeleton *skeleton) +{ +#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 + skeleton->priv = tumbler_exported_manager_skeleton_get_instance_private (skeleton); +#else + skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, TUMBLER_TYPE_EXPORTED_MANAGER_SKELETON, TumblerExportedManagerSkeletonPrivate); +#endif + + g_mutex_init (&skeleton->priv->lock); + skeleton->priv->context = g_main_context_ref_thread_default (); +} + +static void +tumbler_exported_manager_skeleton_class_init (TumblerExportedManagerSkeletonClass *klass) +{ + GObjectClass *gobject_class; + GDBusInterfaceSkeletonClass *skeleton_class; + + gobject_class = G_OBJECT_CLASS (klass); + gobject_class->finalize = tumbler_exported_manager_skeleton_finalize; + + skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass); + skeleton_class->get_info = tumbler_exported_manager_skeleton_dbus_interface_get_info; + skeleton_class->get_properties = tumbler_exported_manager_skeleton_dbus_interface_get_properties; + skeleton_class->flush = tumbler_exported_manager_skeleton_dbus_interface_flush; + skeleton_class->get_vtable = tumbler_exported_manager_skeleton_dbus_interface_get_vtable; + +#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38 + g_type_class_add_private (klass, sizeof (TumblerExportedManagerSkeletonPrivate)); +#endif +} + +static void +tumbler_exported_manager_skeleton_iface_init (TumblerExportedManagerIface *iface) +{ +} + +/** + * tumbler_exported_manager_skeleton_new: + * + * Creates a skeleton object for the D-Bus interface org.freedesktop.thumbnails.Manager1. + * + * Returns: (transfer full) (type TumblerExportedManagerSkeleton): The skeleton object. + */ +TumblerExportedManager * +tumbler_exported_manager_skeleton_new (void) +{ + return TUMBLER_EXPORTED_MANAGER (g_object_new (TUMBLER_TYPE_EXPORTED_MANAGER_SKELETON, NULL)); +} + diff -Nru tumbler-0.1.31/tumblerd/tumbler-manager-gdbus.h tumbler-0.1.90/tumblerd/tumbler-manager-gdbus.h --- tumbler-0.1.31/tumblerd/tumbler-manager-gdbus.h 1970-01-01 00:00:00.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-manager-gdbus.h 2017-05-11 09:08:51.000000000 +0000 @@ -0,0 +1,181 @@ +/* + * Generated by gdbus-codegen 2.50.3. DO NOT EDIT. + * + * The license of this code is the same as for the source it was derived from. + */ + +#ifndef __TUMBLER_MANAGER_GDBUS_H__ +#define __TUMBLER_MANAGER_GDBUS_H__ + +#include + +G_BEGIN_DECLS + + +/* ------------------------------------------------------------------------ */ +/* Declarations for org.freedesktop.thumbnails.Manager1 */ + +#define TUMBLER_TYPE_EXPORTED_MANAGER (tumbler_exported_manager_get_type ()) +#define TUMBLER_EXPORTED_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TUMBLER_TYPE_EXPORTED_MANAGER, TumblerExportedManager)) +#define TUMBLER_IS_EXPORTED_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TUMBLER_TYPE_EXPORTED_MANAGER)) +#define TUMBLER_EXPORTED_MANAGER_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), TUMBLER_TYPE_EXPORTED_MANAGER, TumblerExportedManagerIface)) + +struct _TumblerExportedManager; +typedef struct _TumblerExportedManager TumblerExportedManager; +typedef struct _TumblerExportedManagerIface TumblerExportedManagerIface; + +struct _TumblerExportedManagerIface +{ + GTypeInterface parent_iface; + + gboolean (*handle_register) ( + TumblerExportedManager *object, + GDBusMethodInvocation *invocation, + const gchar *arg_uri_scheme, + const gchar *arg_mime_type); + +}; + +GType tumbler_exported_manager_get_type (void) G_GNUC_CONST; + +GDBusInterfaceInfo *tumbler_exported_manager_interface_info (void); +guint tumbler_exported_manager_override_properties (GObjectClass *klass, guint property_id_begin); + + +/* D-Bus method call completion functions: */ +void tumbler_exported_manager_complete_register ( + TumblerExportedManager *object, + GDBusMethodInvocation *invocation); + + + +/* D-Bus method calls: */ +void tumbler_exported_manager_call_register ( + TumblerExportedManager *proxy, + const gchar *arg_uri_scheme, + const gchar *arg_mime_type, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean tumbler_exported_manager_call_register_finish ( + TumblerExportedManager *proxy, + GAsyncResult *res, + GError **error); + +gboolean tumbler_exported_manager_call_register_sync ( + TumblerExportedManager *proxy, + const gchar *arg_uri_scheme, + const gchar *arg_mime_type, + GCancellable *cancellable, + GError **error); + + + +/* ---- */ + +#define TUMBLER_TYPE_EXPORTED_MANAGER_PROXY (tumbler_exported_manager_proxy_get_type ()) +#define TUMBLER_EXPORTED_MANAGER_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TUMBLER_TYPE_EXPORTED_MANAGER_PROXY, TumblerExportedManagerProxy)) +#define TUMBLER_EXPORTED_MANAGER_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TUMBLER_TYPE_EXPORTED_MANAGER_PROXY, TumblerExportedManagerProxyClass)) +#define TUMBLER_EXPORTED_MANAGER_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TUMBLER_TYPE_EXPORTED_MANAGER_PROXY, TumblerExportedManagerProxyClass)) +#define TUMBLER_IS_EXPORTED_MANAGER_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TUMBLER_TYPE_EXPORTED_MANAGER_PROXY)) +#define TUMBLER_IS_EXPORTED_MANAGER_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TUMBLER_TYPE_EXPORTED_MANAGER_PROXY)) + +typedef struct _TumblerExportedManagerProxy TumblerExportedManagerProxy; +typedef struct _TumblerExportedManagerProxyClass TumblerExportedManagerProxyClass; +typedef struct _TumblerExportedManagerProxyPrivate TumblerExportedManagerProxyPrivate; + +struct _TumblerExportedManagerProxy +{ + /*< private >*/ + GDBusProxy parent_instance; + TumblerExportedManagerProxyPrivate *priv; +}; + +struct _TumblerExportedManagerProxyClass +{ + GDBusProxyClass parent_class; +}; + +GType tumbler_exported_manager_proxy_get_type (void) G_GNUC_CONST; + +#if GLIB_CHECK_VERSION(2, 44, 0) +G_DEFINE_AUTOPTR_CLEANUP_FUNC (TumblerExportedManagerProxy, g_object_unref) +#endif + +void tumbler_exported_manager_proxy_new ( + GDBusConnection *connection, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +TumblerExportedManager *tumbler_exported_manager_proxy_new_finish ( + GAsyncResult *res, + GError **error); +TumblerExportedManager *tumbler_exported_manager_proxy_new_sync ( + GDBusConnection *connection, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GError **error); + +void tumbler_exported_manager_proxy_new_for_bus ( + GBusType bus_type, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +TumblerExportedManager *tumbler_exported_manager_proxy_new_for_bus_finish ( + GAsyncResult *res, + GError **error); +TumblerExportedManager *tumbler_exported_manager_proxy_new_for_bus_sync ( + GBusType bus_type, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GError **error); + + +/* ---- */ + +#define TUMBLER_TYPE_EXPORTED_MANAGER_SKELETON (tumbler_exported_manager_skeleton_get_type ()) +#define TUMBLER_EXPORTED_MANAGER_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TUMBLER_TYPE_EXPORTED_MANAGER_SKELETON, TumblerExportedManagerSkeleton)) +#define TUMBLER_EXPORTED_MANAGER_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TUMBLER_TYPE_EXPORTED_MANAGER_SKELETON, TumblerExportedManagerSkeletonClass)) +#define TUMBLER_EXPORTED_MANAGER_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TUMBLER_TYPE_EXPORTED_MANAGER_SKELETON, TumblerExportedManagerSkeletonClass)) +#define TUMBLER_IS_EXPORTED_MANAGER_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TUMBLER_TYPE_EXPORTED_MANAGER_SKELETON)) +#define TUMBLER_IS_EXPORTED_MANAGER_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TUMBLER_TYPE_EXPORTED_MANAGER_SKELETON)) + +typedef struct _TumblerExportedManagerSkeleton TumblerExportedManagerSkeleton; +typedef struct _TumblerExportedManagerSkeletonClass TumblerExportedManagerSkeletonClass; +typedef struct _TumblerExportedManagerSkeletonPrivate TumblerExportedManagerSkeletonPrivate; + +struct _TumblerExportedManagerSkeleton +{ + /*< private >*/ + GDBusInterfaceSkeleton parent_instance; + TumblerExportedManagerSkeletonPrivate *priv; +}; + +struct _TumblerExportedManagerSkeletonClass +{ + GDBusInterfaceSkeletonClass parent_class; +}; + +GType tumbler_exported_manager_skeleton_get_type (void) G_GNUC_CONST; + +#if GLIB_CHECK_VERSION(2, 44, 0) +G_DEFINE_AUTOPTR_CLEANUP_FUNC (TumblerExportedManagerSkeleton, g_object_unref) +#endif + +TumblerExportedManager *tumbler_exported_manager_skeleton_new (void); + + +G_END_DECLS + +#endif /* __TUMBLER_MANAGER_GDBUS_H__ */ diff -Nru tumbler-0.1.31/tumblerd/tumbler-manager.h tumbler-0.1.90/tumblerd/tumbler-manager.h --- tumbler-0.1.31/tumblerd/tumbler-manager.h 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-manager.h 2017-05-11 09:06:12.000000000 +0000 @@ -1,6 +1,7 @@ /* vi:set et ai sw=2 sts=2 ts=2: */ /*- * Copyright (c) 2009-2011 Jannis Pohlmann + * Copyright (c) 2015 Ali Abdallah * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -21,8 +22,6 @@ #ifndef __TUMBLER_MANAGER_H__ #define __TUMBLER_MANAGER_H__ -#include - #include #include @@ -40,17 +39,12 @@ GType tumbler_manager_get_type (void) G_GNUC_CONST; -TumblerManager *tumbler_manager_new (DBusGConnection *connection, +TumblerManager *tumbler_manager_new (GDBusConnection *connection, TumblerLifecycleManager *lifecycle_manager, TumblerRegistry *registry) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; -gboolean tumbler_manager_start (TumblerManager *manager, - GError **error); -void tumbler_manager_register (TumblerManager *manager, - const gchar *const *uri_schemes, - const gchar *const *mime_types, - DBusGMethodInvocation *context); -void tumbler_manager_get_supported (TumblerManager *manager, - DBusGMethodInvocation *context); +void tumbler_manager_load (TumblerManager *manager); + +gboolean tumbler_manager_is_exported (TumblerManager *manager); G_END_DECLS; diff -Nru tumbler-0.1.31/tumblerd/tumbler-service.c tumbler-0.1.90/tumblerd/tumbler-service.c --- tumbler-0.1.31/tumblerd/tumbler-service.c 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-service.c 2017-05-11 09:06:12.000000000 +0000 @@ -1,7 +1,8 @@ /* vi:set et ai sw=2 sts=2 ts=2: */ /*- * Copyright (c) 2009-2011 Jannis Pohlmann - * + * Copyright (c) 2015 Ali Abdallah + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of @@ -28,20 +29,15 @@ #include -#include -#include -#include - #include #include #include #include -#include #include #include #include - +#include #define THUMBNAILER_PATH "/org/freedesktop/thumbnails/Thumbnailer1" @@ -50,15 +46,6 @@ -/* signal identifiers */ -enum -{ - SIGNAL_ERROR, - SIGNAL_FINISHED, - SIGNAL_READY, - SIGNAL_STARTED, - LAST_SIGNAL, -}; /* property identifiers */ enum @@ -84,6 +71,27 @@ guint prop_id, const GValue *value, GParamSpec *pspec); +static gboolean tumbler_service_queue_cb (TumblerExportedService *skeleton, + GDBusMethodInvocation *invocation, + const gchar *const *uris, + const gchar *const *mime_hints, + const gchar *flavor_name, + const gchar *scheduler_name, + guint handle_to_dequeue, + TumblerService *service); +static gboolean tumbler_service_dequeue_cb (TumblerExportedService *skeleton, + GDBusMethodInvocation *invocation, + guint handle, + TumblerService *service); +static gboolean tumbler_service_get_schedulers_cb(TumblerExportedService *skeleton, + GDBusMethodInvocation *invocation, + TumblerService *service); +static gboolean tumbler_service_get_supported_cb(TumblerExportedService *skeleton, + GDBusMethodInvocation *invocation, + TumblerService *service); +static gboolean tumbler_service_get_flavors_cb (TumblerExportedService *skeleton, + GDBusMethodInvocation *invocation, + TumblerService *service); static void tumbler_service_scheduler_error (TumblerScheduler *scheduler, guint handle, const gchar *const *failed_uris, @@ -118,14 +126,17 @@ struct _TumblerService { - TumblerComponent __parent__; + TumblerComponent __parent__; - DBusGConnection *connection; - TumblerRegistry *registry; - TUMBLER_MUTEX (mutex); - GList *schedulers; + GDBusConnection *connection; + TumblerExportedService *skeleton; + gboolean dbus_interface_exported; + + TumblerRegistry *registry; + TUMBLER_MUTEX (mutex); + GList *schedulers; - GVolumeMonitor *volume_monitor; + GVolumeMonitor *volume_monitor; }; struct _SchedulerIdleInfo @@ -141,9 +152,6 @@ -static guint tumbler_service_signals[LAST_SIGNAL]; - - G_DEFINE_TYPE (TumblerService, tumbler_service, TUMBLER_TYPE_COMPONENT); @@ -161,11 +169,12 @@ gobject_class->set_property = tumbler_service_set_property; g_object_class_install_property (gobject_class, PROP_CONNECTION, - g_param_spec_pointer ("connection", - "connection", - "connection", - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY)); + g_param_spec_object ("connection", + "connection", + "connection", + G_TYPE_DBUS_CONNECTION, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property (gobject_class, PROP_REGISTRY, g_param_spec_object ("registry", @@ -174,57 +183,6 @@ TUMBLER_TYPE_REGISTRY, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - - tumbler_service_signals[SIGNAL_ERROR] = - g_signal_new ("error", - TUMBLER_TYPE_SERVICE, - G_SIGNAL_RUN_LAST, - 0, - NULL, - NULL, - tumbler_marshal_VOID__UINT_POINTER_INT_STRING, - G_TYPE_NONE, - 4, - G_TYPE_UINT, - G_TYPE_STRV, - G_TYPE_INT, - G_TYPE_STRING); - - tumbler_service_signals[SIGNAL_FINISHED] = - g_signal_new ("finished", - TUMBLER_TYPE_SERVICE, - G_SIGNAL_RUN_LAST, - 0, - NULL, - NULL, - g_cclosure_marshal_VOID__UINT, - G_TYPE_NONE, - 1, - G_TYPE_UINT); - - tumbler_service_signals[SIGNAL_READY] = - g_signal_new ("ready", - TUMBLER_TYPE_SERVICE, - G_SIGNAL_RUN_LAST, - 0, - NULL, - NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, - 1, - G_TYPE_STRV); - - tumbler_service_signals[SIGNAL_STARTED] = - g_signal_new ("started", - TUMBLER_TYPE_SERVICE, - G_SIGNAL_RUN_LAST, - 0, - NULL, - NULL, - g_cclosure_marshal_VOID__UINT, - G_TYPE_NONE, - 1, - G_TYPE_UINT); } @@ -281,7 +239,8 @@ { TumblerScheduler *scheduler; TumblerService *service = TUMBLER_SERVICE (object); - + GError *error = NULL; + /* chain up to parent classes */ if (G_OBJECT_CLASS (tumbler_service_parent_class)->constructed != NULL) (G_OBJECT_CLASS (tumbler_service_parent_class)->constructed) (object); @@ -297,13 +256,37 @@ g_object_unref (scheduler); /* everything is fine, install the generic thumbnailer D-Bus info */ - dbus_g_object_type_install_info (G_OBJECT_TYPE (service), - &dbus_glib_tumbler_service_object_info); - - /* register the service instance as a handler of this interface */ - dbus_g_connection_register_g_object (service->connection, - THUMBNAILER_PATH, - G_OBJECT (service)); + service->skeleton = tumbler_exported_service_skeleton_new(); + + g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON(service->skeleton), + service->connection, + THUMBNAILER_PATH, + &error); + if (error != NULL) + { + g_critical ("error exporting thumbnail service on session bus: %s", error->message); + g_error_free (error); + service->dbus_interface_exported = FALSE; + } + else + { + service->dbus_interface_exported = TRUE; + + g_signal_connect (service->skeleton, "handle-queue", + G_CALLBACK(tumbler_service_queue_cb), service); + + g_signal_connect (service->skeleton, "handle-dequeue", + G_CALLBACK(tumbler_service_dequeue_cb), service); + + g_signal_connect (service->skeleton, "handle-get-supported", + G_CALLBACK(tumbler_service_get_supported_cb), service); + + g_signal_connect (service->skeleton, "handle-get-schedulers", + G_CALLBACK(tumbler_service_get_schedulers_cb), service); + + g_signal_connect (service->skeleton, "handle-get-flavors", + G_CALLBACK(tumbler_service_get_flavors_cb), service); + } } @@ -326,8 +309,20 @@ /* release the reference on the thumbnailer registry */ g_object_unref (service->registry); + + /* Unexport from dbus */ + if (service->dbus_interface_exported) + g_dbus_interface_skeleton_unexport_from_connection + ( + G_DBUS_INTERFACE_SKELETON (service->skeleton), + service->connection + ); - dbus_g_connection_unref (service->connection); + /* release the Skeleton object */ + g_object_unref (service->skeleton); + + /* release the D-Bus connection object */ + g_object_unref (service->connection); tumbler_mutex_free (service->mutex); @@ -347,7 +342,7 @@ switch (prop_id) { case PROP_CONNECTION: - g_value_set_pointer (value, service->connection); + g_value_set_object (value, service->connection); break; case PROP_REGISTRY: g_value_set_object (value, service->registry); @@ -371,7 +366,7 @@ switch (prop_id) { case PROP_CONNECTION: - service->connection = dbus_g_connection_ref (g_value_get_pointer (value)); + service->connection = g_object_ref (g_value_get_object (value)); break; case PROP_REGISTRY: service->registry = g_value_dup_object (value); @@ -388,10 +383,7 @@ tumbler_service_error_idle (gpointer user_data) { SchedulerIdleInfo *info = user_data; - DBusMessageIter iter; - DBusMessageIter strv_iter; - DBusMessage *message; - guint n; + GVariant *signal_variant; g_return_val_if_fail (info != NULL, FALSE); g_return_val_if_fail (TUMBLER_IS_SCHEDULER (info->scheduler), FALSE); @@ -400,38 +392,22 @@ g_return_val_if_fail (info->origin != NULL && *info->origin != '\0', FALSE); g_return_val_if_fail (TUMBLER_IS_SERVICE (info->service), FALSE); - /* create a D-Bus message for the error signal */ - message = dbus_message_new_signal (THUMBNAILER_PATH, THUMBNAILER_IFACE, "Error"); - - /* define the destination (the thumbnailer client) if possible */ - if (info->origin) - dbus_message_set_destination (message, info->origin); - - /* append the request handle */ - dbus_message_iter_init_append (message, &iter); - dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &info->handle); - - /* start the URI string array */ - dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, - DBUS_TYPE_STRING_AS_STRING, &strv_iter); - - /* insert all failed URIs into the array */ - for (n = 0; info->uris[n] != NULL; n++) - dbus_message_iter_append_basic (&strv_iter, DBUS_TYPE_STRING, &info->uris[n]); - - /* finish the URI string array */ - dbus_message_iter_close_container (&iter, &strv_iter); - - /* append the error code and error message */ - dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &info->error_code); - dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &info->message); - + /* signal variant */ + signal_variant = g_variant_ref_sink (g_variant_new ("(u^asis)", + info->handle, + info->uris, + info->error_code, + info->message)); /* send the signal message over D-Bus */ - dbus_connection_send (dbus_g_connection_get_connection (info->service->connection), - message, NULL); + g_dbus_connection_emit_signal (info->service->connection, + info->origin, + THUMBNAILER_PATH, + THUMBNAILER_IFACE, + "Error", + signal_variant, + NULL); - /* free the allocated D-Bus message */ - dbus_message_unref (message); + g_variant_unref (signal_variant); scheduler_idle_info_free (info); @@ -476,30 +452,24 @@ tumbler_service_finished_idle (gpointer user_data) { SchedulerIdleInfo *info = user_data; - DBusMessageIter iter; - DBusMessage *message; + GVariant *signal_variant; g_return_val_if_fail (info != NULL, FALSE); g_return_val_if_fail (info->origin != NULL && *info->origin != '\0', FALSE); g_return_val_if_fail (TUMBLER_IS_SERVICE (info->service), FALSE); - - /* create a D-Bus message for the finished signal */ - message = dbus_message_new_signal (THUMBNAILER_PATH, THUMBNAILER_IFACE, "Finished"); - - /* define the destination (the thumbnailer client) if possible */ - if (info->origin) - dbus_message_set_destination (message, info->origin); - - /* append the request handle */ - dbus_message_iter_init_append (message, &iter); - dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &info->handle); - + + signal_variant = g_variant_ref_sink (g_variant_new ("(u)", + info->handle)); /* send the signal message over D-Bus */ - dbus_connection_send (dbus_g_connection_get_connection (info->service->connection), - message, NULL); + g_dbus_connection_emit_signal (info->service->connection, + info->origin, + THUMBNAILER_PATH, + THUMBNAILER_IFACE, + "Finished", + signal_variant, + NULL); - /* free the allocated D-Bus message */ - dbus_message_unref (message); + g_variant_unref (signal_variant); /* allow the lifecycle manager to shut down the service again (unless there * are other requests still being processed) */ @@ -540,10 +510,7 @@ tumbler_service_ready_idle (gpointer user_data) { SchedulerIdleInfo *info = user_data; - DBusMessageIter iter; - DBusMessageIter strv_iter; - DBusMessage *message; - guint n; + GVariant *signal_variant; g_return_val_if_fail (info != NULL, FALSE); g_return_val_if_fail (TUMBLER_IS_SCHEDULER (info->scheduler), FALSE); @@ -551,36 +518,21 @@ g_return_val_if_fail (info->origin != NULL && *info->origin != '\0', FALSE); g_return_val_if_fail (TUMBLER_IS_SERVICE (info->service), FALSE); - /* create a D-Bus message for the ready signal */ - message = dbus_message_new_signal (THUMBNAILER_PATH, THUMBNAILER_IFACE, "Ready"); - - /* define the destination (the thumbnailer client) if possible */ - if (info->origin) - dbus_message_set_destination (message, info->origin); - - dbus_message_iter_init_append (message, &iter); - - /* append the request handle */ - dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &info->handle); - - /* start the URI string array */ - dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, - DBUS_TYPE_STRING_AS_STRING, &strv_iter); - - /* insert all URIs into the array for which we have thumbnails now */ - for (n = 0; info->uris[n] != NULL; n++) - dbus_message_iter_append_basic (&strv_iter, DBUS_TYPE_STRING, &info->uris[n]); - - /* finish the URI string array */ - dbus_message_iter_close_container (&iter, &strv_iter); - + signal_variant = g_variant_ref_sink (g_variant_new ("(u^as)", + info->handle, + info->uris)); + /* send the signal message over D-Bus */ - dbus_connection_send (dbus_g_connection_get_connection (info->service->connection), - message, NULL); - - /* free the allocated D-Bus message */ - dbus_message_unref (message); - + g_dbus_connection_emit_signal (info->service->connection, + info->origin, + THUMBNAILER_PATH, + THUMBNAILER_IFACE, + "Ready", + signal_variant, + NULL); + + g_variant_unref (signal_variant); + scheduler_idle_info_free (info); return FALSE; @@ -619,32 +571,27 @@ tumbler_service_started_idle (gpointer user_data) { SchedulerIdleInfo *info = user_data; - DBusMessageIter iter; - DBusMessage *message; - + GVariant *signal_variant; + g_return_val_if_fail (info != NULL, FALSE); g_return_val_if_fail (TUMBLER_IS_SCHEDULER (info->scheduler), FALSE); g_return_val_if_fail (info->origin != NULL && *info->origin != '\0', FALSE); g_return_val_if_fail (TUMBLER_IS_SERVICE (info->service), FALSE); - /* create a D-Bus message for the started signal */ - message = dbus_message_new_signal (THUMBNAILER_PATH, THUMBNAILER_IFACE, "Started"); - - /* define the destination (the thumbnailer client) if possible */ - if (info->origin) - dbus_message_set_destination (message, info->origin); - - /* append the request handle */ - dbus_message_iter_init_append (message, &iter); - dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &info->handle); - + signal_variant = g_variant_ref_sink (g_variant_new ("(u)", info->handle)); + + /* send the signal message over D-Bus */ - dbus_connection_send (dbus_g_connection_get_connection (info->service->connection), - message, NULL); - - /* free the allocated D-Bus message */ - dbus_message_unref (message); - + g_dbus_connection_emit_signal (info->service->connection, + info->origin, + THUMBNAILER_PATH, + THUMBNAILER_IFACE, + "Started", + signal_variant, + NULL); + + g_variant_unref (signal_variant); + scheduler_idle_info_free (info); return FALSE; @@ -717,7 +664,7 @@ TumblerService * -tumbler_service_new (DBusGConnection *connection, +tumbler_service_new (GDBusConnection *connection, TumblerLifecycleManager *lifecycle_manager, TumblerRegistry *registry) { @@ -730,54 +677,16 @@ -gboolean -tumbler_service_start (TumblerService *service, - GError **error) -{ - DBusConnection *connection; - gint result; - - g_return_val_if_fail (TUMBLER_IS_SERVICE (service), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - tumbler_mutex_lock (service->mutex); - - /* get the native D-Bus connection */ - connection = dbus_g_connection_get_connection (service->connection); - - /* request ownership for the generic thumbnailer interface */ - result = dbus_bus_request_name (connection, THUMBNAILER_SERVICE, - DBUS_NAME_FLAG_DO_NOT_QUEUE, NULL); - - /* check if that failed */ - if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) - { - if (error != NULL) - { - g_set_error (error, DBUS_GERROR, DBUS_GERROR_FAILED, - _("Another generic thumbnailer is already running")); - } - - tumbler_mutex_unlock (service->mutex); - - return FALSE; - } - - tumbler_mutex_unlock (service->mutex); - - return TRUE; -} - - -void -tumbler_service_queue (TumblerService *service, - const gchar *const *uris, - const gchar *const *mime_hints, - const gchar *flavor_name, - const gchar *scheduler_name, - guint handle_to_dequeue, - DBusGMethodInvocation *context) +static gboolean +tumbler_service_queue_cb (TumblerExportedService *skeleton, + GDBusMethodInvocation *invocation, + const gchar *const *uris, + const gchar *const *mime_hints, + const gchar *flavor_name, + const gchar *scheduler_name, + guint handle_to_dequeue, + TumblerService *service) { TumblerSchedulerRequest *scheduler_request; TumblerThumbnailFlavor *flavor; @@ -787,13 +696,13 @@ TumblerCache *cache; GList *iter; gchar *name; - gchar *origin; + const gchar *origin; guint handle; guint length; - dbus_async_return_if_fail (TUMBLER_IS_SERVICE (service), context); - dbus_async_return_if_fail (uris != NULL, context); - dbus_async_return_if_fail (mime_hints != NULL, context); + g_dbus_async_return_val_if_fail (TUMBLER_IS_SERVICE (service), invocation, FALSE); + g_dbus_async_return_val_if_fail (uris != NULL, invocation, FALSE); + g_dbus_async_return_val_if_fail (mime_hints != NULL, invocation, FALSE); tumbler_mutex_lock (service->mutex); @@ -816,7 +725,7 @@ thumbnailers = tumbler_registry_get_thumbnailer_array (service->registry, infos, length); - origin = dbus_g_method_get_sender (context); + origin = g_dbus_method_invocation_get_sender (invocation); /* allocate a scheduler request */ scheduler_request = tumbler_scheduler_request_new (infos, thumbnailers, @@ -825,7 +734,6 @@ /* release the file info array */ tumbler_file_info_array_free (infos); - g_free (origin); /* get the request handle */ handle = scheduler_request->handle; @@ -885,24 +793,25 @@ tumbler_thumbnailer_array_free (thumbnailers, length); tumbler_mutex_unlock (service->mutex); - - dbus_g_method_return (context, handle); - + + tumbler_exported_service_complete_queue(skeleton, invocation, handle); + /* try to keep tumbler alive */ tumbler_component_keep_alive (TUMBLER_COMPONENT (service), NULL); + + return TRUE; } -void -tumbler_service_dequeue (TumblerService *service, - guint handle, - DBusGMethodInvocation *context) +static gboolean +tumbler_service_dequeue_cb (TumblerExportedService *skeleton, + GDBusMethodInvocation *invocation, + guint handle, + TumblerService *service) { GList *iter; - dbus_async_return_if_fail (TUMBLER_IS_SERVICE (service), context); - tumbler_mutex_lock (service->mutex); if (handle != 0) @@ -918,22 +827,70 @@ tumbler_mutex_unlock (service->mutex); - dbus_g_method_return (context); - + tumbler_exported_service_complete_dequeue(skeleton, invocation); + /* keep tumbler alive */ tumbler_component_keep_alive (TUMBLER_COMPONENT (service), NULL); + + return TRUE; } -void -tumbler_service_get_supported (TumblerService *service, - DBusGMethodInvocation *context) +static gboolean +tumbler_service_get_schedulers_cb (TumblerExportedService *skeleton, + GDBusMethodInvocation *invocation, + TumblerService *service) +{ + gchar **supported_schedulers; + GList *iter; + guint n = 0; + + tumbler_mutex_lock (service->mutex); + + /* allocate an error for the schedulers */ + supported_schedulers = g_new0 (gchar *, g_list_length (service->schedulers) + 2); + + /* always prepend the "default" scheduler */ + supported_schedulers[n++] = g_strdup ("default"); + + /* append all supported scheduler names */ + for (iter = service->schedulers; iter != NULL; iter = iter->next) + { + supported_schedulers[n++] = + tumbler_scheduler_get_name (TUMBLER_SCHEDULER (iter->data)); + } + + tumbler_mutex_unlock (service->mutex); + + /* NULL-terminate the array */ + supported_schedulers[n] = NULL; + + /* return the scheduler array to the caller */ + tumbler_exported_service_complete_get_schedulers (skeleton, + invocation, + (const char* const*)supported_schedulers); + + /* free the array */ + g_strfreev (supported_schedulers); + + /* try to keep tumbler alive */ + tumbler_component_keep_alive (TUMBLER_COMPONENT (service), NULL); + + return TRUE; +} + + + +static gboolean +tumbler_service_get_supported_cb (TumblerExportedService *skeleton, + GDBusMethodInvocation *invocation, + TumblerService *service) { const gchar *const *mime_types; const gchar *const *uri_schemes; - dbus_async_return_if_fail (TUMBLER_IS_SERVICE (service), context); + g_dbus_async_return_val_if_fail (TUMBLER_IS_SERVICE (service), invocation, FALSE); tumbler_mutex_lock (service->mutex); @@ -943,17 +900,20 @@ tumbler_mutex_unlock (service->mutex); /* return the arrays to the caller */ - dbus_g_method_return (context, uri_schemes, mime_types); + tumbler_exported_service_complete_get_supported(skeleton, invocation, uri_schemes, mime_types); /* try to keep tumbler alive */ tumbler_component_keep_alive (TUMBLER_COMPONENT (service), NULL); + + return TRUE; } -void -tumbler_service_get_flavors (TumblerService *service, - DBusGMethodInvocation *context) +static gboolean +tumbler_service_get_flavors_cb (TumblerExportedService *skeleton, + GDBusMethodInvocation *invocation, + TumblerService *service) { TumblerCache *cache; const gchar **flavor_strings; @@ -971,9 +931,9 @@ for (iter = flavors, n = 0; iter != NULL; iter = iter->next, ++n) flavor_strings[n] = tumbler_thumbnail_flavor_get_name (iter->data); flavor_strings[n] = NULL; - - dbus_g_method_return (context, flavor_strings); - + + tumbler_exported_service_complete_get_flavors (skeleton, invocation, flavor_strings); + g_free (flavor_strings); g_list_foreach (flavors, (GFunc) g_object_unref, NULL); @@ -985,53 +945,22 @@ { flavor_strings = g_new0 (const gchar *, 1); flavor_strings[0] = NULL; - - dbus_g_method_return (context, flavor_strings); + + tumbler_exported_service_complete_get_flavors (skeleton, invocation, flavor_strings); g_free (flavor_strings); } /* try to keep tumbler alive */ tumbler_component_keep_alive (TUMBLER_COMPONENT (service), NULL); -} - - -void -tumbler_service_get_schedulers (TumblerService *service, - DBusGMethodInvocation *context) -{ - gchar **supported_schedulers; - GList *iter; - guint n = 0; - - dbus_async_return_if_fail (TUMBLER_IS_SERVICE (service), context); - - tumbler_mutex_lock (service->mutex); - - /* allocate an error for the schedulers */ - supported_schedulers = g_new0 (gchar *, g_list_length (service->schedulers) + 2); - - /* always prepend the "default" scheduler */ - supported_schedulers[n++] = g_strdup ("default"); - - /* append all supported scheduler names */ - for (iter = service->schedulers; iter != NULL; iter = iter->next) - { - supported_schedulers[n++] = - tumbler_scheduler_get_name (TUMBLER_SCHEDULER (iter->data)); - } - - tumbler_mutex_unlock (service->mutex); - /* NULL-terminate the array */ - supported_schedulers[n] = NULL; + return TRUE; +} - /* return the scheduler array to the caller */ - dbus_g_method_return (context, supported_schedulers); - /* free the array */ - g_strfreev (supported_schedulers); - /* try to keep tumbler alive */ - tumbler_component_keep_alive (TUMBLER_COMPONENT (service), NULL); +gboolean tumbler_service_is_exported (TumblerService *service) +{ + g_return_val_if_fail (TUMBLER_IS_SERVICE(service), FALSE); + return service->dbus_interface_exported; } diff -Nru tumbler-0.1.31/tumblerd/tumbler-service-dbus-bindings.h tumbler-0.1.90/tumblerd/tumbler-service-dbus-bindings.h --- tumbler-0.1.31/tumblerd/tumbler-service-dbus-bindings.h 2015-02-28 16:28:41.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-service-dbus-bindings.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,138 +0,0 @@ -/* Generated by dbus-binding-tool; do not edit! */ - - -#ifndef __dbus_glib_marshal_tumbler_service_MARSHAL_H__ -#define __dbus_glib_marshal_tumbler_service_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_schar (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#define g_marshal_value_peek_variant(v) g_value_get_variant (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* NONE:POINTER */ -#define dbus_glib_marshal_tumbler_service_VOID__POINTER g_cclosure_marshal_VOID__POINTER -#define dbus_glib_marshal_tumbler_service_NONE__POINTER dbus_glib_marshal_tumbler_service_VOID__POINTER - -/* NONE:UINT,POINTER */ -#define dbus_glib_marshal_tumbler_service_VOID__UINT_POINTER g_cclosure_marshal_VOID__UINT_POINTER -#define dbus_glib_marshal_tumbler_service_NONE__UINT_POINTER dbus_glib_marshal_tumbler_service_VOID__UINT_POINTER - -/* NONE:BOXED,BOXED,STRING,STRING,UINT,POINTER */ -extern void dbus_glib_marshal_tumbler_service_VOID__BOXED_BOXED_STRING_STRING_UINT_POINTER (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -void -dbus_glib_marshal_tumbler_service_VOID__BOXED_BOXED_STRING_STRING_UINT_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__BOXED_BOXED_STRING_STRING_UINT_POINTER) (gpointer data1, - gpointer arg_1, - gpointer arg_2, - gpointer arg_3, - gpointer arg_4, - guint arg_5, - gpointer arg_6, - gpointer data2); - register GMarshalFunc_VOID__BOXED_BOXED_STRING_STRING_UINT_POINTER callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 7); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__BOXED_BOXED_STRING_STRING_UINT_POINTER) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_boxed (param_values + 1), - g_marshal_value_peek_boxed (param_values + 2), - g_marshal_value_peek_string (param_values + 3), - g_marshal_value_peek_string (param_values + 4), - g_marshal_value_peek_uint (param_values + 5), - g_marshal_value_peek_pointer (param_values + 6), - data2); -} -#define dbus_glib_marshal_tumbler_service_NONE__BOXED_BOXED_STRING_STRING_UINT_POINTER dbus_glib_marshal_tumbler_service_VOID__BOXED_BOXED_STRING_STRING_UINT_POINTER - -G_END_DECLS - -#endif /* __dbus_glib_marshal_tumbler_service_MARSHAL_H__ */ - -#include -static const DBusGMethodInfo dbus_glib_tumbler_service_methods[] = { - { (GCallback) tumbler_service_queue, dbus_glib_marshal_tumbler_service_NONE__BOXED_BOXED_STRING_STRING_UINT_POINTER, 0 }, - { (GCallback) tumbler_service_dequeue, dbus_glib_marshal_tumbler_service_NONE__UINT_POINTER, 137 }, - { (GCallback) tumbler_service_get_supported, dbus_glib_marshal_tumbler_service_NONE__POINTER, 199 }, - { (GCallback) tumbler_service_get_schedulers, dbus_glib_marshal_tumbler_service_NONE__POINTER, 296 }, - { (GCallback) tumbler_service_get_flavors, dbus_glib_marshal_tumbler_service_NONE__POINTER, 373 }, -}; - -const DBusGObjectInfo dbus_glib_tumbler_service_object_info = { 1, - dbus_glib_tumbler_service_methods, - 5, -"org.freedesktop.thumbnails.Thumbnailer1\0Queue\0A\0uris\0I\0as\0mime_types\0I\0as\0flavor\0I\0s\0scheduler\0I\0s\0handle_to_unqueue\0I\0u\0handle\0O\0F\0N\0u\0\0org.freedesktop.thumbnails.Thumbnailer1\0Dequeue\0A\0handle\0I\0u\0\0org.freedesktop.thumbnails.Thumbnailer1\0GetSupported\0A\0uri_schemes\0O\0F\0N\0as\0mime_types\0O\0F\0N\0as\0\0org.freedesktop.thumbnails.Thumbnailer1\0GetSchedulers\0A\0schedulers\0O\0F\0N\0as\0\0org.freedesktop.thumbnails.Thumbnailer1\0GetFlavors\0A\0flavors\0O\0F\0N\0as\0\0\0", -"org.freedesktop.thumbnails.Thumbnailer1\0Started\0org.freedesktop.thumbnails.Thumbnailer1\0Finished\0org.freedesktop.thumbnails.Thumbnailer1\0Ready\0org.freedesktop.thumbnails.Thumbnailer1\0Error\0\0", -"\0" -}; - diff -Nru tumbler-0.1.31/tumblerd/tumbler-service-dbus.xml tumbler-0.1.90/tumblerd/tumbler-service-dbus.xml --- tumbler-0.1.31/tumblerd/tumbler-service-dbus.xml 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-service-dbus.xml 2017-05-11 09:06:12.000000000 +0000 @@ -1,8 +1,10 @@ - + + + + - @@ -12,23 +14,19 @@ - - - - diff -Nru tumbler-0.1.31/tumblerd/tumbler-service-gdbus.c tumbler-0.1.90/tumblerd/tumbler-service-gdbus.c --- tumbler-0.1.31/tumblerd/tumbler-service-gdbus.c 1970-01-01 00:00:00.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-service-gdbus.c 2017-05-11 09:08:51.000000000 +0000 @@ -0,0 +1,2280 @@ +/* + * Generated by gdbus-codegen 2.50.3. DO NOT EDIT. + * + * The license of this code is the same as for the source it was derived from. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "tumbler-service-gdbus.h" + +#include +#ifdef G_OS_UNIX +# include +#endif + +typedef struct +{ + GDBusArgInfo parent_struct; + gboolean use_gvariant; +} _ExtendedGDBusArgInfo; + +typedef struct +{ + GDBusMethodInfo parent_struct; + const gchar *signal_name; + gboolean pass_fdlist; +} _ExtendedGDBusMethodInfo; + +typedef struct +{ + GDBusSignalInfo parent_struct; + const gchar *signal_name; +} _ExtendedGDBusSignalInfo; + +typedef struct +{ + GDBusPropertyInfo parent_struct; + const gchar *hyphen_name; + gboolean use_gvariant; +} _ExtendedGDBusPropertyInfo; + +typedef struct +{ + GDBusInterfaceInfo parent_struct; + const gchar *hyphen_name; +} _ExtendedGDBusInterfaceInfo; + +typedef struct +{ + const _ExtendedGDBusPropertyInfo *info; + guint prop_id; + GValue orig_value; /* the value before the change */ +} ChangedProperty; + +static void +_changed_property_free (ChangedProperty *data) +{ + g_value_unset (&data->orig_value); + g_free (data); +} + +static gboolean +_g_strv_equal0 (gchar **a, gchar **b) +{ + gboolean ret = FALSE; + guint n; + if (a == NULL && b == NULL) + { + ret = TRUE; + goto out; + } + if (a == NULL || b == NULL) + goto out; + if (g_strv_length (a) != g_strv_length (b)) + goto out; + for (n = 0; a[n] != NULL; n++) + if (g_strcmp0 (a[n], b[n]) != 0) + goto out; + ret = TRUE; +out: + return ret; +} + +static gboolean +_g_variant_equal0 (GVariant *a, GVariant *b) +{ + gboolean ret = FALSE; + if (a == NULL && b == NULL) + { + ret = TRUE; + goto out; + } + if (a == NULL || b == NULL) + goto out; + ret = g_variant_equal (a, b); +out: + return ret; +} + +G_GNUC_UNUSED static gboolean +_g_value_equal (const GValue *a, const GValue *b) +{ + gboolean ret = FALSE; + g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b)); + switch (G_VALUE_TYPE (a)) + { + case G_TYPE_BOOLEAN: + ret = (g_value_get_boolean (a) == g_value_get_boolean (b)); + break; + case G_TYPE_UCHAR: + ret = (g_value_get_uchar (a) == g_value_get_uchar (b)); + break; + case G_TYPE_INT: + ret = (g_value_get_int (a) == g_value_get_int (b)); + break; + case G_TYPE_UINT: + ret = (g_value_get_uint (a) == g_value_get_uint (b)); + break; + case G_TYPE_INT64: + ret = (g_value_get_int64 (a) == g_value_get_int64 (b)); + break; + case G_TYPE_UINT64: + ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b)); + break; + case G_TYPE_DOUBLE: + { + /* Avoid -Wfloat-equal warnings by doing a direct bit compare */ + gdouble da = g_value_get_double (a); + gdouble db = g_value_get_double (b); + ret = memcmp (&da, &db, sizeof (gdouble)) == 0; + } + break; + case G_TYPE_STRING: + ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0); + break; + case G_TYPE_VARIANT: + ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b)); + break; + default: + if (G_VALUE_TYPE (a) == G_TYPE_STRV) + ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b)); + else + g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a))); + break; + } + return ret; +} + +/* ------------------------------------------------------------------------ + * Code for interface org.freedesktop.thumbnails.Thumbnailer1 + * ------------------------------------------------------------------------ + */ + +/** + * SECTION:TumblerExportedService + * @title: TumblerExportedService + * @short_description: Generated C code for the org.freedesktop.thumbnails.Thumbnailer1 D-Bus interface + * + * This section contains code for working with the org.freedesktop.thumbnails.Thumbnailer1 D-Bus interface in C. + */ + +/* ---- Introspection data for org.freedesktop.thumbnails.Thumbnailer1 ---- */ + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_method_info_queue_IN_ARG_uris = +{ + { + -1, + (gchar *) "uris", + (gchar *) "as", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_method_info_queue_IN_ARG_mime_types = +{ + { + -1, + (gchar *) "mime_types", + (gchar *) "as", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_method_info_queue_IN_ARG_flavor = +{ + { + -1, + (gchar *) "flavor", + (gchar *) "s", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_method_info_queue_IN_ARG_scheduler = +{ + { + -1, + (gchar *) "scheduler", + (gchar *) "s", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_method_info_queue_IN_ARG_handle_to_unqueue = +{ + { + -1, + (gchar *) "handle_to_unqueue", + (gchar *) "u", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _tumbler_exported_service_method_info_queue_IN_ARG_pointers[] = +{ + &_tumbler_exported_service_method_info_queue_IN_ARG_uris, + &_tumbler_exported_service_method_info_queue_IN_ARG_mime_types, + &_tumbler_exported_service_method_info_queue_IN_ARG_flavor, + &_tumbler_exported_service_method_info_queue_IN_ARG_scheduler, + &_tumbler_exported_service_method_info_queue_IN_ARG_handle_to_unqueue, + NULL +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_method_info_queue_OUT_ARG_handle = +{ + { + -1, + (gchar *) "handle", + (gchar *) "u", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _tumbler_exported_service_method_info_queue_OUT_ARG_pointers[] = +{ + &_tumbler_exported_service_method_info_queue_OUT_ARG_handle, + NULL +}; + +static const _ExtendedGDBusMethodInfo _tumbler_exported_service_method_info_queue = +{ + { + -1, + (gchar *) "Queue", + (GDBusArgInfo **) &_tumbler_exported_service_method_info_queue_IN_ARG_pointers, + (GDBusArgInfo **) &_tumbler_exported_service_method_info_queue_OUT_ARG_pointers, + NULL + }, + "handle-queue", + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_method_info_dequeue_IN_ARG_handle = +{ + { + -1, + (gchar *) "handle", + (gchar *) "u", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _tumbler_exported_service_method_info_dequeue_IN_ARG_pointers[] = +{ + &_tumbler_exported_service_method_info_dequeue_IN_ARG_handle, + NULL +}; + +static const _ExtendedGDBusMethodInfo _tumbler_exported_service_method_info_dequeue = +{ + { + -1, + (gchar *) "Dequeue", + (GDBusArgInfo **) &_tumbler_exported_service_method_info_dequeue_IN_ARG_pointers, + NULL, + NULL + }, + "handle-dequeue", + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_method_info_get_supported_OUT_ARG_uri_schemes = +{ + { + -1, + (gchar *) "uri_schemes", + (gchar *) "as", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_method_info_get_supported_OUT_ARG_mime_types = +{ + { + -1, + (gchar *) "mime_types", + (gchar *) "as", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _tumbler_exported_service_method_info_get_supported_OUT_ARG_pointers[] = +{ + &_tumbler_exported_service_method_info_get_supported_OUT_ARG_uri_schemes, + &_tumbler_exported_service_method_info_get_supported_OUT_ARG_mime_types, + NULL +}; + +static const _ExtendedGDBusMethodInfo _tumbler_exported_service_method_info_get_supported = +{ + { + -1, + (gchar *) "GetSupported", + NULL, + (GDBusArgInfo **) &_tumbler_exported_service_method_info_get_supported_OUT_ARG_pointers, + NULL + }, + "handle-get-supported", + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_method_info_get_schedulers_OUT_ARG_schedulers = +{ + { + -1, + (gchar *) "schedulers", + (gchar *) "as", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _tumbler_exported_service_method_info_get_schedulers_OUT_ARG_pointers[] = +{ + &_tumbler_exported_service_method_info_get_schedulers_OUT_ARG_schedulers, + NULL +}; + +static const _ExtendedGDBusMethodInfo _tumbler_exported_service_method_info_get_schedulers = +{ + { + -1, + (gchar *) "GetSchedulers", + NULL, + (GDBusArgInfo **) &_tumbler_exported_service_method_info_get_schedulers_OUT_ARG_pointers, + NULL + }, + "handle-get-schedulers", + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_method_info_get_flavors_OUT_ARG_flavors = +{ + { + -1, + (gchar *) "flavors", + (gchar *) "as", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _tumbler_exported_service_method_info_get_flavors_OUT_ARG_pointers[] = +{ + &_tumbler_exported_service_method_info_get_flavors_OUT_ARG_flavors, + NULL +}; + +static const _ExtendedGDBusMethodInfo _tumbler_exported_service_method_info_get_flavors = +{ + { + -1, + (gchar *) "GetFlavors", + NULL, + (GDBusArgInfo **) &_tumbler_exported_service_method_info_get_flavors_OUT_ARG_pointers, + NULL + }, + "handle-get-flavors", + FALSE +}; + +static const _ExtendedGDBusMethodInfo * const _tumbler_exported_service_method_info_pointers[] = +{ + &_tumbler_exported_service_method_info_queue, + &_tumbler_exported_service_method_info_dequeue, + &_tumbler_exported_service_method_info_get_supported, + &_tumbler_exported_service_method_info_get_schedulers, + &_tumbler_exported_service_method_info_get_flavors, + NULL +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_signal_info_started_ARG_handle = +{ + { + -1, + (gchar *) "handle", + (gchar *) "u", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _tumbler_exported_service_signal_info_started_ARG_pointers[] = +{ + &_tumbler_exported_service_signal_info_started_ARG_handle, + NULL +}; + +static const _ExtendedGDBusSignalInfo _tumbler_exported_service_signal_info_started = +{ + { + -1, + (gchar *) "Started", + (GDBusArgInfo **) &_tumbler_exported_service_signal_info_started_ARG_pointers, + NULL + }, + "started" +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_signal_info_finished_ARG_handle = +{ + { + -1, + (gchar *) "handle", + (gchar *) "u", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _tumbler_exported_service_signal_info_finished_ARG_pointers[] = +{ + &_tumbler_exported_service_signal_info_finished_ARG_handle, + NULL +}; + +static const _ExtendedGDBusSignalInfo _tumbler_exported_service_signal_info_finished = +{ + { + -1, + (gchar *) "Finished", + (GDBusArgInfo **) &_tumbler_exported_service_signal_info_finished_ARG_pointers, + NULL + }, + "finished" +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_signal_info_ready_ARG_handle = +{ + { + -1, + (gchar *) "handle", + (gchar *) "u", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_signal_info_ready_ARG_uris = +{ + { + -1, + (gchar *) "uris", + (gchar *) "as", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _tumbler_exported_service_signal_info_ready_ARG_pointers[] = +{ + &_tumbler_exported_service_signal_info_ready_ARG_handle, + &_tumbler_exported_service_signal_info_ready_ARG_uris, + NULL +}; + +static const _ExtendedGDBusSignalInfo _tumbler_exported_service_signal_info_ready = +{ + { + -1, + (gchar *) "Ready", + (GDBusArgInfo **) &_tumbler_exported_service_signal_info_ready_ARG_pointers, + NULL + }, + "ready" +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_signal_info_error_ARG_handle = +{ + { + -1, + (gchar *) "handle", + (gchar *) "u", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_signal_info_error_ARG_failed_uris = +{ + { + -1, + (gchar *) "failed_uris", + (gchar *) "as", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_signal_info_error_ARG_error_code = +{ + { + -1, + (gchar *) "error_code", + (gchar *) "i", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo _tumbler_exported_service_signal_info_error_ARG_message = +{ + { + -1, + (gchar *) "message", + (gchar *) "s", + NULL + }, + FALSE +}; + +static const _ExtendedGDBusArgInfo * const _tumbler_exported_service_signal_info_error_ARG_pointers[] = +{ + &_tumbler_exported_service_signal_info_error_ARG_handle, + &_tumbler_exported_service_signal_info_error_ARG_failed_uris, + &_tumbler_exported_service_signal_info_error_ARG_error_code, + &_tumbler_exported_service_signal_info_error_ARG_message, + NULL +}; + +static const _ExtendedGDBusSignalInfo _tumbler_exported_service_signal_info_error = +{ + { + -1, + (gchar *) "Error", + (GDBusArgInfo **) &_tumbler_exported_service_signal_info_error_ARG_pointers, + NULL + }, + "error" +}; + +static const _ExtendedGDBusSignalInfo * const _tumbler_exported_service_signal_info_pointers[] = +{ + &_tumbler_exported_service_signal_info_started, + &_tumbler_exported_service_signal_info_finished, + &_tumbler_exported_service_signal_info_ready, + &_tumbler_exported_service_signal_info_error, + NULL +}; + +static const _ExtendedGDBusInterfaceInfo _tumbler_exported_service_interface_info = +{ + { + -1, + (gchar *) "org.freedesktop.thumbnails.Thumbnailer1", + (GDBusMethodInfo **) &_tumbler_exported_service_method_info_pointers, + (GDBusSignalInfo **) &_tumbler_exported_service_signal_info_pointers, + NULL, + NULL + }, + "exported-service", +}; + + +/** + * tumbler_exported_service_interface_info: + * + * Gets a machine-readable description of the org.freedesktop.thumbnails.Thumbnailer1 D-Bus interface. + * + * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free. + */ +GDBusInterfaceInfo * +tumbler_exported_service_interface_info (void) +{ + return (GDBusInterfaceInfo *) &_tumbler_exported_service_interface_info.parent_struct; +} + +/** + * tumbler_exported_service_override_properties: + * @klass: The class structure for a #GObject-derived class. + * @property_id_begin: The property id to assign to the first overridden property. + * + * Overrides all #GObject properties in the #TumblerExportedService interface for a concrete class. + * The properties are overridden in the order they are defined. + * + * Returns: The last property id. + */ +guint +tumbler_exported_service_override_properties (GObjectClass *klass, guint property_id_begin) +{ + return property_id_begin - 1; +} + + + +/** + * TumblerExportedService: + * + * Abstract interface type for the D-Bus interface org.freedesktop.thumbnails.Thumbnailer1. + */ + +/** + * TumblerExportedServiceIface: + * @parent_iface: The parent interface. + * @handle_dequeue: Handler for the #TumblerExportedService::handle-dequeue signal. + * @handle_get_flavors: Handler for the #TumblerExportedService::handle-get-flavors signal. + * @handle_get_schedulers: Handler for the #TumblerExportedService::handle-get-schedulers signal. + * @handle_get_supported: Handler for the #TumblerExportedService::handle-get-supported signal. + * @handle_queue: Handler for the #TumblerExportedService::handle-queue signal. + * @error: Handler for the #TumblerExportedService::error signal. + * @finished: Handler for the #TumblerExportedService::finished signal. + * @ready: Handler for the #TumblerExportedService::ready signal. + * @started: Handler for the #TumblerExportedService::started signal. + * + * Virtual table for the D-Bus interface org.freedesktop.thumbnails.Thumbnailer1. + */ + +typedef TumblerExportedServiceIface TumblerExportedServiceInterface; +G_DEFINE_INTERFACE (TumblerExportedService, tumbler_exported_service, G_TYPE_OBJECT); + +static void +tumbler_exported_service_default_init (TumblerExportedServiceIface *iface) +{ + /* GObject signals for incoming D-Bus method calls: */ + /** + * TumblerExportedService::handle-queue: + * @object: A #TumblerExportedService. + * @invocation: A #GDBusMethodInvocation. + * @arg_uris: Argument passed by remote caller. + * @arg_mime_types: Argument passed by remote caller. + * @arg_flavor: Argument passed by remote caller. + * @arg_scheduler: Argument passed by remote caller. + * @arg_handle_to_unqueue: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the Queue() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call tumbler_exported_service_complete_queue() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + g_signal_new ("handle-queue", + G_TYPE_FROM_INTERFACE (iface), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (TumblerExportedServiceIface, handle_queue), + g_signal_accumulator_true_handled, + NULL, + g_cclosure_marshal_generic, + G_TYPE_BOOLEAN, + 6, + G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRV, G_TYPE_STRV, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT); + + /** + * TumblerExportedService::handle-dequeue: + * @object: A #TumblerExportedService. + * @invocation: A #GDBusMethodInvocation. + * @arg_handle: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the Dequeue() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call tumbler_exported_service_complete_dequeue() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + g_signal_new ("handle-dequeue", + G_TYPE_FROM_INTERFACE (iface), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (TumblerExportedServiceIface, handle_dequeue), + g_signal_accumulator_true_handled, + NULL, + g_cclosure_marshal_generic, + G_TYPE_BOOLEAN, + 2, + G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_UINT); + + /** + * TumblerExportedService::handle-get-supported: + * @object: A #TumblerExportedService. + * @invocation: A #GDBusMethodInvocation. + * + * Signal emitted when a remote caller is invoking the GetSupported() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call tumbler_exported_service_complete_get_supported() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + g_signal_new ("handle-get-supported", + G_TYPE_FROM_INTERFACE (iface), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (TumblerExportedServiceIface, handle_get_supported), + g_signal_accumulator_true_handled, + NULL, + g_cclosure_marshal_generic, + G_TYPE_BOOLEAN, + 1, + G_TYPE_DBUS_METHOD_INVOCATION); + + /** + * TumblerExportedService::handle-get-schedulers: + * @object: A #TumblerExportedService. + * @invocation: A #GDBusMethodInvocation. + * + * Signal emitted when a remote caller is invoking the GetSchedulers() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call tumbler_exported_service_complete_get_schedulers() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + g_signal_new ("handle-get-schedulers", + G_TYPE_FROM_INTERFACE (iface), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (TumblerExportedServiceIface, handle_get_schedulers), + g_signal_accumulator_true_handled, + NULL, + g_cclosure_marshal_generic, + G_TYPE_BOOLEAN, + 1, + G_TYPE_DBUS_METHOD_INVOCATION); + + /** + * TumblerExportedService::handle-get-flavors: + * @object: A #TumblerExportedService. + * @invocation: A #GDBusMethodInvocation. + * + * Signal emitted when a remote caller is invoking the GetFlavors() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call tumbler_exported_service_complete_get_flavors() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + g_signal_new ("handle-get-flavors", + G_TYPE_FROM_INTERFACE (iface), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (TumblerExportedServiceIface, handle_get_flavors), + g_signal_accumulator_true_handled, + NULL, + g_cclosure_marshal_generic, + G_TYPE_BOOLEAN, + 1, + G_TYPE_DBUS_METHOD_INVOCATION); + + /* GObject signals for received D-Bus signals: */ + /** + * TumblerExportedService::started: + * @object: A #TumblerExportedService. + * @arg_handle: Argument. + * + * On the client-side, this signal is emitted whenever the D-Bus signal "Started" is received. + * + * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. + */ + g_signal_new ("started", + G_TYPE_FROM_INTERFACE (iface), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (TumblerExportedServiceIface, started), + NULL, + NULL, + g_cclosure_marshal_generic, + G_TYPE_NONE, + 1, G_TYPE_UINT); + + /** + * TumblerExportedService::finished: + * @object: A #TumblerExportedService. + * @arg_handle: Argument. + * + * On the client-side, this signal is emitted whenever the D-Bus signal "Finished" is received. + * + * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. + */ + g_signal_new ("finished", + G_TYPE_FROM_INTERFACE (iface), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (TumblerExportedServiceIface, finished), + NULL, + NULL, + g_cclosure_marshal_generic, + G_TYPE_NONE, + 1, G_TYPE_UINT); + + /** + * TumblerExportedService::ready: + * @object: A #TumblerExportedService. + * @arg_handle: Argument. + * @arg_uris: Argument. + * + * On the client-side, this signal is emitted whenever the D-Bus signal "Ready" is received. + * + * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. + */ + g_signal_new ("ready", + G_TYPE_FROM_INTERFACE (iface), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (TumblerExportedServiceIface, ready), + NULL, + NULL, + g_cclosure_marshal_generic, + G_TYPE_NONE, + 2, G_TYPE_UINT, G_TYPE_STRV); + + /** + * TumblerExportedService::error: + * @object: A #TumblerExportedService. + * @arg_handle: Argument. + * @arg_failed_uris: Argument. + * @arg_error_code: Argument. + * @arg_message: Argument. + * + * On the client-side, this signal is emitted whenever the D-Bus signal "Error" is received. + * + * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. + */ + g_signal_new ("error", + G_TYPE_FROM_INTERFACE (iface), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (TumblerExportedServiceIface, error), + NULL, + NULL, + g_cclosure_marshal_generic, + G_TYPE_NONE, + 4, G_TYPE_UINT, G_TYPE_STRV, G_TYPE_INT, G_TYPE_STRING); + +} + +/** + * tumbler_exported_service_emit_started: + * @object: A #TumblerExportedService. + * @arg_handle: Argument to pass with the signal. + * + * Emits the "Started" D-Bus signal. + */ +void +tumbler_exported_service_emit_started ( + TumblerExportedService *object, + guint arg_handle) +{ + g_signal_emit_by_name (object, "started", arg_handle); +} + +/** + * tumbler_exported_service_emit_finished: + * @object: A #TumblerExportedService. + * @arg_handle: Argument to pass with the signal. + * + * Emits the "Finished" D-Bus signal. + */ +void +tumbler_exported_service_emit_finished ( + TumblerExportedService *object, + guint arg_handle) +{ + g_signal_emit_by_name (object, "finished", arg_handle); +} + +/** + * tumbler_exported_service_emit_ready: + * @object: A #TumblerExportedService. + * @arg_handle: Argument to pass with the signal. + * @arg_uris: Argument to pass with the signal. + * + * Emits the "Ready" D-Bus signal. + */ +void +tumbler_exported_service_emit_ready ( + TumblerExportedService *object, + guint arg_handle, + const gchar *const *arg_uris) +{ + g_signal_emit_by_name (object, "ready", arg_handle, arg_uris); +} + +/** + * tumbler_exported_service_emit_error: + * @object: A #TumblerExportedService. + * @arg_handle: Argument to pass with the signal. + * @arg_failed_uris: Argument to pass with the signal. + * @arg_error_code: Argument to pass with the signal. + * @arg_message: Argument to pass with the signal. + * + * Emits the "Error" D-Bus signal. + */ +void +tumbler_exported_service_emit_error ( + TumblerExportedService *object, + guint arg_handle, + const gchar *const *arg_failed_uris, + gint arg_error_code, + const gchar *arg_message) +{ + g_signal_emit_by_name (object, "error", arg_handle, arg_failed_uris, arg_error_code, arg_message); +} + +/** + * tumbler_exported_service_call_queue: + * @proxy: A #TumblerExportedServiceProxy. + * @arg_uris: Argument to pass with the method invocation. + * @arg_mime_types: Argument to pass with the method invocation. + * @arg_flavor: Argument to pass with the method invocation. + * @arg_scheduler: Argument to pass with the method invocation. + * @arg_handle_to_unqueue: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the Queue() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call tumbler_exported_service_call_queue_finish() to get the result of the operation. + * + * See tumbler_exported_service_call_queue_sync() for the synchronous, blocking version of this method. + */ +void +tumbler_exported_service_call_queue ( + TumblerExportedService *proxy, + const gchar *const *arg_uris, + const gchar *const *arg_mime_types, + const gchar *arg_flavor, + const gchar *arg_scheduler, + guint arg_handle_to_unqueue, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_dbus_proxy_call (G_DBUS_PROXY (proxy), + "Queue", + g_variant_new ("(^as^asssu)", + arg_uris, + arg_mime_types, + arg_flavor, + arg_scheduler, + arg_handle_to_unqueue), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + callback, + user_data); +} + +/** + * tumbler_exported_service_call_queue_finish: + * @proxy: A #TumblerExportedServiceProxy. + * @out_handle: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to tumbler_exported_service_call_queue(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with tumbler_exported_service_call_queue(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_service_call_queue_finish ( + TumblerExportedService *proxy, + guint *out_handle, + GAsyncResult *res, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "(u)", + out_handle); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_service_call_queue_sync: + * @proxy: A #TumblerExportedServiceProxy. + * @arg_uris: Argument to pass with the method invocation. + * @arg_mime_types: Argument to pass with the method invocation. + * @arg_flavor: Argument to pass with the method invocation. + * @arg_scheduler: Argument to pass with the method invocation. + * @arg_handle_to_unqueue: Argument to pass with the method invocation. + * @out_handle: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the Queue() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See tumbler_exported_service_call_queue() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_service_call_queue_sync ( + TumblerExportedService *proxy, + const gchar *const *arg_uris, + const gchar *const *arg_mime_types, + const gchar *arg_flavor, + const gchar *arg_scheduler, + guint arg_handle_to_unqueue, + guint *out_handle, + GCancellable *cancellable, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), + "Queue", + g_variant_new ("(^as^asssu)", + arg_uris, + arg_mime_types, + arg_flavor, + arg_scheduler, + arg_handle_to_unqueue), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "(u)", + out_handle); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_service_call_dequeue: + * @proxy: A #TumblerExportedServiceProxy. + * @arg_handle: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the Dequeue() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call tumbler_exported_service_call_dequeue_finish() to get the result of the operation. + * + * See tumbler_exported_service_call_dequeue_sync() for the synchronous, blocking version of this method. + */ +void +tumbler_exported_service_call_dequeue ( + TumblerExportedService *proxy, + guint arg_handle, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_dbus_proxy_call (G_DBUS_PROXY (proxy), + "Dequeue", + g_variant_new ("(u)", + arg_handle), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + callback, + user_data); +} + +/** + * tumbler_exported_service_call_dequeue_finish: + * @proxy: A #TumblerExportedServiceProxy. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to tumbler_exported_service_call_dequeue(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with tumbler_exported_service_call_dequeue(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_service_call_dequeue_finish ( + TumblerExportedService *proxy, + GAsyncResult *res, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "()"); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_service_call_dequeue_sync: + * @proxy: A #TumblerExportedServiceProxy. + * @arg_handle: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the Dequeue() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See tumbler_exported_service_call_dequeue() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_service_call_dequeue_sync ( + TumblerExportedService *proxy, + guint arg_handle, + GCancellable *cancellable, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), + "Dequeue", + g_variant_new ("(u)", + arg_handle), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "()"); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_service_call_get_supported: + * @proxy: A #TumblerExportedServiceProxy. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the GetSupported() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call tumbler_exported_service_call_get_supported_finish() to get the result of the operation. + * + * See tumbler_exported_service_call_get_supported_sync() for the synchronous, blocking version of this method. + */ +void +tumbler_exported_service_call_get_supported ( + TumblerExportedService *proxy, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_dbus_proxy_call (G_DBUS_PROXY (proxy), + "GetSupported", + g_variant_new ("()"), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + callback, + user_data); +} + +/** + * tumbler_exported_service_call_get_supported_finish: + * @proxy: A #TumblerExportedServiceProxy. + * @out_uri_schemes: (out): Return location for return parameter or %NULL to ignore. + * @out_mime_types: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to tumbler_exported_service_call_get_supported(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with tumbler_exported_service_call_get_supported(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_service_call_get_supported_finish ( + TumblerExportedService *proxy, + gchar ***out_uri_schemes, + gchar ***out_mime_types, + GAsyncResult *res, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "(^as^as)", + out_uri_schemes, + out_mime_types); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_service_call_get_supported_sync: + * @proxy: A #TumblerExportedServiceProxy. + * @out_uri_schemes: (out): Return location for return parameter or %NULL to ignore. + * @out_mime_types: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the GetSupported() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See tumbler_exported_service_call_get_supported() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_service_call_get_supported_sync ( + TumblerExportedService *proxy, + gchar ***out_uri_schemes, + gchar ***out_mime_types, + GCancellable *cancellable, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), + "GetSupported", + g_variant_new ("()"), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "(^as^as)", + out_uri_schemes, + out_mime_types); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_service_call_get_schedulers: + * @proxy: A #TumblerExportedServiceProxy. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the GetSchedulers() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call tumbler_exported_service_call_get_schedulers_finish() to get the result of the operation. + * + * See tumbler_exported_service_call_get_schedulers_sync() for the synchronous, blocking version of this method. + */ +void +tumbler_exported_service_call_get_schedulers ( + TumblerExportedService *proxy, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_dbus_proxy_call (G_DBUS_PROXY (proxy), + "GetSchedulers", + g_variant_new ("()"), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + callback, + user_data); +} + +/** + * tumbler_exported_service_call_get_schedulers_finish: + * @proxy: A #TumblerExportedServiceProxy. + * @out_schedulers: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to tumbler_exported_service_call_get_schedulers(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with tumbler_exported_service_call_get_schedulers(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_service_call_get_schedulers_finish ( + TumblerExportedService *proxy, + gchar ***out_schedulers, + GAsyncResult *res, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "(^as)", + out_schedulers); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_service_call_get_schedulers_sync: + * @proxy: A #TumblerExportedServiceProxy. + * @out_schedulers: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the GetSchedulers() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See tumbler_exported_service_call_get_schedulers() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_service_call_get_schedulers_sync ( + TumblerExportedService *proxy, + gchar ***out_schedulers, + GCancellable *cancellable, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), + "GetSchedulers", + g_variant_new ("()"), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "(^as)", + out_schedulers); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_service_call_get_flavors: + * @proxy: A #TumblerExportedServiceProxy. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the GetFlavors() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call tumbler_exported_service_call_get_flavors_finish() to get the result of the operation. + * + * See tumbler_exported_service_call_get_flavors_sync() for the synchronous, blocking version of this method. + */ +void +tumbler_exported_service_call_get_flavors ( + TumblerExportedService *proxy, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_dbus_proxy_call (G_DBUS_PROXY (proxy), + "GetFlavors", + g_variant_new ("()"), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + callback, + user_data); +} + +/** + * tumbler_exported_service_call_get_flavors_finish: + * @proxy: A #TumblerExportedServiceProxy. + * @out_flavors: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to tumbler_exported_service_call_get_flavors(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with tumbler_exported_service_call_get_flavors(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_service_call_get_flavors_finish ( + TumblerExportedService *proxy, + gchar ***out_flavors, + GAsyncResult *res, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "(^as)", + out_flavors); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_service_call_get_flavors_sync: + * @proxy: A #TumblerExportedServiceProxy. + * @out_flavors: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the GetFlavors() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See tumbler_exported_service_call_get_flavors() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ +gboolean +tumbler_exported_service_call_get_flavors_sync ( + TumblerExportedService *proxy, + gchar ***out_flavors, + GCancellable *cancellable, + GError **error) +{ + GVariant *_ret; + _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), + "GetFlavors", + g_variant_new ("()"), + G_DBUS_CALL_FLAGS_NONE, + -1, + cancellable, + error); + if (_ret == NULL) + goto _out; + g_variant_get (_ret, + "(^as)", + out_flavors); + g_variant_unref (_ret); +_out: + return _ret != NULL; +} + +/** + * tumbler_exported_service_complete_queue: + * @object: A #TumblerExportedService. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @handle: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the Queue() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ +void +tumbler_exported_service_complete_queue ( + TumblerExportedService *object, + GDBusMethodInvocation *invocation, + guint handle) +{ + g_dbus_method_invocation_return_value (invocation, + g_variant_new ("(u)", + handle)); +} + +/** + * tumbler_exported_service_complete_dequeue: + * @object: A #TumblerExportedService. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * + * Helper function used in service implementations to finish handling invocations of the Dequeue() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ +void +tumbler_exported_service_complete_dequeue ( + TumblerExportedService *object, + GDBusMethodInvocation *invocation) +{ + g_dbus_method_invocation_return_value (invocation, + g_variant_new ("()")); +} + +/** + * tumbler_exported_service_complete_get_supported: + * @object: A #TumblerExportedService. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @uri_schemes: Parameter to return. + * @mime_types: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the GetSupported() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ +void +tumbler_exported_service_complete_get_supported ( + TumblerExportedService *object, + GDBusMethodInvocation *invocation, + const gchar *const *uri_schemes, + const gchar *const *mime_types) +{ + g_dbus_method_invocation_return_value (invocation, + g_variant_new ("(^as^as)", + uri_schemes, + mime_types)); +} + +/** + * tumbler_exported_service_complete_get_schedulers: + * @object: A #TumblerExportedService. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @schedulers: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the GetSchedulers() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ +void +tumbler_exported_service_complete_get_schedulers ( + TumblerExportedService *object, + GDBusMethodInvocation *invocation, + const gchar *const *schedulers) +{ + g_dbus_method_invocation_return_value (invocation, + g_variant_new ("(^as)", + schedulers)); +} + +/** + * tumbler_exported_service_complete_get_flavors: + * @object: A #TumblerExportedService. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @flavors: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the GetFlavors() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ +void +tumbler_exported_service_complete_get_flavors ( + TumblerExportedService *object, + GDBusMethodInvocation *invocation, + const gchar *const *flavors) +{ + g_dbus_method_invocation_return_value (invocation, + g_variant_new ("(^as)", + flavors)); +} + +/* ------------------------------------------------------------------------ */ + +/** + * TumblerExportedServiceProxy: + * + * The #TumblerExportedServiceProxy structure contains only private data and should only be accessed using the provided API. + */ + +/** + * TumblerExportedServiceProxyClass: + * @parent_class: The parent class. + * + * Class structure for #TumblerExportedServiceProxy. + */ + +struct _TumblerExportedServiceProxyPrivate +{ + GData *qdata; +}; + +static void tumbler_exported_service_proxy_iface_init (TumblerExportedServiceIface *iface); + +#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 +G_DEFINE_TYPE_WITH_CODE (TumblerExportedServiceProxy, tumbler_exported_service_proxy, G_TYPE_DBUS_PROXY, + G_ADD_PRIVATE (TumblerExportedServiceProxy) + G_IMPLEMENT_INTERFACE (TUMBLER_TYPE_EXPORTED_SERVICE, tumbler_exported_service_proxy_iface_init)); + +#else +G_DEFINE_TYPE_WITH_CODE (TumblerExportedServiceProxy, tumbler_exported_service_proxy, G_TYPE_DBUS_PROXY, + G_IMPLEMENT_INTERFACE (TUMBLER_TYPE_EXPORTED_SERVICE, tumbler_exported_service_proxy_iface_init)); + +#endif +static void +tumbler_exported_service_proxy_finalize (GObject *object) +{ + TumblerExportedServiceProxy *proxy = TUMBLER_EXPORTED_SERVICE_PROXY (object); + g_datalist_clear (&proxy->priv->qdata); + G_OBJECT_CLASS (tumbler_exported_service_proxy_parent_class)->finalize (object); +} + +static void +tumbler_exported_service_proxy_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec G_GNUC_UNUSED) +{ +} + +static void +tumbler_exported_service_proxy_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec G_GNUC_UNUSED) +{ +} + +static void +tumbler_exported_service_proxy_g_signal (GDBusProxy *proxy, + const gchar *sender_name G_GNUC_UNUSED, + const gchar *signal_name, + GVariant *parameters) +{ + _ExtendedGDBusSignalInfo *info; + GVariantIter iter; + GVariant *child; + GValue *paramv; + guint num_params; + guint n; + guint signal_id; + info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_tumbler_exported_service_interface_info.parent_struct, signal_name); + if (info == NULL) + return; + num_params = g_variant_n_children (parameters); + paramv = g_new0 (GValue, num_params + 1); + g_value_init (¶mv[0], TUMBLER_TYPE_EXPORTED_SERVICE); + g_value_set_object (¶mv[0], proxy); + g_variant_iter_init (&iter, parameters); + n = 1; + while ((child = g_variant_iter_next_value (&iter)) != NULL) + { + _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1]; + if (arg_info->use_gvariant) + { + g_value_init (¶mv[n], G_TYPE_VARIANT); + g_value_set_variant (¶mv[n], child); + n++; + } + else + g_dbus_gvariant_to_gvalue (child, ¶mv[n++]); + g_variant_unref (child); + } + signal_id = g_signal_lookup (info->signal_name, TUMBLER_TYPE_EXPORTED_SERVICE); + g_signal_emitv (paramv, signal_id, 0, NULL); + for (n = 0; n < num_params + 1; n++) + g_value_unset (¶mv[n]); + g_free (paramv); +} + +static void +tumbler_exported_service_proxy_g_properties_changed (GDBusProxy *_proxy, + GVariant *changed_properties, + const gchar *const *invalidated_properties) +{ + TumblerExportedServiceProxy *proxy = TUMBLER_EXPORTED_SERVICE_PROXY (_proxy); + guint n; + const gchar *key; + GVariantIter *iter; + _ExtendedGDBusPropertyInfo *info; + g_variant_get (changed_properties, "a{sv}", &iter); + while (g_variant_iter_next (iter, "{&sv}", &key, NULL)) + { + info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_tumbler_exported_service_interface_info.parent_struct, key); + g_datalist_remove_data (&proxy->priv->qdata, key); + if (info != NULL) + g_object_notify (G_OBJECT (proxy), info->hyphen_name); + } + g_variant_iter_free (iter); + for (n = 0; invalidated_properties[n] != NULL; n++) + { + info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_tumbler_exported_service_interface_info.parent_struct, invalidated_properties[n]); + g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]); + if (info != NULL) + g_object_notify (G_OBJECT (proxy), info->hyphen_name); + } +} + +static void +tumbler_exported_service_proxy_init (TumblerExportedServiceProxy *proxy) +{ +#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 + proxy->priv = tumbler_exported_service_proxy_get_instance_private (proxy); +#else + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, TUMBLER_TYPE_EXPORTED_SERVICE_PROXY, TumblerExportedServiceProxyPrivate); +#endif + + g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), tumbler_exported_service_interface_info ()); +} + +static void +tumbler_exported_service_proxy_class_init (TumblerExportedServiceProxyClass *klass) +{ + GObjectClass *gobject_class; + GDBusProxyClass *proxy_class; + + gobject_class = G_OBJECT_CLASS (klass); + gobject_class->finalize = tumbler_exported_service_proxy_finalize; + gobject_class->get_property = tumbler_exported_service_proxy_get_property; + gobject_class->set_property = tumbler_exported_service_proxy_set_property; + + proxy_class = G_DBUS_PROXY_CLASS (klass); + proxy_class->g_signal = tumbler_exported_service_proxy_g_signal; + proxy_class->g_properties_changed = tumbler_exported_service_proxy_g_properties_changed; + +#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38 + g_type_class_add_private (klass, sizeof (TumblerExportedServiceProxyPrivate)); +#endif +} + +static void +tumbler_exported_service_proxy_iface_init (TumblerExportedServiceIface *iface) +{ +} + +/** + * tumbler_exported_service_proxy_new: + * @connection: A #GDBusConnection. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied. + * @user_data: User data to pass to @callback. + * + * Asynchronously creates a proxy for the D-Bus interface org.freedesktop.thumbnails.Thumbnailer1. See g_dbus_proxy_new() for more details. + * + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call tumbler_exported_service_proxy_new_finish() to get the result of the operation. + * + * See tumbler_exported_service_proxy_new_sync() for the synchronous, blocking version of this constructor. + */ +void +tumbler_exported_service_proxy_new ( + GDBusConnection *connection, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_async_initable_new_async (TUMBLER_TYPE_EXPORTED_SERVICE_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.thumbnails.Thumbnailer1", NULL); +} + +/** + * tumbler_exported_service_proxy_new_finish: + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to tumbler_exported_service_proxy_new(). + * @error: Return location for error or %NULL + * + * Finishes an operation started with tumbler_exported_service_proxy_new(). + * + * Returns: (transfer full) (type TumblerExportedServiceProxy): The constructed proxy object or %NULL if @error is set. + */ +TumblerExportedService * +tumbler_exported_service_proxy_new_finish ( + GAsyncResult *res, + GError **error) +{ + GObject *ret; + GObject *source_object; + source_object = g_async_result_get_source_object (res); + ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error); + g_object_unref (source_object); + if (ret != NULL) + return TUMBLER_EXPORTED_SERVICE (ret); + else + return NULL; +} + +/** + * tumbler_exported_service_proxy_new_sync: + * @connection: A #GDBusConnection. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL + * + * Synchronously creates a proxy for the D-Bus interface org.freedesktop.thumbnails.Thumbnailer1. See g_dbus_proxy_new_sync() for more details. + * + * The calling thread is blocked until a reply is received. + * + * See tumbler_exported_service_proxy_new() for the asynchronous version of this constructor. + * + * Returns: (transfer full) (type TumblerExportedServiceProxy): The constructed proxy object or %NULL if @error is set. + */ +TumblerExportedService * +tumbler_exported_service_proxy_new_sync ( + GDBusConnection *connection, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GError **error) +{ + GInitable *ret; + ret = g_initable_new (TUMBLER_TYPE_EXPORTED_SERVICE_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.freedesktop.thumbnails.Thumbnailer1", NULL); + if (ret != NULL) + return TUMBLER_EXPORTED_SERVICE (ret); + else + return NULL; +} + + +/** + * tumbler_exported_service_proxy_new_for_bus: + * @bus_type: A #GBusType. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: A bus name (well-known or unique). + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied. + * @user_data: User data to pass to @callback. + * + * Like tumbler_exported_service_proxy_new() but takes a #GBusType instead of a #GDBusConnection. + * + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call tumbler_exported_service_proxy_new_for_bus_finish() to get the result of the operation. + * + * See tumbler_exported_service_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor. + */ +void +tumbler_exported_service_proxy_new_for_bus ( + GBusType bus_type, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + g_async_initable_new_async (TUMBLER_TYPE_EXPORTED_SERVICE_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.thumbnails.Thumbnailer1", NULL); +} + +/** + * tumbler_exported_service_proxy_new_for_bus_finish: + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to tumbler_exported_service_proxy_new_for_bus(). + * @error: Return location for error or %NULL + * + * Finishes an operation started with tumbler_exported_service_proxy_new_for_bus(). + * + * Returns: (transfer full) (type TumblerExportedServiceProxy): The constructed proxy object or %NULL if @error is set. + */ +TumblerExportedService * +tumbler_exported_service_proxy_new_for_bus_finish ( + GAsyncResult *res, + GError **error) +{ + GObject *ret; + GObject *source_object; + source_object = g_async_result_get_source_object (res); + ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error); + g_object_unref (source_object); + if (ret != NULL) + return TUMBLER_EXPORTED_SERVICE (ret); + else + return NULL; +} + +/** + * tumbler_exported_service_proxy_new_for_bus_sync: + * @bus_type: A #GBusType. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: A bus name (well-known or unique). + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL + * + * Like tumbler_exported_service_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection. + * + * The calling thread is blocked until a reply is received. + * + * See tumbler_exported_service_proxy_new_for_bus() for the asynchronous version of this constructor. + * + * Returns: (transfer full) (type TumblerExportedServiceProxy): The constructed proxy object or %NULL if @error is set. + */ +TumblerExportedService * +tumbler_exported_service_proxy_new_for_bus_sync ( + GBusType bus_type, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GError **error) +{ + GInitable *ret; + ret = g_initable_new (TUMBLER_TYPE_EXPORTED_SERVICE_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.freedesktop.thumbnails.Thumbnailer1", NULL); + if (ret != NULL) + return TUMBLER_EXPORTED_SERVICE (ret); + else + return NULL; +} + + +/* ------------------------------------------------------------------------ */ + +/** + * TumblerExportedServiceSkeleton: + * + * The #TumblerExportedServiceSkeleton structure contains only private data and should only be accessed using the provided API. + */ + +/** + * TumblerExportedServiceSkeletonClass: + * @parent_class: The parent class. + * + * Class structure for #TumblerExportedServiceSkeleton. + */ + +struct _TumblerExportedServiceSkeletonPrivate +{ + GValue *properties; + GList *changed_properties; + GSource *changed_properties_idle_source; + GMainContext *context; + GMutex lock; +}; + +static void +_tumbler_exported_service_skeleton_handle_method_call ( + GDBusConnection *connection G_GNUC_UNUSED, + const gchar *sender G_GNUC_UNUSED, + const gchar *object_path G_GNUC_UNUSED, + const gchar *interface_name, + const gchar *method_name, + GVariant *parameters, + GDBusMethodInvocation *invocation, + gpointer user_data) +{ + TumblerExportedServiceSkeleton *skeleton = TUMBLER_EXPORTED_SERVICE_SKELETON (user_data); + _ExtendedGDBusMethodInfo *info; + GVariantIter iter; + GVariant *child; + GValue *paramv; + guint num_params; + guint num_extra; + guint n; + guint signal_id; + GValue return_value = G_VALUE_INIT; + info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation); + g_assert (info != NULL); + num_params = g_variant_n_children (parameters); + num_extra = info->pass_fdlist ? 3 : 2; paramv = g_new0 (GValue, num_params + num_extra); + n = 0; + g_value_init (¶mv[n], TUMBLER_TYPE_EXPORTED_SERVICE); + g_value_set_object (¶mv[n++], skeleton); + g_value_init (¶mv[n], G_TYPE_DBUS_METHOD_INVOCATION); + g_value_set_object (¶mv[n++], invocation); + if (info->pass_fdlist) + { +#ifdef G_OS_UNIX + g_value_init (¶mv[n], G_TYPE_UNIX_FD_LIST); + g_value_set_object (¶mv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation))); +#else + g_assert_not_reached (); +#endif + } + g_variant_iter_init (&iter, parameters); + while ((child = g_variant_iter_next_value (&iter)) != NULL) + { + _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - num_extra]; + if (arg_info->use_gvariant) + { + g_value_init (¶mv[n], G_TYPE_VARIANT); + g_value_set_variant (¶mv[n], child); + n++; + } + else + g_dbus_gvariant_to_gvalue (child, ¶mv[n++]); + g_variant_unref (child); + } + signal_id = g_signal_lookup (info->signal_name, TUMBLER_TYPE_EXPORTED_SERVICE); + g_value_init (&return_value, G_TYPE_BOOLEAN); + g_signal_emitv (paramv, signal_id, 0, &return_value); + if (!g_value_get_boolean (&return_value)) + g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name); + g_value_unset (&return_value); + for (n = 0; n < num_params + num_extra; n++) + g_value_unset (¶mv[n]); + g_free (paramv); +} + +static GVariant * +_tumbler_exported_service_skeleton_handle_get_property ( + GDBusConnection *connection G_GNUC_UNUSED, + const gchar *sender G_GNUC_UNUSED, + const gchar *object_path G_GNUC_UNUSED, + const gchar *interface_name G_GNUC_UNUSED, + const gchar *property_name, + GError **error, + gpointer user_data) +{ + TumblerExportedServiceSkeleton *skeleton = TUMBLER_EXPORTED_SERVICE_SKELETON (user_data); + GValue value = G_VALUE_INIT; + GParamSpec *pspec; + _ExtendedGDBusPropertyInfo *info; + GVariant *ret; + ret = NULL; + info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_tumbler_exported_service_interface_info.parent_struct, property_name); + g_assert (info != NULL); + pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name); + if (pspec == NULL) + { + g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name); + } + else + { + g_value_init (&value, pspec->value_type); + g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value); + ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature)); + g_value_unset (&value); + } + return ret; +} + +static gboolean +_tumbler_exported_service_skeleton_handle_set_property ( + GDBusConnection *connection G_GNUC_UNUSED, + const gchar *sender G_GNUC_UNUSED, + const gchar *object_path G_GNUC_UNUSED, + const gchar *interface_name G_GNUC_UNUSED, + const gchar *property_name, + GVariant *variant, + GError **error, + gpointer user_data) +{ + TumblerExportedServiceSkeleton *skeleton = TUMBLER_EXPORTED_SERVICE_SKELETON (user_data); + GValue value = G_VALUE_INIT; + GParamSpec *pspec; + _ExtendedGDBusPropertyInfo *info; + gboolean ret; + ret = FALSE; + info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_tumbler_exported_service_interface_info.parent_struct, property_name); + g_assert (info != NULL); + pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name); + if (pspec == NULL) + { + g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name); + } + else + { + if (info->use_gvariant) + g_value_set_variant (&value, variant); + else + g_dbus_gvariant_to_gvalue (variant, &value); + g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value); + g_value_unset (&value); + ret = TRUE; + } + return ret; +} + +static const GDBusInterfaceVTable _tumbler_exported_service_skeleton_vtable = +{ + _tumbler_exported_service_skeleton_handle_method_call, + _tumbler_exported_service_skeleton_handle_get_property, + _tumbler_exported_service_skeleton_handle_set_property, + {NULL} +}; + +static GDBusInterfaceInfo * +tumbler_exported_service_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED) +{ + return tumbler_exported_service_interface_info (); +} + +static GDBusInterfaceVTable * +tumbler_exported_service_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED) +{ + return (GDBusInterfaceVTable *) &_tumbler_exported_service_skeleton_vtable; +} + +static GVariant * +tumbler_exported_service_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton) +{ + TumblerExportedServiceSkeleton *skeleton = TUMBLER_EXPORTED_SERVICE_SKELETON (_skeleton); + + GVariantBuilder builder; + guint n; + g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}")); + if (_tumbler_exported_service_interface_info.parent_struct.properties == NULL) + goto out; + for (n = 0; _tumbler_exported_service_interface_info.parent_struct.properties[n] != NULL; n++) + { + GDBusPropertyInfo *info = _tumbler_exported_service_interface_info.parent_struct.properties[n]; + if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE) + { + GVariant *value; + value = _tumbler_exported_service_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.freedesktop.thumbnails.Thumbnailer1", info->name, NULL, skeleton); + if (value != NULL) + { + g_variant_take_ref (value); + g_variant_builder_add (&builder, "{sv}", info->name, value); + g_variant_unref (value); + } + } + } +out: + return g_variant_builder_end (&builder); +} + +static void +tumbler_exported_service_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton) +{ +} + +static void +_tumbler_exported_service_on_signal_started ( + TumblerExportedService *object, + guint arg_handle) +{ + TumblerExportedServiceSkeleton *skeleton = TUMBLER_EXPORTED_SERVICE_SKELETON (object); + + GList *connections, *l; + GVariant *signal_variant; + connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton)); + + signal_variant = g_variant_ref_sink (g_variant_new ("(u)", + arg_handle)); + for (l = connections; l != NULL; l = l->next) + { + GDBusConnection *connection = l->data; + g_dbus_connection_emit_signal (connection, + NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.freedesktop.thumbnails.Thumbnailer1", "Started", + signal_variant, NULL); + } + g_variant_unref (signal_variant); + g_list_free_full (connections, g_object_unref); +} + +static void +_tumbler_exported_service_on_signal_finished ( + TumblerExportedService *object, + guint arg_handle) +{ + TumblerExportedServiceSkeleton *skeleton = TUMBLER_EXPORTED_SERVICE_SKELETON (object); + + GList *connections, *l; + GVariant *signal_variant; + connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton)); + + signal_variant = g_variant_ref_sink (g_variant_new ("(u)", + arg_handle)); + for (l = connections; l != NULL; l = l->next) + { + GDBusConnection *connection = l->data; + g_dbus_connection_emit_signal (connection, + NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.freedesktop.thumbnails.Thumbnailer1", "Finished", + signal_variant, NULL); + } + g_variant_unref (signal_variant); + g_list_free_full (connections, g_object_unref); +} + +static void +_tumbler_exported_service_on_signal_ready ( + TumblerExportedService *object, + guint arg_handle, + const gchar *const *arg_uris) +{ + TumblerExportedServiceSkeleton *skeleton = TUMBLER_EXPORTED_SERVICE_SKELETON (object); + + GList *connections, *l; + GVariant *signal_variant; + connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton)); + + signal_variant = g_variant_ref_sink (g_variant_new ("(u^as)", + arg_handle, + arg_uris)); + for (l = connections; l != NULL; l = l->next) + { + GDBusConnection *connection = l->data; + g_dbus_connection_emit_signal (connection, + NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.freedesktop.thumbnails.Thumbnailer1", "Ready", + signal_variant, NULL); + } + g_variant_unref (signal_variant); + g_list_free_full (connections, g_object_unref); +} + +static void +_tumbler_exported_service_on_signal_error ( + TumblerExportedService *object, + guint arg_handle, + const gchar *const *arg_failed_uris, + gint arg_error_code, + const gchar *arg_message) +{ + TumblerExportedServiceSkeleton *skeleton = TUMBLER_EXPORTED_SERVICE_SKELETON (object); + + GList *connections, *l; + GVariant *signal_variant; + connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton)); + + signal_variant = g_variant_ref_sink (g_variant_new ("(u^asis)", + arg_handle, + arg_failed_uris, + arg_error_code, + arg_message)); + for (l = connections; l != NULL; l = l->next) + { + GDBusConnection *connection = l->data; + g_dbus_connection_emit_signal (connection, + NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.freedesktop.thumbnails.Thumbnailer1", "Error", + signal_variant, NULL); + } + g_variant_unref (signal_variant); + g_list_free_full (connections, g_object_unref); +} + +static void tumbler_exported_service_skeleton_iface_init (TumblerExportedServiceIface *iface); +#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 +G_DEFINE_TYPE_WITH_CODE (TumblerExportedServiceSkeleton, tumbler_exported_service_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON, + G_ADD_PRIVATE (TumblerExportedServiceSkeleton) + G_IMPLEMENT_INTERFACE (TUMBLER_TYPE_EXPORTED_SERVICE, tumbler_exported_service_skeleton_iface_init)); + +#else +G_DEFINE_TYPE_WITH_CODE (TumblerExportedServiceSkeleton, tumbler_exported_service_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON, + G_IMPLEMENT_INTERFACE (TUMBLER_TYPE_EXPORTED_SERVICE, tumbler_exported_service_skeleton_iface_init)); + +#endif +static void +tumbler_exported_service_skeleton_finalize (GObject *object) +{ + TumblerExportedServiceSkeleton *skeleton = TUMBLER_EXPORTED_SERVICE_SKELETON (object); + g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free); + if (skeleton->priv->changed_properties_idle_source != NULL) + g_source_destroy (skeleton->priv->changed_properties_idle_source); + g_main_context_unref (skeleton->priv->context); + g_mutex_clear (&skeleton->priv->lock); + G_OBJECT_CLASS (tumbler_exported_service_skeleton_parent_class)->finalize (object); +} + +static void +tumbler_exported_service_skeleton_init (TumblerExportedServiceSkeleton *skeleton) +{ +#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 + skeleton->priv = tumbler_exported_service_skeleton_get_instance_private (skeleton); +#else + skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, TUMBLER_TYPE_EXPORTED_SERVICE_SKELETON, TumblerExportedServiceSkeletonPrivate); +#endif + + g_mutex_init (&skeleton->priv->lock); + skeleton->priv->context = g_main_context_ref_thread_default (); +} + +static void +tumbler_exported_service_skeleton_class_init (TumblerExportedServiceSkeletonClass *klass) +{ + GObjectClass *gobject_class; + GDBusInterfaceSkeletonClass *skeleton_class; + + gobject_class = G_OBJECT_CLASS (klass); + gobject_class->finalize = tumbler_exported_service_skeleton_finalize; + + skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass); + skeleton_class->get_info = tumbler_exported_service_skeleton_dbus_interface_get_info; + skeleton_class->get_properties = tumbler_exported_service_skeleton_dbus_interface_get_properties; + skeleton_class->flush = tumbler_exported_service_skeleton_dbus_interface_flush; + skeleton_class->get_vtable = tumbler_exported_service_skeleton_dbus_interface_get_vtable; + +#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38 + g_type_class_add_private (klass, sizeof (TumblerExportedServiceSkeletonPrivate)); +#endif +} + +static void +tumbler_exported_service_skeleton_iface_init (TumblerExportedServiceIface *iface) +{ + iface->started = _tumbler_exported_service_on_signal_started; + iface->finished = _tumbler_exported_service_on_signal_finished; + iface->ready = _tumbler_exported_service_on_signal_ready; + iface->error = _tumbler_exported_service_on_signal_error; +} + +/** + * tumbler_exported_service_skeleton_new: + * + * Creates a skeleton object for the D-Bus interface org.freedesktop.thumbnails.Thumbnailer1. + * + * Returns: (transfer full) (type TumblerExportedServiceSkeleton): The skeleton object. + */ +TumblerExportedService * +tumbler_exported_service_skeleton_new (void) +{ + return TUMBLER_EXPORTED_SERVICE (g_object_new (TUMBLER_TYPE_EXPORTED_SERVICE_SKELETON, NULL)); +} + diff -Nru tumbler-0.1.31/tumblerd/tumbler-service-gdbus.h tumbler-0.1.90/tumblerd/tumbler-service-gdbus.h --- tumbler-0.1.31/tumblerd/tumbler-service-gdbus.h 1970-01-01 00:00:00.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-service-gdbus.h 2017-05-11 09:08:51.000000000 +0000 @@ -0,0 +1,348 @@ +/* + * Generated by gdbus-codegen 2.50.3. DO NOT EDIT. + * + * The license of this code is the same as for the source it was derived from. + */ + +#ifndef __TUMBLER_SERVICE_GDBUS_H__ +#define __TUMBLER_SERVICE_GDBUS_H__ + +#include + +G_BEGIN_DECLS + + +/* ------------------------------------------------------------------------ */ +/* Declarations for org.freedesktop.thumbnails.Thumbnailer1 */ + +#define TUMBLER_TYPE_EXPORTED_SERVICE (tumbler_exported_service_get_type ()) +#define TUMBLER_EXPORTED_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TUMBLER_TYPE_EXPORTED_SERVICE, TumblerExportedService)) +#define TUMBLER_IS_EXPORTED_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TUMBLER_TYPE_EXPORTED_SERVICE)) +#define TUMBLER_EXPORTED_SERVICE_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), TUMBLER_TYPE_EXPORTED_SERVICE, TumblerExportedServiceIface)) + +struct _TumblerExportedService; +typedef struct _TumblerExportedService TumblerExportedService; +typedef struct _TumblerExportedServiceIface TumblerExportedServiceIface; + +struct _TumblerExportedServiceIface +{ + GTypeInterface parent_iface; + + + gboolean (*handle_dequeue) ( + TumblerExportedService *object, + GDBusMethodInvocation *invocation, + guint arg_handle); + + gboolean (*handle_get_flavors) ( + TumblerExportedService *object, + GDBusMethodInvocation *invocation); + + gboolean (*handle_get_schedulers) ( + TumblerExportedService *object, + GDBusMethodInvocation *invocation); + + gboolean (*handle_get_supported) ( + TumblerExportedService *object, + GDBusMethodInvocation *invocation); + + gboolean (*handle_queue) ( + TumblerExportedService *object, + GDBusMethodInvocation *invocation, + const gchar *const *arg_uris, + const gchar *const *arg_mime_types, + const gchar *arg_flavor, + const gchar *arg_scheduler, + guint arg_handle_to_unqueue); + + void (*error) ( + TumblerExportedService *object, + guint arg_handle, + const gchar *const *arg_failed_uris, + gint arg_error_code, + const gchar *arg_message); + + void (*finished) ( + TumblerExportedService *object, + guint arg_handle); + + void (*ready) ( + TumblerExportedService *object, + guint arg_handle, + const gchar *const *arg_uris); + + void (*started) ( + TumblerExportedService *object, + guint arg_handle); + +}; + +GType tumbler_exported_service_get_type (void) G_GNUC_CONST; + +GDBusInterfaceInfo *tumbler_exported_service_interface_info (void); +guint tumbler_exported_service_override_properties (GObjectClass *klass, guint property_id_begin); + + +/* D-Bus method call completion functions: */ +void tumbler_exported_service_complete_queue ( + TumblerExportedService *object, + GDBusMethodInvocation *invocation, + guint handle); + +void tumbler_exported_service_complete_dequeue ( + TumblerExportedService *object, + GDBusMethodInvocation *invocation); + +void tumbler_exported_service_complete_get_supported ( + TumblerExportedService *object, + GDBusMethodInvocation *invocation, + const gchar *const *uri_schemes, + const gchar *const *mime_types); + +void tumbler_exported_service_complete_get_schedulers ( + TumblerExportedService *object, + GDBusMethodInvocation *invocation, + const gchar *const *schedulers); + +void tumbler_exported_service_complete_get_flavors ( + TumblerExportedService *object, + GDBusMethodInvocation *invocation, + const gchar *const *flavors); + + + +/* D-Bus signal emissions functions: */ +void tumbler_exported_service_emit_started ( + TumblerExportedService *object, + guint arg_handle); + +void tumbler_exported_service_emit_finished ( + TumblerExportedService *object, + guint arg_handle); + +void tumbler_exported_service_emit_ready ( + TumblerExportedService *object, + guint arg_handle, + const gchar *const *arg_uris); + +void tumbler_exported_service_emit_error ( + TumblerExportedService *object, + guint arg_handle, + const gchar *const *arg_failed_uris, + gint arg_error_code, + const gchar *arg_message); + + + +/* D-Bus method calls: */ +void tumbler_exported_service_call_queue ( + TumblerExportedService *proxy, + const gchar *const *arg_uris, + const gchar *const *arg_mime_types, + const gchar *arg_flavor, + const gchar *arg_scheduler, + guint arg_handle_to_unqueue, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean tumbler_exported_service_call_queue_finish ( + TumblerExportedService *proxy, + guint *out_handle, + GAsyncResult *res, + GError **error); + +gboolean tumbler_exported_service_call_queue_sync ( + TumblerExportedService *proxy, + const gchar *const *arg_uris, + const gchar *const *arg_mime_types, + const gchar *arg_flavor, + const gchar *arg_scheduler, + guint arg_handle_to_unqueue, + guint *out_handle, + GCancellable *cancellable, + GError **error); + +void tumbler_exported_service_call_dequeue ( + TumblerExportedService *proxy, + guint arg_handle, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean tumbler_exported_service_call_dequeue_finish ( + TumblerExportedService *proxy, + GAsyncResult *res, + GError **error); + +gboolean tumbler_exported_service_call_dequeue_sync ( + TumblerExportedService *proxy, + guint arg_handle, + GCancellable *cancellable, + GError **error); + +void tumbler_exported_service_call_get_supported ( + TumblerExportedService *proxy, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean tumbler_exported_service_call_get_supported_finish ( + TumblerExportedService *proxy, + gchar ***out_uri_schemes, + gchar ***out_mime_types, + GAsyncResult *res, + GError **error); + +gboolean tumbler_exported_service_call_get_supported_sync ( + TumblerExportedService *proxy, + gchar ***out_uri_schemes, + gchar ***out_mime_types, + GCancellable *cancellable, + GError **error); + +void tumbler_exported_service_call_get_schedulers ( + TumblerExportedService *proxy, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean tumbler_exported_service_call_get_schedulers_finish ( + TumblerExportedService *proxy, + gchar ***out_schedulers, + GAsyncResult *res, + GError **error); + +gboolean tumbler_exported_service_call_get_schedulers_sync ( + TumblerExportedService *proxy, + gchar ***out_schedulers, + GCancellable *cancellable, + GError **error); + +void tumbler_exported_service_call_get_flavors ( + TumblerExportedService *proxy, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + +gboolean tumbler_exported_service_call_get_flavors_finish ( + TumblerExportedService *proxy, + gchar ***out_flavors, + GAsyncResult *res, + GError **error); + +gboolean tumbler_exported_service_call_get_flavors_sync ( + TumblerExportedService *proxy, + gchar ***out_flavors, + GCancellable *cancellable, + GError **error); + + + +/* ---- */ + +#define TUMBLER_TYPE_EXPORTED_SERVICE_PROXY (tumbler_exported_service_proxy_get_type ()) +#define TUMBLER_EXPORTED_SERVICE_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TUMBLER_TYPE_EXPORTED_SERVICE_PROXY, TumblerExportedServiceProxy)) +#define TUMBLER_EXPORTED_SERVICE_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TUMBLER_TYPE_EXPORTED_SERVICE_PROXY, TumblerExportedServiceProxyClass)) +#define TUMBLER_EXPORTED_SERVICE_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TUMBLER_TYPE_EXPORTED_SERVICE_PROXY, TumblerExportedServiceProxyClass)) +#define TUMBLER_IS_EXPORTED_SERVICE_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TUMBLER_TYPE_EXPORTED_SERVICE_PROXY)) +#define TUMBLER_IS_EXPORTED_SERVICE_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TUMBLER_TYPE_EXPORTED_SERVICE_PROXY)) + +typedef struct _TumblerExportedServiceProxy TumblerExportedServiceProxy; +typedef struct _TumblerExportedServiceProxyClass TumblerExportedServiceProxyClass; +typedef struct _TumblerExportedServiceProxyPrivate TumblerExportedServiceProxyPrivate; + +struct _TumblerExportedServiceProxy +{ + /*< private >*/ + GDBusProxy parent_instance; + TumblerExportedServiceProxyPrivate *priv; +}; + +struct _TumblerExportedServiceProxyClass +{ + GDBusProxyClass parent_class; +}; + +GType tumbler_exported_service_proxy_get_type (void) G_GNUC_CONST; + +#if GLIB_CHECK_VERSION(2, 44, 0) +G_DEFINE_AUTOPTR_CLEANUP_FUNC (TumblerExportedServiceProxy, g_object_unref) +#endif + +void tumbler_exported_service_proxy_new ( + GDBusConnection *connection, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +TumblerExportedService *tumbler_exported_service_proxy_new_finish ( + GAsyncResult *res, + GError **error); +TumblerExportedService *tumbler_exported_service_proxy_new_sync ( + GDBusConnection *connection, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GError **error); + +void tumbler_exported_service_proxy_new_for_bus ( + GBusType bus_type, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +TumblerExportedService *tumbler_exported_service_proxy_new_for_bus_finish ( + GAsyncResult *res, + GError **error); +TumblerExportedService *tumbler_exported_service_proxy_new_for_bus_sync ( + GBusType bus_type, + GDBusProxyFlags flags, + const gchar *name, + const gchar *object_path, + GCancellable *cancellable, + GError **error); + + +/* ---- */ + +#define TUMBLER_TYPE_EXPORTED_SERVICE_SKELETON (tumbler_exported_service_skeleton_get_type ()) +#define TUMBLER_EXPORTED_SERVICE_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TUMBLER_TYPE_EXPORTED_SERVICE_SKELETON, TumblerExportedServiceSkeleton)) +#define TUMBLER_EXPORTED_SERVICE_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TUMBLER_TYPE_EXPORTED_SERVICE_SKELETON, TumblerExportedServiceSkeletonClass)) +#define TUMBLER_EXPORTED_SERVICE_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TUMBLER_TYPE_EXPORTED_SERVICE_SKELETON, TumblerExportedServiceSkeletonClass)) +#define TUMBLER_IS_EXPORTED_SERVICE_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TUMBLER_TYPE_EXPORTED_SERVICE_SKELETON)) +#define TUMBLER_IS_EXPORTED_SERVICE_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TUMBLER_TYPE_EXPORTED_SERVICE_SKELETON)) + +typedef struct _TumblerExportedServiceSkeleton TumblerExportedServiceSkeleton; +typedef struct _TumblerExportedServiceSkeletonClass TumblerExportedServiceSkeletonClass; +typedef struct _TumblerExportedServiceSkeletonPrivate TumblerExportedServiceSkeletonPrivate; + +struct _TumblerExportedServiceSkeleton +{ + /*< private >*/ + GDBusInterfaceSkeleton parent_instance; + TumblerExportedServiceSkeletonPrivate *priv; +}; + +struct _TumblerExportedServiceSkeletonClass +{ + GDBusInterfaceSkeletonClass parent_class; +}; + +GType tumbler_exported_service_skeleton_get_type (void) G_GNUC_CONST; + +#if GLIB_CHECK_VERSION(2, 44, 0) +G_DEFINE_AUTOPTR_CLEANUP_FUNC (TumblerExportedServiceSkeleton, g_object_unref) +#endif + +TumblerExportedService *tumbler_exported_service_skeleton_new (void); + + +G_END_DECLS + +#endif /* __TUMBLER_SERVICE_GDBUS_H__ */ diff -Nru tumbler-0.1.31/tumblerd/tumbler-service.h tumbler-0.1.90/tumblerd/tumbler-service.h --- tumbler-0.1.31/tumblerd/tumbler-service.h 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-service.h 2017-05-11 09:06:12.000000000 +0000 @@ -1,7 +1,8 @@ /* vi:set et ai sw=2 sts=2 ts=2: */ /*- * Copyright (c) 2009-2011 Jannis Pohlmann - * + * Copyright (c) 2015 Ali Abdallah + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of @@ -21,8 +22,6 @@ #ifndef __TUMBLER_SERVICE_H__ #define __TUMBLER_SERVICE_H__ -#include - #include #include @@ -40,27 +39,10 @@ GType tumbler_service_get_type (void) G_GNUC_CONST; -TumblerService *tumbler_service_new (DBusGConnection *connection, +TumblerService *tumbler_service_new (GDBusConnection *connection, TumblerLifecycleManager *lifecycle_manager, TumblerRegistry *registry) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; -gboolean tumbler_service_start (TumblerService *service, - GError **error); -void tumbler_service_queue (TumblerService *service, - const gchar *const *uris, - const gchar *const *mime_hints, - const gchar *flavor_name, - const gchar *scheduler_name, - guint handle_to_dequeue, - DBusGMethodInvocation *context); -void tumbler_service_dequeue (TumblerService *service, - guint handle, - DBusGMethodInvocation *context); -void tumbler_service_get_schedulers (TumblerService *service, - DBusGMethodInvocation *context); -void tumbler_service_get_supported (TumblerService *service, - DBusGMethodInvocation *context); -void tumbler_service_get_flavors (TumblerService *service, - DBusGMethodInvocation *context); +gboolean tumbler_service_is_exported (TumblerService *service); G_END_DECLS; diff -Nru tumbler-0.1.31/tumblerd/tumbler-specialized-thumbnailer.c tumbler-0.1.90/tumblerd/tumbler-specialized-thumbnailer.c --- tumbler-0.1.31/tumblerd/tumbler-specialized-thumbnailer.c 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-specialized-thumbnailer.c 2017-05-11 09:06:12.000000000 +0000 @@ -66,9 +66,10 @@ static void tumbler_specialized_thumbnailer_create (TumblerThumbnailer *thumbnailer, GCancellable *cancellable, TumblerFileInfo *info); -static void tumbler_specialized_thumbnailer_proxy_destroyed (DBusGProxy *proxy, - TumblerSpecializedThumbnailer *thumbnailer); +static void tumbler_specialized_thumbnailer_proxy_name_owner_changed (GDBusProxy *proxy, + GParamSpec *spec, + TumblerSpecializedThumbnailer *thumbnailer); struct _TumblerSpecializedThumbnailerClass @@ -80,8 +81,8 @@ { TumblerAbstractThumbnailer __parent__; - DBusGConnection *connection; - DBusGProxy *proxy; + GDBusConnection *connection; + GDBusProxy *proxy; gboolean foreign; guint64 modified; @@ -146,18 +147,19 @@ g_object_class_install_property (gobject_class, PROP_CONNECTION, - g_param_spec_pointer ("connection", - "connection", - "connection", - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_READWRITE)); + g_param_spec_object ("connection", + "connection", + "connection", + G_TYPE_DBUS_CONNECTION, + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_PROXY, g_param_spec_object ("proxy", "proxy", "proxy", - DBUS_TYPE_G_PROXY, + G_TYPE_DBUS_PROXY, G_PARAM_READABLE)); g_object_class_install_property (gobject_class, @@ -177,26 +179,6 @@ 0, G_MAXUINT64, 0, G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE)); - - dbus_g_object_register_marshaller (tumbler_marshal_VOID__UINT_STRING, - G_TYPE_NONE, - G_TYPE_UINT, - G_TYPE_STRING, - G_TYPE_INVALID); - - dbus_g_object_register_marshaller (g_cclosure_marshal_VOID__UINT, - G_TYPE_NONE, - G_TYPE_UINT, - G_TYPE_INVALID); - - dbus_g_object_register_marshaller (tumbler_marshal_VOID__UINT_STRING_INT_STRING, - G_TYPE_NONE, - G_TYPE_UINT, - G_TYPE_STRING, - G_TYPE_INT, - G_TYPE_STRING, - G_TYPE_INVALID); - } @@ -226,29 +208,20 @@ /* chain up to parent classes */ if (G_OBJECT_CLASS (tumbler_specialized_thumbnailer_parent_class)->constructed != NULL) (G_OBJECT_CLASS (tumbler_specialized_thumbnailer_parent_class)->constructed) (object); - + thumbnailer->proxy = - dbus_g_proxy_new_for_name (thumbnailer->connection, - thumbnailer->name, - thumbnailer->object_path, - "org.freedesktop.thumbnails.SpecializedThumbnailer1"); - - dbus_g_proxy_add_signal (thumbnailer->proxy, "Ready", - G_TYPE_UINT, G_TYPE_STRING, - G_TYPE_INVALID); - - dbus_g_proxy_add_signal (thumbnailer->proxy, "Error", - G_TYPE_UINT, G_TYPE_STRING, - G_TYPE_INT, G_TYPE_STRING, - G_TYPE_INVALID); - - dbus_g_proxy_add_signal (thumbnailer->proxy, "Finished", - G_TYPE_UINT, - G_TYPE_INVALID); - + g_dbus_proxy_new_sync (thumbnailer->connection, + G_DBUS_PROXY_FLAGS_NONE, + NULL, + thumbnailer->name, + thumbnailer->object_path, + "org.freedesktop.thumbnails.SpecializedThumbnailer1", + NULL, + NULL); + if (thumbnailer->foreign) { - g_signal_connect (thumbnailer->proxy, "destroy", - G_CALLBACK (tumbler_specialized_thumbnailer_proxy_destroyed), + g_signal_connect (thumbnailer->proxy, "notify::g-name-owner", + G_CALLBACK (tumbler_specialized_thumbnailer_proxy_name_owner_changed), thumbnailer); } } @@ -268,8 +241,8 @@ g_object_unref (thumbnailer->proxy); - dbus_g_connection_unref (thumbnailer->connection); - + g_object_unref (thumbnailer->connection); + (*G_OBJECT_CLASS (tumbler_specialized_thumbnailer_parent_class)->finalize) (object); } @@ -286,7 +259,7 @@ switch (prop_id) { case PROP_CONNECTION: - g_value_set_pointer (value, dbus_g_connection_ref (thumbnailer->connection)); + g_value_set_object (value, g_object_ref (thumbnailer->connection)); break; case PROP_NAME: g_value_set_string (value, thumbnailer->name); @@ -322,7 +295,7 @@ switch (prop_id) { case PROP_CONNECTION: - thumbnailer->connection = dbus_g_connection_ref (g_value_get_pointer (value)); + thumbnailer->connection = g_object_ref (g_value_get_object (value)); break; case PROP_NAME: thumbnailer->name = g_value_dup_string (value); @@ -344,56 +317,65 @@ -static void -specialized_error (DBusGProxy *proxy, - guint handle, - gchar *uri, - gint error_code, - gchar *error_msg, - gpointer user_data) -{ - SpecializedInfo *info = user_data; - - if (info->handle == handle) - g_signal_emit_by_name (info->thumbnailer, "error", uri, error_code, error_msg); -} - - - -static void -specialized_ready (DBusGProxy *proxy, - guint handle, - gchar *uri, - gpointer user_data) -{ - SpecializedInfo *info = user_data; - - if (info->handle == handle) - g_signal_emit_by_name (info->thumbnailer, "ready", uri); -} - - -static void -specialized_finished (DBusGProxy *proxy, - guint handle, - gpointer user_data) -{ - SpecializedInfo *info = user_data; - - if (info->handle == handle) +static void +thumbnailer_proxy_g_signal_cb (GDBusProxy *proxy, + gchar *sender_name, + gchar *signal_name, + GVariant *parameters, + gpointer user_data) +{ + SpecializedInfo *info = user_data; + guint handle; + + if (strcmp (signal_name, "Finished") == 0) { - tumbler_mutex_lock (info->mutex); + if (g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(u)"))) + { + g_variant_get (parameters, "(&u)", &handle); + if (info->handle == handle) + { + tumbler_mutex_lock (info->mutex); #if GLIB_CHECK_VERSION (2, 32, 0) - g_cond_broadcast (&info->condition); + g_cond_broadcast (&info->condition); #else - g_cond_broadcast (info->condition); + g_cond_broadcast (info->condition); #endif - info->had_callback = TRUE; - tumbler_mutex_unlock (info->mutex); + info->had_callback = TRUE; + tumbler_mutex_unlock (info->mutex); + } + } + } + else if (strcmp (signal_name, "Ready") == 0) + { + if (g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(us)"))) + { + const gchar *uri; + g_variant_get (parameters, "(u&s)", &handle, &uri); + if (info->handle == handle) + { + g_signal_emit_by_name (info->thumbnailer, "ready", uri); + } + } + } + else if (strcmp (signal_name, "Error") == 0) + { + if (g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(usis)"))) + { + const gchar *uri, *error_msg; + gint error_code; + + g_variant_get (parameters, "(u&si&s)", &handle, &uri, &error_code, &error_msg); + if (info->handle == handle) + { + g_signal_emit_by_name (info->thumbnailer, "error", uri, error_code, error_msg); + } + } } } + + static void tumbler_specialized_thumbnailer_create (TumblerThumbnailer *thumbnailer, GCancellable *cancellable, @@ -408,11 +390,13 @@ #endif TumblerThumbnail *thumbnail; TumblerThumbnailFlavor *flavor; + GVariant *result; const gchar *flavor_name; const gchar *uri; GError *error = NULL; gchar *message; - + int handler_id; + g_return_if_fail (TUMBLER_IS_SPECIALIZED_THUMBNAILER (thumbnailer)); uri = tumbler_file_info_get_uri (info); @@ -433,36 +417,29 @@ sinfo.mime_type = tumbler_file_info_get_mime_type (info); sinfo.thumbnailer = thumbnailer; - dbus_g_proxy_connect_signal (s->proxy, "Finished", - G_CALLBACK (specialized_finished), - &sinfo, - NULL); - - dbus_g_proxy_connect_signal (s->proxy, "Ready", - G_CALLBACK (specialized_ready), - &sinfo, - NULL); - - dbus_g_proxy_connect_signal (s->proxy, "Error", - G_CALLBACK (specialized_error), - &sinfo, - NULL); - - dbus_g_proxy_call_with_timeout (s->proxy, "Queue", - 100000000, /* 100 seconds worth of timeout */ - &error, - G_TYPE_STRING, uri, - G_TYPE_STRING, sinfo.mime_type, - G_TYPE_STRING, flavor_name, - /* TODO: Get this bool from scheduler type */ - G_TYPE_BOOLEAN, FALSE, - G_TYPE_INVALID, - G_TYPE_UINT, &sinfo.handle, - G_TYPE_INVALID); + handler_id = g_signal_connect (s->proxy, "g-signal", + G_CALLBACK(thumbnailer_proxy_g_signal_cb), &info); + + result = g_dbus_proxy_call_sync (s->proxy, + "Queue", + g_variant_new("(sssb)", + uri, + sinfo.mime_type, + flavor_name, + /* TODO: Get this bool from scheduler type */ + FALSE), + G_DBUS_CALL_FLAGS_NONE, + 100000000, /* 100 seconds worth of timeout */ + NULL, + &error); if (error == NULL) { - /* 100 seconds worth of timeout */ + /*Get the return handle */ + g_variant_get (result, "(u)", &sinfo.handle); + g_variant_unref (result); + + /* 100 seconds worth of timeout */ #if GLIB_CHECK_VERSION (2, 32, 0) end_time = g_get_monotonic_time () + 100 * G_TIME_SPAN_SECOND; #else @@ -497,18 +474,8 @@ g_free (message); g_clear_error (&error); } - - dbus_g_proxy_disconnect_signal (s->proxy, "Finished", - G_CALLBACK (specialized_finished), - &sinfo); - - dbus_g_proxy_disconnect_signal (s->proxy, "Ready", - G_CALLBACK (specialized_ready), - &sinfo); - - dbus_g_proxy_disconnect_signal (s->proxy, "Error", - G_CALLBACK (specialized_error), - &sinfo); + + g_signal_handler_disconnect (s->proxy, handler_id); #if GLIB_CHECK_VERSION (2, 32, 0) g_cond_clear (&sinfo.condition); @@ -518,19 +485,26 @@ } static void -tumbler_specialized_thumbnailer_proxy_destroyed (DBusGProxy *proxy, - TumblerSpecializedThumbnailer *thumbnailer) +tumbler_specialized_thumbnailer_proxy_name_owner_changed (GDBusProxy *proxy, + GParamSpec *spec, + TumblerSpecializedThumbnailer *thumbnailer) { - g_return_if_fail (DBUS_IS_G_PROXY (proxy)); + gchar *name_owner; + g_return_if_fail (G_IS_DBUS_PROXY (proxy)); g_return_if_fail (TUMBLER_IS_SPECIALIZED_THUMBNAILER (thumbnailer)); - - g_signal_emit_by_name (thumbnailer, "unregister"); + + name_owner = g_dbus_proxy_get_name_owner (proxy); + if (name_owner == NULL) + { + g_signal_emit_by_name (thumbnailer, "unregister"); + } + g_free(name_owner); } TumblerThumbnailer * -tumbler_specialized_thumbnailer_new (DBusGConnection *connection, +tumbler_specialized_thumbnailer_new (GDBusConnection *connection, const gchar *name, const gchar *object_path, const gchar *const *uri_schemes, @@ -557,7 +531,7 @@ TumblerThumbnailer * -tumbler_specialized_thumbnailer_new_foreign (DBusGConnection *connection, +tumbler_specialized_thumbnailer_new_foreign (GDBusConnection *connection, const gchar *name, const gchar *const *uri_schemes, const gchar *const *mime_types) diff -Nru tumbler-0.1.31/tumblerd/tumbler-specialized-thumbnailer.h tumbler-0.1.90/tumblerd/tumbler-specialized-thumbnailer.h --- tumbler-0.1.31/tumblerd/tumbler-specialized-thumbnailer.h 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-specialized-thumbnailer.h 2017-05-11 09:06:12.000000000 +0000 @@ -21,8 +21,6 @@ #ifndef __TUMBLER_SPECIALIZED_THUMBNAILER_H__ #define __TUMBLER_SPECIALIZED_THUMBNAILER_H__ -#include - #include G_BEGIN_DECLS @@ -39,13 +37,13 @@ GType tumbler_specialized_thumbnailer_get_type (void) G_GNUC_CONST; -TumblerThumbnailer *tumbler_specialized_thumbnailer_new (DBusGConnection *connection, +TumblerThumbnailer *tumbler_specialized_thumbnailer_new (GDBusConnection *connection, const gchar *name, const gchar *object_path, const gchar *const *uri_schemes, const gchar *const *mime_types, guint64 modified) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; -TumblerThumbnailer *tumbler_specialized_thumbnailer_new_foreign (DBusGConnection *connection, +TumblerThumbnailer *tumbler_specialized_thumbnailer_new_foreign (GDBusConnection *connection, const gchar *name, const gchar *const *uri_scheme, const gchar *const *mime_type) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; diff -Nru tumbler-0.1.31/tumblerd/tumbler-utils.h tumbler-0.1.90/tumblerd/tumbler-utils.h --- tumbler-0.1.31/tumblerd/tumbler-utils.h 2015-02-28 15:23:08.000000000 +0000 +++ tumbler-0.1.90/tumblerd/tumbler-utils.h 2017-05-11 09:06:12.000000000 +0000 @@ -21,26 +21,40 @@ #ifndef __TUMBLER_UTILS_H__ #define __TUMBLER_UTILS_H__ -#include -#include +#include G_BEGIN_DECLS -#define dbus_async_return_if_fail(expr, context) \ +#define g_dbus_async_return_if_fail(expr, invocation) \ G_STMT_START{ \ if (G_UNLIKELY (!(expr))) \ { \ GError *dbus_async_return_if_fail_error = NULL; \ \ - g_set_error (&dbus_async_return_if_fail_error, DBUS_GERROR, DBUS_GERROR_FAILED, \ + g_set_error (&dbus_async_return_if_fail_error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, \ "Assertion \"%s\" failed", #expr); \ - dbus_g_method_return_error (context, dbus_async_return_if_fail_error); \ + g_dbus_method_invocation_return_gerror (invocation, dbus_async_return_if_fail_error);\ g_clear_error (&dbus_async_return_if_fail_error); \ \ return; \ } \ }G_STMT_END +#define g_dbus_async_return_val_if_fail(expr, invocation,val) \ + G_STMT_START{ \ + if (G_UNLIKELY (!(expr))) \ + { \ + GError *dbus_async_return_if_fail_error = NULL; \ + \ + g_set_error (&dbus_async_return_if_fail_error, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, \ + "Assertion \"%s\" failed", #expr); \ + g_dbus_method_invocation_return_gerror (invocation, dbus_async_return_if_fail_error);\ + g_clear_error (&dbus_async_return_if_fail_error); \ + \ + return (val); \ + } \ + }G_STMT_END + #if GLIB_CHECK_VERSION (2, 32, 0) #define TUMBLER_MUTEX(mtx) GMutex mtx #define tumbler_mutex_free(mtx) g_mutex_clear (&(mtx))