summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-10 08:11:32 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-10 08:11:44 +0000
commit1eb1b2179d53a792d14e69dc1b195823eeeb6af0 (patch)
tree8a82dd36fb8995efbf047eeda742ac626cbe816d
parentReleasing progress-linux version 1.30.3-1dschinn1. (diff)
downloadgvfs-1eb1b2179d53a792d14e69dc1b195823eeeb6af0.zip
gvfs-1eb1b2179d53a792d14e69dc1b195823eeeb6af0.tar.xz
Merging upstream version 1.30.4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--Makefile.in2
-rw-r--r--NEWS11
-rw-r--r--client/Makefile.in2
-rw-r--r--client/gvfsfusedaemon.c2
-rw-r--r--common/Makefile.in2
-rw-r--r--common/gvfsdbus.c82
-rw-r--r--common/gvfsdbus.h2
-rw-r--r--common/gvfsgphoto2utils.c12
-rw-r--r--common/gvfsgphoto2utils.h1
-rw-r--r--common/gvfsmountinfo.c3
-rwxr-xr-xconfig.guess165
-rw-r--r--config.h.in3
-rwxr-xr-xconfig.sub52
-rwxr-xr-xconfigure192
-rw-r--r--configure.ac7
-rw-r--r--daemon/Makefile.in2
-rw-r--r--daemon/gvfsbackendadmin.c4
-rw-r--r--daemon/gvfsbackendgoogle.c23
-rw-r--r--daemon/gvfsbackendgphoto2.c9
-rw-r--r--daemon/gvfsbackendsftp.c28
-rw-r--r--daemon/gvfsreadchannel.c8
-rw-r--r--daemon/trashlib/Makefile.in2
-rw-r--r--m4/libgcrypt.m451
-rw-r--r--m4/pkg.m474
-rw-r--r--man/Makefile.in2
-rw-r--r--metadata/Makefile.in2
-rw-r--r--metadata/metadata-dbus.c10
-rw-r--r--metadata/metadata-dbus.h2
-rw-r--r--monitor/Makefile.in2
-rw-r--r--monitor/afc/Makefile.in2
-rw-r--r--monitor/gdu/Makefile.in2
-rw-r--r--monitor/goa/Makefile.in2
-rw-r--r--monitor/gphoto2/Makefile.in2
-rw-r--r--monitor/hal/Makefile.in2
-rw-r--r--monitor/mtp/Makefile.in2
-rw-r--r--monitor/proxy/Makefile.in2
-rw-r--r--monitor/proxy/gvfsvolumemonitordbus.c10
-rw-r--r--monitor/proxy/gvfsvolumemonitordbus.h2
-rw-r--r--monitor/udisks2/Makefile.in2
-rw-r--r--po/gvfs.pot306
-rw-r--r--programs/Makefile.in2
-rw-r--r--programs/completion/Makefile.in2
-rw-r--r--test/Makefile.in2
43 files changed, 689 insertions, 408 deletions
diff --git a/Makefile.in b/Makefile.in
index 311c66e..ae8d801 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -310,6 +310,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@
diff --git a/NEWS b/NEWS
index cc3e959..604a31f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Major changes in 1.30.4
+=======================
+* common: Fix potential crash caused by missing g_strdup
+* fuse: Prevent potential crash if file handle is not set
+* sftp: Prevent potential crash in case of parsing error
+* google: Prevent potential crashes if resolve_dir fails
+* gphoto2: Fix x-content-types setup
+* google: Fix reported file size
+* sftp: Limit writes to 32768 bytes
+* daemon: Bump maximum read channel buffer size
+
Major changes in 1.30.3
=======================
* recent: Fix crashes when DISPLAY is not set
diff --git a/client/Makefile.in b/client/Makefile.in
index 1e41a19..5ac6ffd 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -348,6 +348,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@
diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
index 9543295..ab0d20b 100644
--- a/client/gvfsfusedaemon.c
+++ b/client/gvfsfusedaemon.c
@@ -2018,7 +2018,7 @@ vfs_truncate (const gchar *path, off_t size)
if (fh)
g_mutex_lock (&fh->mutex);
- if (fh->stream && fh->op == FILE_OP_WRITE)
+ if (fh && fh->stream && fh->op == FILE_OP_WRITE)
{
result = truncate_stream (file, fh, size);
}
diff --git a/common/Makefile.in b/common/Makefile.in
index 00a6f94..f977dca 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -372,6 +372,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@
diff --git a/common/gvfsdbus.c b/common/gvfsdbus.c
index 10977dc..2ef6493 100644
--- a/common/gvfsdbus.c
+++ b/common/gvfsdbus.c
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.51.0. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.51.2. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
@@ -1074,8 +1074,8 @@ gvfs_dbus_daemon_proxy_g_signal (GDBusProxy *proxy,
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
- guint n;
+ gsize num_params;
+ gsize n;
guint signal_id;
info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_gvfs_dbus_daemon_interface_info.parent_struct, signal_name);
if (info == NULL)
@@ -1391,9 +1391,9 @@ _gvfs_dbus_daemon_skeleton_handle_method_call (
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
+ gsize num_params;
guint num_extra;
- guint n;
+ gsize n;
guint signal_id;
GValue return_value = G_VALUE_INIT;
info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
@@ -1999,8 +1999,8 @@ gvfs_dbus_spawner_proxy_g_signal (GDBusProxy *proxy,
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
- guint n;
+ gsize num_params;
+ gsize n;
guint signal_id;
info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_gvfs_dbus_spawner_interface_info.parent_struct, signal_name);
if (info == NULL)
@@ -2316,9 +2316,9 @@ _gvfs_dbus_spawner_skeleton_handle_method_call (
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
+ gsize num_params;
guint num_extra;
- guint n;
+ gsize n;
guint signal_id;
GValue return_value = G_VALUE_INIT;
info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
@@ -4612,8 +4612,8 @@ gvfs_dbus_mount_tracker_proxy_g_signal (GDBusProxy *proxy,
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
- guint n;
+ gsize num_params;
+ gsize n;
guint signal_id;
info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_gvfs_dbus_mount_tracker_interface_info.parent_struct, signal_name);
if (info == NULL)
@@ -4929,9 +4929,9 @@ _gvfs_dbus_mount_tracker_skeleton_handle_method_call (
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
+ gsize num_params;
guint num_extra;
- guint n;
+ gsize n;
guint signal_id;
GValue return_value = G_VALUE_INIT;
info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
@@ -5587,8 +5587,8 @@ gvfs_dbus_mountable_proxy_g_signal (GDBusProxy *proxy,
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
- guint n;
+ gsize num_params;
+ gsize n;
guint signal_id;
info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_gvfs_dbus_mountable_interface_info.parent_struct, signal_name);
if (info == NULL)
@@ -5904,9 +5904,9 @@ _gvfs_dbus_mountable_skeleton_handle_method_call (
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
+ gsize num_params;
guint num_extra;
- guint n;
+ gsize n;
guint signal_id;
GValue return_value = G_VALUE_INIT;
info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
@@ -7574,8 +7574,8 @@ gvfs_dbus_mount_operation_proxy_g_signal (GDBusProxy *proxy,
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
- guint n;
+ gsize num_params;
+ gsize n;
guint signal_id;
info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_gvfs_dbus_mount_operation_interface_info.parent_struct, signal_name);
if (info == NULL)
@@ -7891,9 +7891,9 @@ _gvfs_dbus_mount_operation_skeleton_handle_method_call (
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
+ gsize num_params;
guint num_extra;
- guint n;
+ gsize n;
guint signal_id;
GValue return_value = G_VALUE_INIT;
info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
@@ -14703,8 +14703,8 @@ gvfs_dbus_mount_proxy_g_signal (GDBusProxy *proxy,
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
- guint n;
+ gsize num_params;
+ gsize n;
guint signal_id;
info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_gvfs_dbus_mount_interface_info.parent_struct, signal_name);
if (info == NULL)
@@ -15020,9 +15020,9 @@ _gvfs_dbus_mount_skeleton_handle_method_call (
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
+ gsize num_params;
guint num_extra;
- guint n;
+ gsize n;
guint signal_id;
GValue return_value = G_VALUE_INIT;
info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
@@ -15737,8 +15737,8 @@ gvfs_dbus_enumerator_proxy_g_signal (GDBusProxy *proxy,
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
- guint n;
+ gsize num_params;
+ gsize n;
guint signal_id;
info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_gvfs_dbus_enumerator_interface_info.parent_struct, signal_name);
if (info == NULL)
@@ -16054,9 +16054,9 @@ _gvfs_dbus_enumerator_skeleton_handle_method_call (
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
+ gsize num_params;
guint num_extra;
- guint n;
+ gsize n;
guint signal_id;
GValue return_value = G_VALUE_INIT;
info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
@@ -16643,8 +16643,8 @@ gvfs_dbus_progress_proxy_g_signal (GDBusProxy *proxy,
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
- guint n;
+ gsize num_params;
+ gsize n;
guint signal_id;
info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_gvfs_dbus_progress_interface_info.parent_struct, signal_name);
if (info == NULL)
@@ -16960,9 +16960,9 @@ _gvfs_dbus_progress_skeleton_handle_method_call (
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
+ gsize num_params;
guint num_extra;
- guint n;
+ gsize n;
guint signal_id;
GValue return_value = G_VALUE_INIT;
info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
@@ -17701,8 +17701,8 @@ gvfs_dbus_monitor_proxy_g_signal (GDBusProxy *proxy,
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
- guint n;
+ gsize num_params;
+ gsize n;
guint signal_id;
info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_gvfs_dbus_monitor_interface_info.parent_struct, signal_name);
if (info == NULL)
@@ -18018,9 +18018,9 @@ _gvfs_dbus_monitor_skeleton_handle_method_call (
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
+ gsize num_params;
guint num_extra;
- guint n;
+ gsize n;
guint signal_id;
GValue return_value = G_VALUE_INIT;
info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
@@ -18664,8 +18664,8 @@ gvfs_dbus_monitor_client_proxy_g_signal (GDBusProxy *proxy,
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
- guint n;
+ gsize num_params;
+ gsize n;
guint signal_id;
info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_gvfs_dbus_monitor_client_interface_info.parent_struct, signal_name);
if (info == NULL)
@@ -18981,9 +18981,9 @@ _gvfs_dbus_monitor_client_skeleton_handle_method_call (
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
+ gsize num_params;
guint num_extra;
- guint n;
+ gsize n;
guint signal_id;
GValue return_value = G_VALUE_INIT;
info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
diff --git a/common/gvfsdbus.h b/common/gvfsdbus.h
index 2771a28..0d3c06c 100644
--- a/common/gvfsdbus.h
+++ b/common/gvfsdbus.h
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.51.0. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.51.2. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff --git a/common/gvfsgphoto2utils.c b/common/gvfsgphoto2utils.c
index 8608e51..3b882e7 100644
--- a/common/gvfsgphoto2utils.c
+++ b/common/gvfsgphoto2utils.c
@@ -140,3 +140,15 @@ g_vfs_get_volume_symbolic_icon (GUdevDevice *device)
else
return g_strdup ("camera-photo-symbolic");
}
+
+char **
+g_vfs_get_x_content_types (GUdevDevice *device)
+{
+ char *camera_x_content_types[] = {"x-content/image-dcf", NULL};
+ char *media_player_x_content_types[] = {"x-content/audio-player", NULL};
+
+ if (g_udev_device_has_property (device, "ID_MEDIA_PLAYER"))
+ return g_strdupv (media_player_x_content_types);
+ else
+ return g_strdupv (camera_x_content_types);
+}
diff --git a/common/gvfsgphoto2utils.h b/common/gvfsgphoto2utils.h
index d8f9d40..ab0ff1c 100644
--- a/common/gvfsgphoto2utils.h
+++ b/common/gvfsgphoto2utils.h
@@ -26,5 +26,6 @@
char * g_vfs_get_volume_name (GUdevDevice *device, const char *device_id);
char * g_vfs_get_volume_icon (GUdevDevice *device);
char * g_vfs_get_volume_symbolic_icon (GUdevDevice *device);
+char **g_vfs_get_x_content_types (GUdevDevice *device);
#endif
diff --git a/common/gvfsmountinfo.c b/common/gvfsmountinfo.c
index ca4d868..0d1f326 100644
--- a/common/gvfsmountinfo.c
+++ b/common/gvfsmountinfo.c
@@ -544,7 +544,7 @@ bdmv_metadata_thread (GSimpleAsyncResult *result,
meta = bd_get_meta (bd);
if (meta != NULL && name == NULL && meta->di_name && *meta->di_name)
- name = meta->di_name;
+ name = g_strdup (meta->di_name);
if (meta != NULL && icon == NULL)
icon = g_strdup (get_icon (meta));
@@ -564,6 +564,7 @@ bdmv_metadata_thread (GSimpleAsyncResult *result,
g_simple_async_result_set_op_res_gpointer (result,
g_file_icon_new (icon_file),
NULL);
+ g_object_unref (icon_file);
}
else
{
diff --git a/config.guess b/config.guess
index dbfb978..2e9ad7f 100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2015 Free Software Foundation, Inc.
+# Copyright 1992-2016 Free Software Foundation, Inc.
-timestamp='2015-01-01'
+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
@@ -27,7 +27,7 @@ timestamp='2015-01-01'
# 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 to <config-patches@gnu.org>.
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2015 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 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# 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 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
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 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
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 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
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 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*: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 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
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 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
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 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
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}
@@ -618,13 +642,13 @@ EOF
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
@@ -663,11 +687,11 @@ EOF
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
@@ -680,12 +704,12 @@ EOF
# $ 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}
@@ -790,14 +814,14 @@ EOF
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:*:*)
@@ -879,7 +903,7 @@ EOF
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
@@ -902,7 +926,7 @@ EOF
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:*:*)
@@ -933,6 +957,9 @@ EOF
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 ;;
@@ -945,6 +972,9 @@ EOF
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 ;;
@@ -970,6 +1000,9 @@ EOF
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 ;;
@@ -1002,6 +1035,9 @@ EOF
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 ;;
@@ -1021,7 +1057,7 @@ EOF
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1100,7 +1136,7 @@ EOF
# 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 ;;
@@ -1249,6 +1285,9 @@ EOF
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 ;;
@@ -1262,9 +1301,9 @@ EOF
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
@@ -1286,7 +1325,7 @@ EOF
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
@@ -1317,7 +1356,7 @@ EOF
# "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"
@@ -1359,7 +1398,7 @@ EOF
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
@@ -1370,23 +1409,25 @@ EOF
x86_64:VMkernel:*:*)
echo ${UNAME_MACHINE}-unknown-esx
exit ;;
+ amd64:Isilon\ OneFS:*:*)
+ echo x86_64-unknown-onefs
+ exit ;;
esac
cat >&2 <<EOF
$0: unable to guess system type
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite
+config.guess and config.sub with the latest versions 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
and
- 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
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> 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 --git a/config.h.in b/config.h.in
index c3478ef..67766c4 100644
--- a/config.h.in
+++ b/config.h.in
@@ -97,6 +97,9 @@
/* Define to 1 if GNOME Keyring is available */
#undef HAVE_KEYRING
+/* Define to 1 if libgdata 0.17.7 is available */
+#undef HAVE_LIBGDATA_0_17_7
+
/* Define to 1 if libmtp is available */
#undef HAVE_LIBMTP
diff --git a/config.sub b/config.sub
index 6467c95..7b334f9 100755
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2015 Free Software Foundation, Inc.
+# Copyright 1992-2016 Free Software Foundation, Inc.
-timestamp='2015-01-01'
+timestamp='2016-09-05'
# 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
@@ -33,7 +33,7 @@ timestamp='2015-01-01'
# 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 @@ timestamp='2015-01-01'
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 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2015 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 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
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,11 +254,12 @@ case $basic_machine in
| 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 \
- | epiphany \
+ | e2k | epiphany \
| fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
@@ -305,7 +305,7 @@ case $basic_machine in
| 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 \
@@ -376,12 +376,13 @@ case $basic_machine in
| 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-* \
@@ -428,12 +429,13 @@ case $basic_machine in
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| 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*-* \
@@ -518,6 +520,9 @@ case $basic_machine in
basic_machine=i386-pc
os=-aros
;;
+ asmjs)
+ basic_machine=asmjs-unknown
+ ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -638,6 +643,14 @@ case $basic_machine in
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
@@ -1017,7 +1030,7 @@ case $basic_machine in
ppc-* | ppcbe-*)
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
+ ppcle | powerpclittle)
basic_machine=powerpcle-unknown
;;
ppcle-* | powerpclittle-*)
@@ -1027,7 +1040,7 @@ case $basic_machine in
;;
ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown
;;
ppc64le-* | powerpc64little-*)
@@ -1373,18 +1386,18 @@ case $os in
| -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* \
@@ -1393,7 +1406,8 @@ case $os in
| -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*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1525,6 +1539,8 @@ case $os in
;;
-nacl*)
;;
+ -ios)
+ ;;
-none)
;;
*)
diff --git a/configure b/configure
index 9d9b27e..8b5151b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gvfs 1.30.3.
+# Generated by GNU Autoconf 2.69 for gvfs 1.30.4.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs>.
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='gvfs'
PACKAGE_TARNAME='gvfs'
-PACKAGE_VERSION='1.30.3'
-PACKAGE_STRING='gvfs 1.30.3'
+PACKAGE_VERSION='1.30.4'
+PACKAGE_STRING='gvfs 1.30.4'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs'
PACKAGE_URL=''
@@ -700,6 +700,8 @@ GPHOTO2_LIBS
GPHOTO2_CFLAGS
USE_GOOGLE_FALSE
USE_GOOGLE_TRUE
+LIBGDATA_0_17_7_LIBS
+LIBGDATA_0_17_7_CFLAGS
GOOGLE_LIBS
GOOGLE_CFLAGS
USE_GOA_FALSE
@@ -1046,6 +1048,8 @@ GOA_CFLAGS
GOA_LIBS
GOOGLE_CFLAGS
GOOGLE_LIBS
+LIBGDATA_0_17_7_CFLAGS
+LIBGDATA_0_17_7_LIBS
GPHOTO2_CFLAGS
GPHOTO2_LIBS
GPHOTO25_CFLAGS
@@ -1610,7 +1614,7 @@ if test "$ac_init_help" = "long"; then
# 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 gvfs 1.30.3 to adapt to many kinds of systems.
+\`configure' configures gvfs 1.30.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1680,7 +1684,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gvfs 1.30.3:";;
+ short | recursive ) echo "Configuration of gvfs 1.30.4:";;
esac
cat <<\_ACEOF
@@ -1846,6 +1850,10 @@ Some influential environment variables:
GOOGLE_CFLAGS
C compiler flags for GOOGLE, overriding pkg-config
GOOGLE_LIBS linker flags for GOOGLE, overriding pkg-config
+ LIBGDATA_0_17_7_CFLAGS
+ C compiler flags for LIBGDATA_0_17_7, overriding pkg-config
+ LIBGDATA_0_17_7_LIBS
+ linker flags for LIBGDATA_0_17_7, overriding pkg-config
GPHOTO2_CFLAGS
C compiler flags for GPHOTO2, overriding pkg-config
GPHOTO2_LIBS
@@ -1955,7 +1963,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gvfs configure 1.30.3
+gvfs configure 1.30.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2481,7 +2489,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gvfs $as_me 1.30.3, which was
+It was created by gvfs $as_me 1.30.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3345,7 +3353,7 @@ fi
# Define the identity of the package.
PACKAGE='gvfs'
- VERSION='1.30.3'
+ VERSION='1.30.4'
cat >>confdefs.h <<_ACEOF
@@ -19434,6 +19442,82 @@ fi
$as_echo "#define HAVE_GOOGLE 1" >>confdefs.h
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGDATA_0_17_7" >&5
+$as_echo_n "checking for LIBGDATA_0_17_7... " >&6; }
+
+if test -n "$LIBGDATA_0_17_7_CFLAGS"; then
+ pkg_cv_LIBGDATA_0_17_7_CFLAGS="$LIBGDATA_0_17_7_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.17.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libgdata >= 0.17.7") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBGDATA_0_17_7_CFLAGS=`$PKG_CONFIG --cflags "libgdata >= 0.17.7" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$LIBGDATA_0_17_7_LIBS"; then
+ pkg_cv_LIBGDATA_0_17_7_LIBS="$LIBGDATA_0_17_7_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.17.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libgdata >= 0.17.7") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBGDATA_0_17_7_LIBS=`$PKG_CONFIG --libs "libgdata >= 0.17.7" 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
+ LIBGDATA_0_17_7_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgdata >= 0.17.7" 2>&1`
+ else
+ LIBGDATA_0_17_7_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgdata >= 0.17.7" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBGDATA_0_17_7_PKG_ERRORS" >&5
+
+
+
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+else
+ LIBGDATA_0_17_7_CFLAGS=$pkg_cv_LIBGDATA_0_17_7_CFLAGS
+ LIBGDATA_0_17_7_LIBS=$pkg_cv_LIBGDATA_0_17_7_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_LIBGDATA_0_17_7 1" >>confdefs.h
+
+fi
fi
fi
@@ -20909,15 +20993,28 @@ else
libgcrypt_config_prefix=""
fi
- if test x$libgcrypt_config_prefix != x ; then
- if test x${LIBGCRYPT_CONFIG+set} != xset ; then
- LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
+ if test x"${LIBGCRYPT_CONFIG}" = x ; then
+ if test x"${libgcrypt_config_prefix}" != x ; then
+ LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
+ else
+ case "${SYSROOT}" in
+ /*)
+ if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
+ LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
+ fi
+ ;;
+ '')
+ ;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&5
+$as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&2;}
+ ;;
+ esac
fi
fi
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}libgcrypt-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}libgcrypt-config; ac_word=$2
+ # Extract the first word of "libgcrypt-config", so it can be a program name with args.
+set dummy libgcrypt-config; 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_LIBGCRYPT_CONFIG+:} false; then :
@@ -20943,6 +21040,7 @@ done
done
IFS=$as_save_IFS
+ test -z "$ac_cv_path_LIBGCRYPT_CONFIG" && ac_cv_path_LIBGCRYPT_CONFIG="no"
;;
esac
fi
@@ -20956,63 +21054,6 @@ $as_echo "no" >&6; }
fi
-fi
-if test -z "$ac_cv_path_LIBGCRYPT_CONFIG"; then
- ac_pt_LIBGCRYPT_CONFIG=$LIBGCRYPT_CONFIG
- # Extract the first word of "libgcrypt-config", so it can be a program name with args.
-set dummy libgcrypt-config; 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_ac_pt_LIBGCRYPT_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $ac_pt_LIBGCRYPT_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_LIBGCRYPT_CONFIG="$ac_pt_LIBGCRYPT_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- 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_ac_pt_LIBGCRYPT_CONFIG="$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
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_LIBGCRYPT_CONFIG=$ac_cv_path_ac_pt_LIBGCRYPT_CONFIG
-if test -n "$ac_pt_LIBGCRYPT_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LIBGCRYPT_CONFIG" >&5
-$as_echo "$ac_pt_LIBGCRYPT_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_pt_LIBGCRYPT_CONFIG" = x; then
- LIBGCRYPT_CONFIG="no"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- LIBGCRYPT_CONFIG=$ac_pt_LIBGCRYPT_CONFIG
- fi
-else
- LIBGCRYPT_CONFIG="$ac_cv_path_LIBGCRYPT_CONFIG"
-fi
-
tmp=$GCRYPT_LIBVER:$GCRYPT_VERSION
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
@@ -21094,7 +21135,7 @@ $as_echo "does not match. want=$req_libgcrypt_api got=$tmp" >&6; }
*** built for $libgcrypt_config_host and thus may not match the
*** used host $host.
*** You may want to use the configure option --with-libgcrypt-prefix
-*** to specify a matching config script.
+*** to specify a matching config script or use \$SYSROOT.
***" >&5
$as_echo "$as_me: WARNING:
***
@@ -21102,8 +21143,9 @@ $as_echo "$as_me: WARNING:
*** built for $libgcrypt_config_host and thus may not match the
*** used host $host.
*** You may want to use the configure option --with-libgcrypt-prefix
-*** to specify a matching config script.
+*** to specify a matching config script or use \$SYSROOT.
***" >&2;}
+ gpg_config_script_warn="$gpg_config_script_warn libgcrypt"
fi
fi
else
@@ -22340,7 +22382,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gvfs $as_me 1.30.3, which was
+This file was extended by gvfs $as_me 1.30.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22406,7 +22448,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gvfs config.status 1.30.3
+gvfs config.status 1.30.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index a4300ea..bbf4059 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.64])
-AC_INIT([gvfs],[1.30.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs])
+AC_INIT([gvfs],[1.30.4],[http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs])
AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz tar-ustar -Wno-portability])
AC_CONFIG_HEADERS(config.h)
@@ -429,6 +429,11 @@ if test "x$enable_google" != "xno" ; then
if test "x$msg_google" = "xyes"; then
PKG_CHECK_MODULES([GOOGLE], [goa-1.0 libgdata])
AC_DEFINE([HAVE_GOOGLE], 1, [Define to 1 if Google is going to be built])
+
+ PKG_CHECK_MODULES(LIBGDATA_0_17_7, libgdata >= 0.17.7,
+ AC_DEFINE(HAVE_LIBGDATA_0_17_7, 1, [Define to 1 if libgdata 0.17.7 is available]),
+ []
+ )
fi
fi
diff --git a/daemon/Makefile.in b/daemon/Makefile.in
index f70f300..9c0e519 100644
--- a/daemon/Makefile.in
+++ b/daemon/Makefile.in
@@ -631,6 +631,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@
diff --git a/daemon/gvfsbackendadmin.c b/daemon/gvfsbackendadmin.c
index 4107d6f..66c9379 100644
--- a/daemon/gvfsbackendadmin.c
+++ b/daemon/gvfsbackendadmin.c
@@ -941,9 +941,9 @@ g_vfs_backend_admin_pre_setup (int *argc,
if (pkexec_uid == NULL)
g_error ("gvfsd-admin must be executed under pkexec");
+ errno = 0;
uid = strtol (pkexec_uid, NULL, 10);
- if ((errno == ERANGE && (uid == LONG_MAX || uid == LONG_MIN))
- || (errno != 0 && uid == 0))
+ if (errno != 0)
g_error ("Unable to convert PKEXEC_UID string to uid_t");
context = g_option_context_new (NULL);
diff --git a/daemon/gvfsbackendgoogle.c b/daemon/gvfsbackendgoogle.c
index 442e031..a6f1f86 100644
--- a/daemon/gvfsbackendgoogle.c
+++ b/daemon/gvfsbackendgoogle.c
@@ -748,7 +748,7 @@ resolve_dir_and_rebuild (GVfsBackendGoogle *self,
GDataEntry *parent;
GDataEntry *ret_val = NULL;
GError *local_error;
- gchar *basename;
+ gchar *basename = NULL;
local_error = NULL;
parent = resolve_dir (self, filename, &basename, &local_error);
@@ -947,10 +947,14 @@ build_file_info (GVfsBackendGoogle *self,
}
else
{
- goffset quota_used;
-
- quota_used = gdata_documents_entry_get_quota_used (GDATA_DOCUMENTS_ENTRY (entry));
- g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE, (guint64) quota_used);
+ goffset size;
+
+#if HAVE_LIBGDATA_0_17_7
+ size = gdata_documents_entry_get_file_size (GDATA_DOCUMENTS_ENTRY (entry));
+#else
+ size = gdata_documents_entry_get_quota_used (GDATA_DOCUMENTS_ENTRY (entry));
+#endif
+ g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE, (guint64) size);
}
}
@@ -1180,6 +1184,7 @@ g_vfs_backend_google_copy (GVfsBackend *_self,
if (!destination_not_directory)
{
g_free (destination_basename);
+ destination_basename = NULL;
error = NULL;
destination_parent = resolve_dir (self, destination, &destination_basename, &error);
@@ -1274,7 +1279,11 @@ g_vfs_backend_google_copy (GVfsBackend *_self,
insert_entry (self, GDATA_ENTRY (new_entry));
g_hash_table_foreach (self->monitors, emit_create_event, entry_path);
+#if HAVE_LIBGDATA_0_17_7
+ size = gdata_documents_entry_get_file_size (new_entry);
+#else
size = gdata_documents_entry_get_quota_used (new_entry);
+#endif
g_vfs_job_progress_callback (size, size, job);
g_vfs_job_succeeded (G_VFS_JOB (job));
@@ -1941,7 +1950,11 @@ g_vfs_backend_google_push (GVfsBackend *_self,
}
}
+#if HAVE_LIBGDATA_0_17_7
+ size = gdata_documents_entry_get_file_size (GDATA_DOCUMENTS_ENTRY (new_document));
+#else
size = gdata_documents_entry_get_quota_used (GDATA_DOCUMENTS_ENTRY (new_document));
+#endif
g_vfs_job_progress_callback (size, size, job);
g_vfs_job_succeeded (G_VFS_JOB (job));
diff --git a/daemon/gvfsbackendgphoto2.c b/daemon/gvfsbackendgphoto2.c
index 6c17663..b8dc49d 100644
--- a/daemon/gvfsbackendgphoto2.c
+++ b/daemon/gvfsbackendgphoto2.c
@@ -743,9 +743,6 @@ setup_for_device (GVfsBackendGphoto2 *gphoto2_backend)
{
gchar *devname;
char *comma;
- gboolean is_media_player = FALSE;
- char *camera_x_content_types[] = {"x-content/image-dcf", NULL};
- char *media_player_x_content_types[] = {"x-content/audio-player", NULL};
/* turn usb:001,041 string into an udev device name */
if (!g_str_has_prefix (gphoto2_backend->gphoto2_port, "usb:"))
@@ -772,10 +769,8 @@ setup_for_device (GVfsBackendGphoto2 *gphoto2_backend)
else
g_debug ("-> did not find matching udev device\n");
- if (is_media_player)
- g_vfs_backend_set_x_content_types (G_VFS_BACKEND (gphoto2_backend), media_player_x_content_types);
- else
- g_vfs_backend_set_x_content_types (G_VFS_BACKEND (gphoto2_backend), camera_x_content_types);
+ g_vfs_backend_set_x_content_types (G_VFS_BACKEND (gphoto2_backend),
+ g_vfs_get_x_content_types (gphoto2_backend->udev_device));
}
static void
diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c
index 1e3d1fc..86e5984 100644
--- a/daemon/gvfsbackendsftp.c
+++ b/daemon/gvfsbackendsftp.c
@@ -84,6 +84,14 @@
#define SFTP_READ_TIMEOUT 40 /* seconds */
+/*
+ * All servers SHOULD support packets of at least 34000 bytes (where the packet
+ * size refers to the full length, including the header above). This should
+ * allow for reads and writes of at most 32768 bytes. For more details, see
+ * draft-ietf-secsh-filexfer-02.txt.
+ */
+#define MAX_BUFFER_SIZE 32768
+
static GQuark id_q;
typedef enum {
@@ -870,7 +878,7 @@ get_hostname_and_ip_address (const gchar *buffer,
gchar **hostname_out,
gchar **ip_address_out)
{
- char *startpos, *endpos;
+ char *startpos, *endpos, *hostname;
/* Parse a line that looks like:
* Warning: the ECDSA/RSA host key for 'hostname' differs from the key for the IP address '...'
@@ -885,13 +893,13 @@ get_hostname_and_ip_address (const gchar *buffer,
if (!endpos)
return FALSE;
- *hostname_out = g_strndup (startpos, endpos - startpos);
+ hostname = g_strndup (startpos, endpos - startpos);
/* Then get the ip address. */
startpos = strchr (endpos + 1, '\'');
if (!startpos)
{
- g_free (hostname_out);
+ g_free (hostname);
return FALSE;
}
startpos++;
@@ -899,10 +907,11 @@ get_hostname_and_ip_address (const gchar *buffer,
endpos = strchr (startpos, '\'');
if (!endpos)
{
- g_free (hostname_out);
+ g_free (hostname);
return FALSE;
}
+ *hostname_out = hostname;
*ip_address_out = g_strndup (startpos, endpos - startpos);
return TRUE;
@@ -3928,7 +3937,7 @@ write_reply (GVfsBackendSftp *backend,
{
if (result_from_status (job, reply, -1, -1))
{
- handle->offset += G_VFS_JOB_WRITE (job)->data_size;
+ handle->offset += G_VFS_JOB_WRITE (job)->written_size;
}
}
else
@@ -3946,16 +3955,19 @@ try_write (GVfsBackend *backend,
SftpHandle *handle = _handle;
GVfsBackendSftp *op_backend = G_VFS_BACKEND_SFTP (backend);
GDataOutputStream *command;
+ gsize size;
+
+ size = MIN (buffer_size, MAX_BUFFER_SIZE);
command = new_command_stream (op_backend,
SSH_FXP_WRITE);
put_data_buffer (command, handle->raw_handle);
g_data_output_stream_put_uint64 (command, handle->offset, NULL, NULL);
- g_data_output_stream_put_uint32 (command, buffer_size, NULL, NULL);
+ g_data_output_stream_put_uint32 (command, size, NULL, NULL);
/* Ideally we shouldn't do this copy, but doing the writes as multiple writes
caused problems on the read side in openssh */
g_output_stream_write_all (G_OUTPUT_STREAM (command),
- buffer, buffer_size,
+ buffer, size,
NULL, NULL, NULL);
queue_command_stream_and_free (&op_backend->command_connection, command,
@@ -3963,7 +3975,7 @@ try_write (GVfsBackend *backend,
G_VFS_JOB (job), handle);
/* We always write the full size (on success) */
- g_vfs_job_write_set_written_size (job, buffer_size);
+ g_vfs_job_write_set_written_size (job, size);
return TRUE;
}
diff --git a/daemon/gvfsreadchannel.c b/daemon/gvfsreadchannel.c
index f219ded..b6b6a93 100644
--- a/daemon/gvfsreadchannel.c
+++ b/daemon/gvfsreadchannel.c
@@ -118,16 +118,18 @@ modify_read_size (GVfsReadChannel *channel,
real_size = 16*1024;
else if (channel->read_count <= 4)
real_size = 32*1024;
- else
+ else if (channel->read_count <= 5)
real_size = 64*1024;
+ else
+ real_size = 128*1024;
if (requested_size > real_size)
real_size = requested_size;
/* Don't do ridicoulously large requests as this
is just stupid on the network */
- if (real_size > 128 * 1024)
- real_size = 128 * 1024;
+ if (real_size > 256 * 1024)
+ real_size = 256 * 1024;
return real_size;
}
diff --git a/daemon/trashlib/Makefile.in b/daemon/trashlib/Makefile.in
index 629ad1d..ddff15b 100644
--- a/daemon/trashlib/Makefile.in
+++ b/daemon/trashlib/Makefile.in
@@ -282,6 +282,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index 6cf482f..c67cfec 100644
--- a/m4/libgcrypt.m4
+++ b/m4/libgcrypt.m4
@@ -1,13 +1,15 @@
-dnl Autoconf macros for libgcrypt
-dnl Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc.
-dnl
-dnl This file is free software; as a special exception the author gives
-dnl unlimited permission to copy and/or distribute it, with or without
-dnl modifications, as long as this notice is preserved.
-dnl
-dnl This file is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# libgcrypt.m4 - Autoconf macros to detect libgcrypt
+# Copyright (C) 2002, 2003, 2004, 2011, 2014 g10 Code GmbH
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Last-changed: 2014-10-02
dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
@@ -20,19 +22,37 @@ dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using
dnl this features allows to prevent build against newer versions of libgcrypt
dnl with a changed API.
dnl
+dnl If a prefix option is not used, the config script is first
+dnl searched in $SYSROOT/bin and then along $PATH. If the used
+dnl config script does not match the host specification the script
+dnl is added to the gpg_config_script_warn variable.
+dnl
AC_DEFUN([AM_PATH_LIBGCRYPT],
[ AC_REQUIRE([AC_CANONICAL_HOST])
AC_ARG_WITH(libgcrypt-prefix,
AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
[prefix where LIBGCRYPT is installed (optional)]),
libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
- if test x$libgcrypt_config_prefix != x ; then
- if test x${LIBGCRYPT_CONFIG+set} != xset ; then
- LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
+ if test x"${LIBGCRYPT_CONFIG}" = x ; then
+ if test x"${libgcrypt_config_prefix}" != x ; then
+ LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
+ else
+ case "${SYSROOT}" in
+ /*)
+ if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
+ LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
+ fi
+ ;;
+ '')
+ ;;
+ *)
+ AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
+ ;;
+ esac
fi
fi
- AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
+ AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
tmp=ifelse([$1], ,1:1.2.0,$1)
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
@@ -108,8 +128,9 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
*** built for $libgcrypt_config_host and thus may not match the
*** used host $host.
*** You may want to use the configure option --with-libgcrypt-prefix
-*** to specify a matching config script.
+*** to specify a matching config script or use \$SYSROOT.
***]])
+ gpg_config_script_warn="$gpg_config_script_warn libgcrypt"
fi
fi
else
diff --git a/m4/pkg.m4 b/m4/pkg.m4
index 82bea96..d8549a4 100644
--- a/m4/pkg.m4
+++ b/m4/pkg.m4
@@ -1,6 +1,6 @@
-dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29.1)
-dnl
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 11 (pkg-config-0.29.1)
+
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
dnl
@@ -273,3 +273,71 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])dnl PKG_CHECK_VAR
+
+dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
+dnl [DESCRIPTION], [DEFAULT])
+dnl ------------------------------------------
+dnl
+dnl Prepare a "--with-" configure option using the lowercase
+dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
+dnl PKG_CHECK_MODULES in a single macro.
+AC_DEFUN([PKG_WITH_MODULES],
+[
+m4_pushdef([with_arg], m4_tolower([$1]))
+
+m4_pushdef([description],
+ [m4_default([$5], [build with ]with_arg[ support])])
+
+m4_pushdef([def_arg], [m4_default([$6], [auto])])
+m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
+m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
+
+m4_case(def_arg,
+ [yes],[m4_pushdef([with_without], [--without-]with_arg)],
+ [m4_pushdef([with_without],[--with-]with_arg)])
+
+AC_ARG_WITH(with_arg,
+ AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
+ [AS_TR_SH([with_]with_arg)=def_arg])
+
+AS_CASE([$AS_TR_SH([with_]with_arg)],
+ [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
+ [auto],[PKG_CHECK_MODULES([$1],[$2],
+ [m4_n([def_action_if_found]) $3],
+ [m4_n([def_action_if_not_found]) $4])])
+
+m4_popdef([with_arg])
+m4_popdef([description])
+m4_popdef([def_arg])
+
+])dnl PKG_WITH_MODULES
+
+dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl [DESCRIPTION], [DEFAULT])
+dnl -----------------------------------------------
+dnl
+dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
+dnl check._[VARIABLE-PREFIX] is exported as make variable.
+AC_DEFUN([PKG_HAVE_WITH_MODULES],
+[
+PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
+
+AM_CONDITIONAL([HAVE_][$1],
+ [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
+])dnl PKG_HAVE_WITH_MODULES
+
+dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl [DESCRIPTION], [DEFAULT])
+dnl ------------------------------------------------------
+dnl
+dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
+dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
+dnl and preprocessor variable.
+AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
+[
+PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
+
+AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
+ [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
+])dnl PKG_HAVE_DEFINE_WITH_MODULES
diff --git a/man/Makefile.in b/man/Makefile.in
index d16ed70..66b97f2 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -256,6 +256,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@
diff --git a/metadata/Makefile.in b/metadata/Makefile.in
index 25572a2..7a7642e 100644
--- a/metadata/Makefile.in
+++ b/metadata/Makefile.in
@@ -344,6 +344,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@
diff --git a/metadata/metadata-dbus.c b/metadata/metadata-dbus.c
index 816d3d6..51edff8 100644
--- a/metadata/metadata-dbus.c
+++ b/metadata/metadata-dbus.c
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.51.0. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.51.2. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
@@ -1125,8 +1125,8 @@ gvfs_metadata_proxy_g_signal (GDBusProxy *proxy,
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
- guint n;
+ gsize num_params;
+ gsize n;
guint signal_id;
info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_gvfs_metadata_interface_info.parent_struct, signal_name);
if (info == NULL)
@@ -1442,9 +1442,9 @@ _gvfs_metadata_skeleton_handle_method_call (
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
+ gsize num_params;
guint num_extra;
- guint n;
+ gsize n;
guint signal_id;
GValue return_value = G_VALUE_INIT;
info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
diff --git a/metadata/metadata-dbus.h b/metadata/metadata-dbus.h
index e2fb3b4..86a9223 100644
--- a/metadata/metadata-dbus.h
+++ b/metadata/metadata-dbus.h
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.51.0. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.51.2. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff --git a/monitor/Makefile.in b/monitor/Makefile.in
index 60561f4..f09fd5d 100644
--- a/monitor/Makefile.in
+++ b/monitor/Makefile.in
@@ -290,6 +290,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@
diff --git a/monitor/afc/Makefile.in b/monitor/afc/Makefile.in
index 0b8c5cf..bd35888 100644
--- a/monitor/afc/Makefile.in
+++ b/monitor/afc/Makefile.in
@@ -321,6 +321,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@
diff --git a/monitor/gdu/Makefile.in b/monitor/gdu/Makefile.in
index f5e32aa..204c739 100644
--- a/monitor/gdu/Makefile.in
+++ b/monitor/gdu/Makefile.in
@@ -325,6 +325,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@
diff --git a/monitor/goa/Makefile.in b/monitor/goa/Makefile.in
index d83fb0e..de478f9 100644
--- a/monitor/goa/Makefile.in
+++ b/monitor/goa/Makefile.in
@@ -321,6 +321,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@
diff --git a/monitor/gphoto2/Makefile.in b/monitor/gphoto2/Makefile.in
index f2a0d43..6ad58e4 100644
--- a/monitor/gphoto2/Makefile.in
+++ b/monitor/gphoto2/Makefile.in
@@ -353,6 +353,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@
diff --git a/monitor/hal/Makefile.in b/monitor/hal/Makefile.in
index d3d6693..b267bc9 100644
--- a/monitor/hal/Makefile.in
+++ b/monitor/hal/Makefile.in
@@ -330,6 +330,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@
diff --git a/monitor/mtp/Makefile.in b/monitor/mtp/Makefile.in
index 5e3448f..8073765 100644
--- a/monitor/mtp/Makefile.in
+++ b/monitor/mtp/Makefile.in
@@ -322,6 +322,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@
diff --git a/monitor/proxy/Makefile.in b/monitor/proxy/Makefile.in
index 00ed778..0f23d21 100644
--- a/monitor/proxy/Makefile.in
+++ b/monitor/proxy/Makefile.in
@@ -332,6 +332,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@
diff --git a/monitor/proxy/gvfsvolumemonitordbus.c b/monitor/proxy/gvfsvolumemonitordbus.c
index dcb9738..b80a736 100644
--- a/monitor/proxy/gvfsvolumemonitordbus.c
+++ b/monitor/proxy/gvfsvolumemonitordbus.c
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.51.0. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.51.2. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
@@ -4229,8 +4229,8 @@ gvfs_remote_volume_monitor_proxy_g_signal (GDBusProxy *proxy,
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
- guint n;
+ gsize num_params;
+ gsize n;
guint signal_id;
info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_gvfs_remote_volume_monitor_interface_info.parent_struct, signal_name);
if (info == NULL)
@@ -4546,9 +4546,9 @@ _gvfs_remote_volume_monitor_skeleton_handle_method_call (
GVariantIter iter;
GVariant *child;
GValue *paramv;
- guint num_params;
+ gsize num_params;
guint num_extra;
- guint n;
+ gsize n;
guint signal_id;
GValue return_value = G_VALUE_INIT;
info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
diff --git a/monitor/proxy/gvfsvolumemonitordbus.h b/monitor/proxy/gvfsvolumemonitordbus.h
index 4f2de3a..fb348e7 100644
--- a/monitor/proxy/gvfsvolumemonitordbus.h
+++ b/monitor/proxy/gvfsvolumemonitordbus.h
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.51.0. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.51.2. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff --git a/monitor/udisks2/Makefile.in b/monitor/udisks2/Makefile.in
index 7b02dbf..bb8923f 100644
--- a/monitor/udisks2/Makefile.in
+++ b/monitor/udisks2/Makefile.in
@@ -326,6 +326,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@
diff --git a/po/gvfs.pot b/po/gvfs.pot
index 5f0995d..cfde04e 100644
--- a/po/gvfs.pot
+++ b/po/gvfs.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: gvfs 1.30.3\n"
+"Project-Id-Version: gvfs 1.30.4\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs\n"
-"POT-Creation-Date: 2016-12-16 08:57+0100\n"
+"POT-Creation-Date: 2017-03-28 16:10+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -79,7 +79,7 @@ msgstr ""
#: client/gdaemonfileoutputstream.c:546 client/gdaemonfileoutputstream.c:724
#: client/gdaemonfileoutputstream.c:919 client/gdaemonfileoutputstream.c:1085
#: client/gdaemonfileoutputstream.c:1267 client/gvfsdaemondbus.c:631
-#: daemon/gvfsbackendsftp.c:5236 daemon/gvfsbackendsmb.c:1272
+#: daemon/gvfsbackendsftp.c:5248 daemon/gvfsbackendsmb.c:1272
#: daemon/gvfsbackendtest.c:92 daemon/gvfsbackendtest.c:125
#: daemon/gvfsbackendtest.c:188 daemon/gvfschannel.c:346
#: daemon/gvfsftptask.c:224 monitor/gdu/ggdumount.c:1072
@@ -353,8 +353,8 @@ msgstr ""
#: daemon/gvfsafpvolume.c:1569 daemon/gvfsafpvolume.c:2015
#: daemon/gvfsafpvolume.c:2143 daemon/gvfsafpvolume.c:2305
#: daemon/gvfsafpvolume.c:2525 daemon/gvfsbackendadmin.c:140
-#: daemon/gvfsbackendgoogle.c:207 daemon/gvfsbackendsftp.c:337
-#: daemon/gvfsbackendsftp.c:1107 daemon/gvfsbackendsftp.c:2139
+#: daemon/gvfsbackendgoogle.c:207 daemon/gvfsbackendsftp.c:345
+#: daemon/gvfsbackendsftp.c:1116 daemon/gvfsbackendsftp.c:2148
#: daemon/gvfsftptask.c:439
msgid "Permission denied"
msgstr ""
@@ -381,9 +381,9 @@ msgstr ""
#: daemon/gvfsbackendafp.c:1341 daemon/gvfsbackenddav.c:2332
#: daemon/gvfsbackenddav.c:2995 daemon/gvfsbackenddav.c:3275
#: daemon/gvfsbackendftp.c:815 daemon/gvfsbackendnfs.c:2478
-#: daemon/gvfsbackendsftp.c:2654 daemon/gvfsbackendsftp.c:3429
-#: daemon/gvfsbackendsftp.c:3757 daemon/gvfsbackendsftp.c:4823
-#: daemon/gvfsbackendsftp.c:5765
+#: daemon/gvfsbackendsftp.c:2663 daemon/gvfsbackendsftp.c:3438
+#: daemon/gvfsbackendsftp.c:3766 daemon/gvfsbackendsftp.c:4835
+#: daemon/gvfsbackendsftp.c:5777
msgid "File is directory"
msgstr ""
@@ -397,7 +397,7 @@ msgstr ""
#: daemon/gvfsafpvolume.c:688 daemon/gvfsbackendafc.c:214
#: daemon/gvfsbackendburn.c:421 daemon/gvfsbackenddav.c:2722
-#: daemon/gvfsbackendsftp.c:2133
+#: daemon/gvfsbackendsftp.c:2142
msgid "Directory not empty"
msgstr ""
@@ -430,11 +430,11 @@ msgstr ""
#: daemon/gvfsbackenddav.c:3042 daemon/gvfsbackenddav.c:3266
#: daemon/gvfsbackendftp.c:794 daemon/gvfsbackendftp.c:982
#: daemon/gvfsbackendftp.c:1492 daemon/gvfsbackendftp.c:1600
-#: daemon/gvfsbackendgoogle.c:1233 daemon/gvfsbackendgoogle.c:1561
-#: daemon/gvfsbackendgoogle.c:1834 daemon/gvfsbackendgoogle.c:2487
+#: daemon/gvfsbackendgoogle.c:1238 daemon/gvfsbackendgoogle.c:1570
+#: daemon/gvfsbackendgoogle.c:1843 daemon/gvfsbackendgoogle.c:2500
#: daemon/gvfsbackendmtp.c:1605 daemon/gvfsbackendmtp.c:1737
#: daemon/gvfsbackendmtp.c:2063 daemon/gvfsbackendnfs.c:2488
-#: daemon/gvfsbackendsftp.c:4832 daemon/gvfsbackendsmb.c:2216
+#: daemon/gvfsbackendsftp.c:4844 daemon/gvfsbackendsmb.c:2216
msgid "Target file already exists"
msgstr ""
@@ -609,7 +609,7 @@ msgstr ""
#: daemon/gvfsbackendafc.c:465 daemon/gvfsbackendarchive.c:638
#: daemon/gvfsbackendarchive.c:667 daemon/gvfsbackenddav.c:1861
-#: daemon/gvfsbackendgoogle.c:1664 daemon/gvfsbackendhttp.c:256
+#: daemon/gvfsbackendgoogle.c:1673 daemon/gvfsbackendhttp.c:256
#: daemon/gvfsbackendsmb.c:738
msgid "Invalid mount spec"
msgstr ""
@@ -668,8 +668,8 @@ msgid ""
msgstr ""
#: daemon/gvfsbackendafc.c:1105 daemon/gvfsbackendarchive.c:745
-#: daemon/gvfsbackendcomputer.c:657 daemon/gvfsbackendgoogle.c:2187
-#: daemon/gvfsbackendgphoto2.c:1805 daemon/gvfsbackendmtp.c:2282
+#: daemon/gvfsbackendcomputer.c:657 daemon/gvfsbackendgoogle.c:2200
+#: daemon/gvfsbackendgphoto2.c:1800 daemon/gvfsbackendmtp.c:2282
#: daemon/gvfsbackendnfs.c:347 daemon/gvfsbackendrecent.c:122
#: daemon/gvfsbackendsmb.c:828 daemon/gvfsbackendtrash.c:234
msgid "Can't open directory"
@@ -690,17 +690,17 @@ msgstr ""
#.
#: daemon/gvfsbackendafc.c:2409 daemon/gvfsbackendafp.c:1781
#: daemon/gvfsbackendftp.c:1192 daemon/gvfsbackendftp.c:1240
-#: daemon/gvfsbackendftp.c:1261 daemon/gvfsbackendgoogle.c:1140
-#: daemon/gvfsbackendgoogle.c:1207 daemon/gvfsbackendgoogle.c:1228
-#: daemon/gvfsbackendgoogle.c:1310 daemon/gvfsbackendgoogle.c:1378
-#: daemon/gvfsbackendgoogle.c:1536 daemon/gvfsbackendgoogle.c:1764
-#: daemon/gvfsbackendgoogle.c:2403 daemon/gvfsbackendgoogle.c:2458
-#: daemon/gvfsbackendgoogle.c:2482 daemon/gvfsbackendgoogle.c:2568
+#: daemon/gvfsbackendftp.c:1261 daemon/gvfsbackendgoogle.c:1144
+#: daemon/gvfsbackendgoogle.c:1212 daemon/gvfsbackendgoogle.c:1233
+#: daemon/gvfsbackendgoogle.c:1319 daemon/gvfsbackendgoogle.c:1387
+#: daemon/gvfsbackendgoogle.c:1545 daemon/gvfsbackendgoogle.c:1773
+#: daemon/gvfsbackendgoogle.c:2416 daemon/gvfsbackendgoogle.c:2471
+#: daemon/gvfsbackendgoogle.c:2495 daemon/gvfsbackendgoogle.c:2581
#: daemon/gvfsbackendmtp.c:2022 daemon/gvfsbackendmtp.c:2249
#: daemon/gvfsbackendmtp.c:2444 daemon/gvfsbackendmtp.c:2515
#: daemon/gvfsbackendmtp.c:2603 daemon/gvfsbackendmtp.c:2671
-#: daemon/gvfsbackendnfs.c:2370 daemon/gvfsbackendsftp.c:2137
-#: daemon/gvfsbackendsftp.c:5200 daemon/gvfsbackendsmb.c:1860
+#: daemon/gvfsbackendnfs.c:2370 daemon/gvfsbackendsftp.c:2146
+#: daemon/gvfsbackendsftp.c:5212 daemon/gvfsbackendsmb.c:1860
#: daemon/gvfsftptask.c:431
msgid "Operation unsupported"
msgstr ""
@@ -731,7 +731,7 @@ msgstr ""
#. Translators: This is "<sharename> on <servername>" and is used as name for an SMB share
#: daemon/gvfsbackendafpbrowse.c:461 daemon/gvfsbackendafp.c:2104
#: daemon/gvfsbackendftp.c:672 daemon/gvfsbackendnfs.c:281
-#: daemon/gvfsbackendsftp.c:1994 daemon/gvfsbackendsmb.c:605
+#: daemon/gvfsbackendsftp.c:2003 daemon/gvfsbackendsmb.c:605
#: daemon/gvfsbackendsmb.c:1542
#, c-format
msgid "%s on %s"
@@ -745,7 +745,7 @@ msgstr ""
#: daemon/gvfsbackendafpbrowse.c:498 daemon/gvfsbackendafp.c:2139
#: daemon/gvfsbackendarchive.c:627 daemon/gvfsbackendftp.c:706
-#: daemon/gvfsbackendnfs.c:197 daemon/gvfsbackendsftp.c:2046
+#: daemon/gvfsbackendnfs.c:197 daemon/gvfsbackendsftp.c:2055
msgid "No hostname specified"
msgstr ""
@@ -755,21 +755,21 @@ msgstr ""
#: daemon/gvfsbackendafp.c:286 daemon/gvfsbackendburn.c:875
#: daemon/gvfsbackenddav.c:2990 daemon/gvfsbackendftp.c:1592
-#: daemon/gvfsbackendgoogle.c:1806
+#: daemon/gvfsbackendgoogle.c:1815
msgid "Can't copy directory over directory"
msgstr ""
#: daemon/gvfsbackendafp.c:305 daemon/gvfsbackendburn.c:891
#: daemon/gvfsbackenddav.c:3019 daemon/gvfsbackendftp.c:1615
-#: daemon/gvfsbackendgoogle.c:1244 daemon/gvfsbackendgoogle.c:1825
-#: daemon/gvfsbackendgoogle.c:1845 daemon/gvfsbackendmtp.c:1720
+#: daemon/gvfsbackendgoogle.c:1249 daemon/gvfsbackendgoogle.c:1834
+#: daemon/gvfsbackendgoogle.c:1854 daemon/gvfsbackendmtp.c:1720
#: daemon/gvfsbackendmtp.c:1743 daemon/gvfsbackendmtp.c:2045
#: daemon/gvfsbackendmtp.c:2069
msgid "Can't recursively copy directory"
msgstr ""
#: daemon/gvfsbackendafp.c:489 daemon/gvfsbackenddav.c:2867
-#: daemon/gvfsbackendnfs.c:2472 daemon/gvfsbackendsftp.c:4818
+#: daemon/gvfsbackendnfs.c:2472 daemon/gvfsbackendsftp.c:4830
#: daemon/gvfsbackendsmb.c:2205
msgid "Can't move directory over directory"
msgstr ""
@@ -784,13 +784,13 @@ msgid "Unable to create temporary file (%s)"
msgstr ""
#: daemon/gvfsbackendafp.c:1348 daemon/gvfsbackenddav.c:2468
-#: daemon/gvfsbackendnfs.c:1175 daemon/gvfsbackendsftp.c:3772
+#: daemon/gvfsbackendnfs.c:1175 daemon/gvfsbackendsftp.c:3781
#: daemon/gvfsbackendsmb.c:1241
msgid "The file was externally modified"
msgstr ""
#: daemon/gvfsbackendafp.c:1765 daemon/gvfsbackendftp.c:1233
-#: daemon/gvfsbackendsftp.c:5210
+#: daemon/gvfsbackendsftp.c:5222
msgid "Invalid attribute type (uint32 expected)"
msgstr ""
@@ -814,9 +814,9 @@ msgstr ""
#: daemon/gvfsbackendarchive.c:882 daemon/gvfsbackendburn.c:679
#: daemon/gvfsbackendcomputer.c:729 daemon/gvfsbackenddnssd.c:474
#: daemon/gvfsbackendftp.c:354 daemon/gvfsbackendgoogle.c:684
-#: daemon/gvfsbackendgoogle.c:1213 daemon/gvfsbackendgoogle.c:1328
-#: daemon/gvfsbackendgoogle.c:1469 daemon/gvfsbackendnetwork.c:745
-#: daemon/gvfsbackendsftp.c:4308 daemon/gvfsftpdircache.c:157
+#: daemon/gvfsbackendgoogle.c:1218 daemon/gvfsbackendgoogle.c:1337
+#: daemon/gvfsbackendgoogle.c:1478 daemon/gvfsbackendnetwork.c:745
+#: daemon/gvfsbackendsftp.c:4320 daemon/gvfsftpdircache.c:157
msgid "The file is not a directory"
msgstr ""
@@ -834,17 +834,17 @@ msgstr ""
#: daemon/gvfsbackendburn.c:716 daemon/gvfsbackendburn.c:742
#: daemon/gvfsbackendburn.c:780 daemon/gvfsbackendburn.c:971
#: daemon/gvfsbackendburn.c:1007 daemon/gvfsbackendftp.c:835
-#: daemon/gvfsbackendgoogle.c:650 daemon/gvfsbackendgphoto2.c:1203
-#: daemon/gvfsbackendgphoto2.c:2126 daemon/gvfsbackendgphoto2.c:2845
+#: daemon/gvfsbackendgoogle.c:650 daemon/gvfsbackendgphoto2.c:1198
+#: daemon/gvfsbackendgphoto2.c:2121 daemon/gvfsbackendgphoto2.c:2840
#: daemon/gvfsbackendrecent.c:106 daemon/gvfsbackendrecent.c:287
-#: daemon/gvfsbackendsftp.c:2141 daemon/gvfsbackendsftp.c:3306
-#: daemon/gvfsbackendsftp.c:3319 daemon/gvfsbackendsftp.c:3339
+#: daemon/gvfsbackendsftp.c:2150 daemon/gvfsbackendsftp.c:3315
+#: daemon/gvfsbackendsftp.c:3328 daemon/gvfsbackendsftp.c:3348
#: daemon/gvfsbackendtrash.c:218
msgid "No such file or directory"
msgstr ""
#: daemon/gvfsbackendburn.c:455 daemon/gvfsbackendburn.c:903
-#: daemon/gvfsbackendgoogle.c:1814
+#: daemon/gvfsbackendgoogle.c:1823
msgid "Can't copy file over directory"
msgstr ""
@@ -856,7 +856,7 @@ msgstr ""
#: daemon/gvfsbackendburn.c:752 daemon/gvfsbackendburn.c:788
#: daemon/gvfsbackendburn.c:923 daemon/gvfsbackendburn.c:985
#: daemon/gvfsbackendburn.c:989 daemon/gvfsbackendburn.c:999
-#: daemon/gvfsbackendgphoto2.c:2919
+#: daemon/gvfsbackendgphoto2.c:2914
msgid "File exists"
msgstr ""
@@ -891,19 +891,19 @@ msgid "No such file or directory in target path"
msgstr ""
#: daemon/gvfsbackendburn.c:884 daemon/gvfsbackenddav.c:2905
-#: daemon/gvfsbackendsftp.c:2135 daemon/gvfsbackendsftp.c:4998
+#: daemon/gvfsbackendsftp.c:2144 daemon/gvfsbackendsftp.c:5010
msgid "Target file exists"
msgstr ""
#: daemon/gvfsbackendburn.c:949 daemon/gvfsbackendcomputer.c:812
#: daemon/gvfsbackenddav.c:3349 daemon/gvfsbackenddav.c:3381
-#: daemon/gvfsbackendgphoto2.c:2495 daemon/gvfsbackendgphoto2.c:2708
-#: daemon/gvfsbackendgphoto2.c:2805 daemon/gvfsbackendgphoto2.c:2898
-#: daemon/gvfsbackendgphoto2.c:3507 daemon/gvfsbackendgphoto2.c:3517
+#: daemon/gvfsbackendgphoto2.c:2490 daemon/gvfsbackendgphoto2.c:2703
+#: daemon/gvfsbackendgphoto2.c:2800 daemon/gvfsbackendgphoto2.c:2893
+#: daemon/gvfsbackendgphoto2.c:3502 daemon/gvfsbackendgphoto2.c:3512
#: daemon/gvfsbackendnfs.c:2420 daemon/gvfsbackendnfs.c:2546
-#: daemon/gvfsbackendsftp.c:5883 daemon/gvfsbackendsftp.c:5915
-#: daemon/gvfsbackendsftp.c:5941 daemon/gvfsbackendsftp.c:6413
-#: daemon/gvfsbackendsftp.c:6475
+#: daemon/gvfsbackendsftp.c:5895 daemon/gvfsbackendsftp.c:5927
+#: daemon/gvfsbackendsftp.c:5953 daemon/gvfsbackendsftp.c:6425
+#: daemon/gvfsbackendsftp.c:6487
msgid "Not supported"
msgstr ""
@@ -924,20 +924,20 @@ msgid ""
"One or more applications are keeping the volume busy."
msgstr ""
-#: daemon/gvfsbackendcdda.c:358 daemon/gvfsbackendgphoto2.c:1512
+#: daemon/gvfsbackendcdda.c:358 daemon/gvfsbackendgphoto2.c:1507
#: daemon/gvfsbackendmtp.c:889
msgid "Cannot create gudev client"
msgstr ""
-#: daemon/gvfsbackendcdda.c:378 daemon/gvfsbackendgphoto2.c:1529
+#: daemon/gvfsbackendcdda.c:378 daemon/gvfsbackendgphoto2.c:1524
msgid "Cannot connect to the system bus"
msgstr ""
-#: daemon/gvfsbackendcdda.c:389 daemon/gvfsbackendgphoto2.c:1540
+#: daemon/gvfsbackendcdda.c:389 daemon/gvfsbackendgphoto2.c:1535
msgid "Cannot create libhal context"
msgstr ""
-#: daemon/gvfsbackendcdda.c:403 daemon/gvfsbackendgphoto2.c:1552
+#: daemon/gvfsbackendcdda.c:403 daemon/gvfsbackendgphoto2.c:1547
msgid "Cannot initialize libhal"
msgstr ""
@@ -992,7 +992,7 @@ msgstr ""
msgid "Error seeking in stream on drive %s"
msgstr ""
-#: daemon/gvfsbackendcdda.c:1017 daemon/gvfsbackendgphoto2.c:1813
+#: daemon/gvfsbackendcdda.c:1017 daemon/gvfsbackendgphoto2.c:1808
msgid "No such file"
msgstr ""
@@ -1087,7 +1087,7 @@ msgstr ""
#. translators: %s here is the hostname
#. Translators: %s is the hostname
#: daemon/gvfsbackenddav.c:1565 daemon/gvfsbackendftp.c:529
-#: daemon/gvfsbackendsftp.c:1156
+#: daemon/gvfsbackendsftp.c:1165
#, c-format
msgid "Enter password for %s"
msgstr ""
@@ -1110,7 +1110,7 @@ msgid "Could not create request"
msgstr ""
#: daemon/gvfsbackenddav.c:2499 daemon/gvfsbackendftp.c:1085
-#: daemon/gvfsbackendgoogle.c:2562 daemon/gvfsbackendnfs.c:939
+#: daemon/gvfsbackendgoogle.c:2575 daemon/gvfsbackendnfs.c:939
#: daemon/gvfsbackendnfs.c:962 daemon/gvfsbackendnfs.c:988
#: daemon/gvfsbackendnfs.c:1388 daemon/gvfsbackendsmb.c:1277
#: daemon/gvfsbackendsmb.c:2233
@@ -1144,12 +1144,12 @@ msgid "Network"
msgstr ""
#. Translators: the first %s is the username, the second the host name
-#: daemon/gvfsbackendftp.c:526 daemon/gvfsbackendsftp.c:1149
+#: daemon/gvfsbackendftp.c:526 daemon/gvfsbackendsftp.c:1158
#, c-format
msgid "Enter password for %s on %s"
msgstr ""
-#: daemon/gvfsbackendftp.c:556 daemon/gvfsbackendsftp.c:1173
+#: daemon/gvfsbackendftp.c:556 daemon/gvfsbackendsftp.c:1182
#: daemon/gvfsbackendsmbbrowse.c:1009 daemon/gvfsbackendsmb.c:693
msgid "Password dialog cancelled"
msgstr ""
@@ -1158,49 +1158,49 @@ msgstr ""
msgid "Insufficient permissions"
msgstr ""
-#: daemon/gvfsbackendgoogle.c:1713 daemon/gvfsbackendgoogle.c:2236
-#: daemon/gvfsbackendgphoto2.c:1846
+#: daemon/gvfsbackendgoogle.c:1722 daemon/gvfsbackendgoogle.c:2249
+#: daemon/gvfsbackendgphoto2.c:1841
msgid "Error getting data from file"
msgstr ""
-#: daemon/gvfsbackendgoogle.c:2194 daemon/gvfsbackendsftp.c:2314
-#: daemon/gvfsbackendsftp.c:2721 daemon/gvfsbackendsftp.c:2784
-#: daemon/gvfsbackendsftp.c:2795 daemon/gvfsbackendsftp.c:2853
-#: daemon/gvfsbackendsftp.c:2946 daemon/gvfsbackendsftp.c:2998
-#: daemon/gvfsbackendsftp.c:3053 daemon/gvfsbackendsftp.c:3132
-#: daemon/gvfsbackendsftp.c:3249 daemon/gvfsbackendsftp.c:3382
-#: daemon/gvfsbackendsftp.c:3466 daemon/gvfsbackendsftp.c:3542
-#: daemon/gvfsbackendsftp.c:3554 daemon/gvfsbackendsftp.c:3614
-#: daemon/gvfsbackendsftp.c:3656 daemon/gvfsbackendsftp.c:3844
-#: daemon/gvfsbackendsftp.c:3878 daemon/gvfsbackendsftp.c:3936
-#: daemon/gvfsbackendsftp.c:3995 daemon/gvfsbackendsftp.c:4066
-#: daemon/gvfsbackendsftp.c:4341 daemon/gvfsbackendsftp.c:4412
-#: daemon/gvfsbackendsftp.c:4547 daemon/gvfsbackendsftp.c:4657
-#: daemon/gvfsbackendsftp.c:4719 daemon/gvfsbackendsftp.c:4756
-#: daemon/gvfsbackendsftp.c:4784 daemon/gvfsbackendsftp.c:4898
-#: daemon/gvfsbackendsftp.c:4954 daemon/gvfsbackendsftp.c:4995
-#: daemon/gvfsbackendsftp.c:5031 daemon/gvfsbackendsftp.c:5067
-#: daemon/gvfsbackendsftp.c:5082 daemon/gvfsbackendsftp.c:5097
-#: daemon/gvfsbackendsftp.c:5181 daemon/gvfsbackendsftp.c:5368
-#: daemon/gvfsbackendsftp.c:5405 daemon/gvfsbackendsftp.c:5479
-#: daemon/gvfsbackendsftp.c:5565 daemon/gvfsbackendsftp.c:5649
-#: daemon/gvfsbackendsftp.c:5692 daemon/gvfsbackendsftp.c:5696
-#: daemon/gvfsbackendsftp.c:5813 daemon/gvfsbackendsftp.c:5817
-#: daemon/gvfsbackendsftp.c:6055 daemon/gvfsbackendsftp.c:6268
-#: daemon/gvfsbackendsftp.c:6285 daemon/gvfsbackendsftp.c:6419
-#: daemon/gvfsbackendsftp.c:6447
+#: daemon/gvfsbackendgoogle.c:2207 daemon/gvfsbackendsftp.c:2323
+#: daemon/gvfsbackendsftp.c:2730 daemon/gvfsbackendsftp.c:2793
+#: daemon/gvfsbackendsftp.c:2804 daemon/gvfsbackendsftp.c:2862
+#: daemon/gvfsbackendsftp.c:2955 daemon/gvfsbackendsftp.c:3007
+#: daemon/gvfsbackendsftp.c:3062 daemon/gvfsbackendsftp.c:3141
+#: daemon/gvfsbackendsftp.c:3258 daemon/gvfsbackendsftp.c:3391
+#: daemon/gvfsbackendsftp.c:3475 daemon/gvfsbackendsftp.c:3551
+#: daemon/gvfsbackendsftp.c:3563 daemon/gvfsbackendsftp.c:3623
+#: daemon/gvfsbackendsftp.c:3665 daemon/gvfsbackendsftp.c:3853
+#: daemon/gvfsbackendsftp.c:3887 daemon/gvfsbackendsftp.c:3945
+#: daemon/gvfsbackendsftp.c:4007 daemon/gvfsbackendsftp.c:4078
+#: daemon/gvfsbackendsftp.c:4353 daemon/gvfsbackendsftp.c:4424
+#: daemon/gvfsbackendsftp.c:4559 daemon/gvfsbackendsftp.c:4669
+#: daemon/gvfsbackendsftp.c:4731 daemon/gvfsbackendsftp.c:4768
+#: daemon/gvfsbackendsftp.c:4796 daemon/gvfsbackendsftp.c:4910
+#: daemon/gvfsbackendsftp.c:4966 daemon/gvfsbackendsftp.c:5007
+#: daemon/gvfsbackendsftp.c:5043 daemon/gvfsbackendsftp.c:5079
+#: daemon/gvfsbackendsftp.c:5094 daemon/gvfsbackendsftp.c:5109
+#: daemon/gvfsbackendsftp.c:5193 daemon/gvfsbackendsftp.c:5380
+#: daemon/gvfsbackendsftp.c:5417 daemon/gvfsbackendsftp.c:5491
+#: daemon/gvfsbackendsftp.c:5577 daemon/gvfsbackendsftp.c:5661
+#: daemon/gvfsbackendsftp.c:5704 daemon/gvfsbackendsftp.c:5708
+#: daemon/gvfsbackendsftp.c:5825 daemon/gvfsbackendsftp.c:5829
+#: daemon/gvfsbackendsftp.c:6067 daemon/gvfsbackendsftp.c:6280
+#: daemon/gvfsbackendsftp.c:6297 daemon/gvfsbackendsftp.c:6431
+#: daemon/gvfsbackendsftp.c:6459
msgid "Invalid reply received"
msgstr ""
-#: daemon/gvfsbackendgoogle.c:2589 daemon/gvfsbackendnfs.c:1150
+#: daemon/gvfsbackendgoogle.c:2602 daemon/gvfsbackendnfs.c:1150
msgid "Target file is a directory"
msgstr ""
-#: daemon/gvfsbackendgoogle.c:2597 daemon/gvfsbackendnfs.c:1160
+#: daemon/gvfsbackendgoogle.c:2610 daemon/gvfsbackendnfs.c:1160
msgid "Target file is not a regular file"
msgstr ""
-#: daemon/gvfsbackendgoogle.c:2787 daemon/gvfsbackendgphoto2.c:3307
+#: daemon/gvfsbackendgoogle.c:2800 daemon/gvfsbackendgphoto2.c:3302
msgid "Error writing file"
msgstr ""
@@ -1232,165 +1232,165 @@ msgstr ""
#. Translator: %s is the vendor name, e.g. Panasonic
#. Translators: %s is the device vendor
-#: daemon/gvfsbackendgphoto2.c:938 monitor/gphoto2/ggphoto2volume.c:190
+#: daemon/gvfsbackendgphoto2.c:933 monitor/gphoto2/ggphoto2volume.c:190
#, c-format
msgid "%s Camera"
msgstr ""
#. Translator: %s is the vendor name, e.g. Panasonic
#. Translators: %s is the device vendor
-#: daemon/gvfsbackendgphoto2.c:941 monitor/gphoto2/ggphoto2volume.c:185
+#: daemon/gvfsbackendgphoto2.c:936 monitor/gphoto2/ggphoto2volume.c:185
#, c-format
msgid "%s Audio Player"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:950 monitor/gphoto2/ggphoto2volume.c:199
+#: daemon/gvfsbackendgphoto2.c:945 monitor/gphoto2/ggphoto2volume.c:199
msgid "Camera"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:952 monitor/gphoto2/ggphoto2volume.c:197
+#: daemon/gvfsbackendgphoto2.c:947 monitor/gphoto2/ggphoto2volume.c:197
msgid "Audio Player"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:1568 daemon/gvfsbackendmtp.c:881
+#: daemon/gvfsbackendgphoto2.c:1563 daemon/gvfsbackendmtp.c:881
msgid "No device specified"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:1588
+#: daemon/gvfsbackendgphoto2.c:1583
msgid "Cannot create gphoto2 context"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:1597
+#: daemon/gvfsbackendgphoto2.c:1592
msgid "Error creating camera"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:1609 daemon/gvfsbackendgphoto2.c:1618
+#: daemon/gvfsbackendgphoto2.c:1604 daemon/gvfsbackendgphoto2.c:1613
msgid "Error loading device information"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:1629
+#: daemon/gvfsbackendgphoto2.c:1624
msgid "Error looking up device information"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:1638
+#: daemon/gvfsbackendgphoto2.c:1633
msgid "Error getting device information"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:1652
+#: daemon/gvfsbackendgphoto2.c:1647
msgid "Error setting up camera communications port"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:1662
+#: daemon/gvfsbackendgphoto2.c:1657
msgid "Error initializing camera"
msgstr ""
#. Translator: %s represents the device, e.g. usb:001,042. 'gphoto2' is the name of the
#. backend and shouldn't be translated.
-#: daemon/gvfsbackendgphoto2.c:1673
+#: daemon/gvfsbackendgphoto2.c:1668
#, c-format
msgid "gphoto2 mount on %s"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:1759
+#: daemon/gvfsbackendgphoto2.c:1754
msgid "No camera specified"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:1821 daemon/gvfsbackendgphoto2.c:3548
+#: daemon/gvfsbackendgphoto2.c:1816 daemon/gvfsbackendgphoto2.c:3543
msgid "Error creating file object"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:1836 daemon/gvfsbackendgphoto2.c:3579
+#: daemon/gvfsbackendgphoto2.c:1831 daemon/gvfsbackendgphoto2.c:3574
msgid "Error getting file"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:1904 daemon/gvfsbackendmtp.c:2372
+#: daemon/gvfsbackendgphoto2.c:1899 daemon/gvfsbackendmtp.c:2372
#, c-format
msgid "Malformed icon identifier '%s'"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:1980 daemon/gvfsbackendgphoto2.c:3170
+#: daemon/gvfsbackendgphoto2.c:1975 daemon/gvfsbackendgphoto2.c:3165
#, c-format
msgid "Error seeking in stream on camera %s"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:2120 daemon/gvfsbackendsftp.c:3309
+#: daemon/gvfsbackendgphoto2.c:2115 daemon/gvfsbackendsftp.c:3318
#: daemon/gvfsbackendsmbbrowse.c:1437
msgid "Not a directory"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:2153
+#: daemon/gvfsbackendgphoto2.c:2148
msgid "Failed to get folder list"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:2218
+#: daemon/gvfsbackendgphoto2.c:2213
msgid "Failed to get file list"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:2507
+#: daemon/gvfsbackendgphoto2.c:2502
msgid "Error creating directory"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:2720
+#: daemon/gvfsbackendgphoto2.c:2715
msgid "Name already exists"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:2731 daemon/gvfsbackendgphoto2.c:3399
+#: daemon/gvfsbackendgphoto2.c:2726 daemon/gvfsbackendgphoto2.c:3394
msgid "New name too long"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:2741 daemon/gvfsbackendgphoto2.c:3410
+#: daemon/gvfsbackendgphoto2.c:2736 daemon/gvfsbackendgphoto2.c:3405
msgid "Error renaming directory"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:2754 daemon/gvfsbackendgphoto2.c:3423
+#: daemon/gvfsbackendgphoto2.c:2749 daemon/gvfsbackendgphoto2.c:3418
msgid "Error renaming file"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:2818
+#: daemon/gvfsbackendgphoto2.c:2813
#, c-format
msgid "Directory '%s' is not empty"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:2829
+#: daemon/gvfsbackendgphoto2.c:2824
msgid "Error deleting directory"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:2855 daemon/gvfsbackendgphoto2.c:3600
+#: daemon/gvfsbackendgphoto2.c:2850 daemon/gvfsbackendgphoto2.c:3595
msgid "Error deleting file"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:2908
+#: daemon/gvfsbackendgphoto2.c:2903
msgid "Can't write to directory"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:2955
+#: daemon/gvfsbackendgphoto2.c:2950
msgid "Cannot allocate new file to append to"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:2970
+#: daemon/gvfsbackendgphoto2.c:2965
msgid "Cannot read file to append to"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:2981
+#: daemon/gvfsbackendgphoto2.c:2976
msgid "Cannot get data of file to append to"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:3355
+#: daemon/gvfsbackendgphoto2.c:3350
msgid "Not supported (not same directory)"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:3367
+#: daemon/gvfsbackendgphoto2.c:3362
msgid ""
"Not supported (the source is a directory, the destination is a directory too)"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:3375
+#: daemon/gvfsbackendgphoto2.c:3370
msgid ""
"Not supported (the source is a directory, but the destination is an existing "
"file)"
msgstr ""
-#: daemon/gvfsbackendgphoto2.c:3387
+#: daemon/gvfsbackendgphoto2.c:3382
msgid ""
"Not supported (the source is a file, but the destination is a directory)"
msgstr ""
@@ -1512,8 +1512,8 @@ msgid ""
msgstr ""
#: daemon/gvfsbackendnfs.c:1046 daemon/gvfsbackendnfs.c:1069
-#: daemon/gvfsbackendnfs.c:1117 daemon/gvfsbackendsftp.c:3692
-#: daemon/gvfsbackendsftp.c:5720
+#: daemon/gvfsbackendnfs.c:1117 daemon/gvfsbackendsftp.c:3701
+#: daemon/gvfsbackendsftp.c:5732
msgid "Unable to create temporary file"
msgstr ""
@@ -1531,76 +1531,76 @@ msgstr ""
msgid "Recent"
msgstr ""
-#: daemon/gvfsbackendsftp.c:328 daemon/gvfsbackendsftp.c:704
+#: daemon/gvfsbackendsftp.c:336 daemon/gvfsbackendsftp.c:712
msgid "Connection failed"
msgstr ""
-#: daemon/gvfsbackendsftp.c:344
+#: daemon/gvfsbackendsftp.c:352
msgid "Hostname not known"
msgstr ""
-#: daemon/gvfsbackendsftp.c:351
+#: daemon/gvfsbackendsftp.c:359
msgid "No route to host"
msgstr ""
-#: daemon/gvfsbackendsftp.c:359
+#: daemon/gvfsbackendsftp.c:367
msgid "Connection refused by server"
msgstr ""
-#: daemon/gvfsbackendsftp.c:366
+#: daemon/gvfsbackendsftp.c:374
msgid "Host key verification failed"
msgstr ""
-#: daemon/gvfsbackendsftp.c:373
+#: daemon/gvfsbackendsftp.c:381
msgid "Too many authentication failures"
msgstr ""
-#: daemon/gvfsbackendsftp.c:548
+#: daemon/gvfsbackendsftp.c:556
msgid "Unable to spawn SSH program"
msgstr ""
-#: daemon/gvfsbackendsftp.c:564
+#: daemon/gvfsbackendsftp.c:572
#, c-format
msgid "Unable to spawn SSH program: %s"
msgstr ""
-#: daemon/gvfsbackendsftp.c:666 daemon/gvfsbackendsftp.c:1041
+#: daemon/gvfsbackendsftp.c:674 daemon/gvfsbackendsftp.c:1050
msgid "Timed out when logging in"
msgstr ""
-#: daemon/gvfsbackendsftp.c:917
+#: daemon/gvfsbackendsftp.c:926
msgid "Log In Anyway"
msgstr ""
-#: daemon/gvfsbackendsftp.c:917
+#: daemon/gvfsbackendsftp.c:926
msgid "Cancel Login"
msgstr ""
-#: daemon/gvfsbackendsftp.c:932
+#: daemon/gvfsbackendsftp.c:941
msgid "Login dialog cancelled"
msgstr ""
-#: daemon/gvfsbackendsftp.c:951
+#: daemon/gvfsbackendsftp.c:960
msgid "Can't send host identity confirmation"
msgstr ""
#. Translators: the first %s is the username, the second the host name
-#: daemon/gvfsbackendsftp.c:1146
+#: daemon/gvfsbackendsftp.c:1155
#, c-format
msgid "Enter passphrase for secure key for %s on %s"
msgstr ""
#. Translators: %s is the hostname
-#: daemon/gvfsbackendsftp.c:1153
+#: daemon/gvfsbackendsftp.c:1162
#, c-format
msgid "Enter passphrase for secure key for %s"
msgstr ""
-#: daemon/gvfsbackendsftp.c:1245
+#: daemon/gvfsbackendsftp.c:1254
msgid "Can't send password"
msgstr ""
-#: daemon/gvfsbackendsftp.c:1261
+#: daemon/gvfsbackendsftp.c:1270
#, c-format
msgid ""
"Can't verify the identity of “%s”.\n"
@@ -1610,7 +1610,7 @@ msgid ""
"absolutely sure it is safe to continue, contact the system administrator."
msgstr ""
-#: daemon/gvfsbackendsftp.c:1288
+#: daemon/gvfsbackendsftp.c:1297
#, c-format
msgid ""
"The host key for “%s” differs from the key for the IP address “%s”\n"
@@ -1618,43 +1618,43 @@ msgid ""
"administrator."
msgstr ""
-#: daemon/gvfsbackendsftp.c:1379
+#: daemon/gvfsbackendsftp.c:1388
msgid "The connection is closed (the underlying SSH process exited)"
msgstr ""
-#: daemon/gvfsbackendsftp.c:1380
+#: daemon/gvfsbackendsftp.c:1389
msgid "Internal error: Unknown Error"
msgstr ""
-#: daemon/gvfsbackendsftp.c:1894 daemon/gvfsbackendsftp.c:1921
+#: daemon/gvfsbackendsftp.c:1903 daemon/gvfsbackendsftp.c:1930
msgid "Protocol error"
msgstr ""
-#: daemon/gvfsbackendsftp.c:2036
+#: daemon/gvfsbackendsftp.c:2045
msgid "Unable to find supported SSH command"
msgstr ""
-#: daemon/gvfsbackendsftp.c:2578 daemon/gvfsbackendsmb.c:1549
+#: daemon/gvfsbackendsftp.c:2587 daemon/gvfsbackendsmb.c:1549
#: daemon/gvfsdaemonutils.c:140
msgid " (invalid encoding)"
msgstr ""
#. Translators: This is the name of the root of an SFTP share, like "/ on <hostname>"
-#: daemon/gvfsbackendsftp.c:2590 daemon/gvfsftpdircache.c:431
+#: daemon/gvfsbackendsftp.c:2599 daemon/gvfsftpdircache.c:431
#, c-format
msgid "/ on %s"
msgstr ""
-#: daemon/gvfsbackendsftp.c:2663
+#: daemon/gvfsbackendsftp.c:2672
msgid "Failure"
msgstr ""
-#: daemon/gvfsbackendsftp.c:3075
+#: daemon/gvfsbackendsftp.c:3084
#, c-format
msgid "Error creating backup file: %s"
msgstr ""
-#: daemon/gvfsbackendsftp.c:3642 daemon/gvfsbackendsftp.c:3818
+#: daemon/gvfsbackendsftp.c:3651 daemon/gvfsbackendsftp.c:3827
msgid "backups not supported yet"
msgstr ""
diff --git a/programs/Makefile.in b/programs/Makefile.in
index 2b42757..3538d7d 100644
--- a/programs/Makefile.in
+++ b/programs/Makefile.in
@@ -418,6 +418,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@
diff --git a/programs/completion/Makefile.in b/programs/completion/Makefile.in
index fd0b500..4212e06 100644
--- a/programs/completion/Makefile.in
+++ b/programs/completion/Makefile.in
@@ -254,6 +254,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@
diff --git a/test/Makefile.in b/test/Makefile.in
index 0461773..25eaebb 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -554,6 +554,8 @@ LDFLAGS = @LDFLAGS@
LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGDATA_0_17_7_CFLAGS = @LIBGDATA_0_17_7_CFLAGS@
+LIBGDATA_0_17_7_LIBS = @LIBGDATA_0_17_7_LIBS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBMTP_1_1_12_CFLAGS = @LIBMTP_1_1_12_CFLAGS@