Hello community,
here is the log from the commit of package gvfs for openSUSE:Factory checked in at 2013-11-24 12:00:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gvfs (Old)
and /work/SRC/openSUSE:Factory/.gvfs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gvfs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gvfs/gvfs.changes 2013-10-30 16:02:21.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gvfs.new/gvfs.changes 2013-11-24 12:00:09.000000000 +0100
@@ -1,0 +2,9 @@
+Mon Nov 11 20:58:59 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 1.18.3 (bnc#849913):
+ + Fix seeking past end of file for various backends.
+ + fuse: Improve write performance.
+ + archive: Handle open failure.
+- Drop gvfs-webdav_file_types.patch: fixed upstream.
+
+-------------------------------------------------------------------
Old:
----
gvfs-1.18.2.tar.xz
gvfs-webdav_file_types.patch
New:
----
gvfs-1.18.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gvfs.spec ++++++
--- /var/tmp/diff_new_pack.jtRwxL/_old 2013-11-24 12:00:10.000000000 +0100
+++ /var/tmp/diff_new_pack.jtRwxL/_new 2013-11-24 12:00:10.000000000 +0100
@@ -20,7 +20,7 @@
%define with_cdda 1
Name: gvfs
-Version: 1.18.2
+Version: 1.18.3
Release: 0
Summary: VFS functionality for GLib
License: LGPL-2.0+
@@ -32,8 +32,6 @@
Patch5: gvfs-nvvfs.patch
# PATCH-FEATURE-OPENSUSE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus
Patch6: gvfs-nds.patch
-# PATCH-FIX-UPSTREAM gvfs-webdav_file_types.patch bgo#706798 bnc#848129 stefan.bruens@rwth-aachen.de -- gvfs-webdav_file_types.patch
-Patch7: gvfs-webdav_file_types.patch
BuildRequires: bluez-devel
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fuse-devel
@@ -141,7 +139,6 @@
translation-update-upstream
%patch5 -p1
%patch6 -p1
-%patch7 -p1
%build
autoreconf -f
++++++ gvfs-1.18.2.tar.xz -> gvfs-1.18.3.tar.xz ++++++
++++ 1920 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/ChangeLog new/gvfs-1.18.3/ChangeLog
--- old/gvfs-1.18.2/ChangeLog 2013-10-03 13:46:12.000000000 +0200
+++ new/gvfs-1.18.3/ChangeLog 2013-11-08 14:42:08.000000000 +0100
@@ -1,6 +1,138 @@
+commit 7b7180b98959849b2d32a95e1e0cc49d8d3d337e
+Author: Ondrej Holy
+Date: 2013-11-08
+
+ Update NEWS for 1.18.3 release
+
+M NEWS
+M configure.ac
+
+commit 218eb4c46633948ec590922f95368410072dd8e9
+Author: Ross Lagerwall
+Date: 2013-11-05
+
+ client: Fix SIGSEGV in fallback copy
+
+ If the daemon is killed during the fallback copy, it is possible that
+ proxy is NULL which causes a segfault when unrefing it. Use
+ g_clear_object() instead.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=711454
+
+M client/gdaemonfile.c
+
+commit 1de81a47282e9dcf665237f0a508465e9d1f29a0
+Author: Ross Lagerwall
+Date: 2013-10-01
+
+ archive: Handle open failure
+
+ If gvfs_archive_open fails, libarchive immediately calls
+ gvfs_archive_close which causes a crash due to calling g_object_unref
+ on
+ the NULL stream.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=589028
+
+M daemon/gvfsbackendarchive.c
+
+commit de8ad26c71e14a15a3c5eeb05a73033dfccc8d85
+Author: Ross Lagerwall
+Date: 2013-10-23
+
+ http: Set error to NULL to possibly prevent crash on close
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=710678
+
+M daemon/gvfsbackendhttp.c
+
+commit f95829ee04aa6c0ad2e492746ff1a5d69e07ad2e
+Author: Ross Lagerwall
+Date: 2013-10-11
+
+ dav: Set file type to regular by default
+
+ Some servers send empty resourcetype nodes or don't send the node
+ at all
+ for regular files (the spec says that it defaults to empty). Set the
+ file type to regular by default.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=706798
+
+M daemon/gvfsbackenddav.c
+
+commit 8835238a5d0049e7639f792bf82d2105ad54cc11
+Author: Ross Lagerwall
+Date: 2013-10-08
+
+ fuse: Use the big_writes option to speed up writes
+
+ Without the big_writes option, fuse uses a block size of 4096 bytes
+ which results in poor write performance. So use the big_writes option
+ to write blocks up to 64KiB in size.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=652540
+
+M client/gvfsfusedaemon.c
+M daemon/main.c
+
+commit 1474a61207aa33362a674abe674c822691a57331
+Author: Alexander Larsson
+Date: 2013-10-08
+
+ afp: Allow seek past end of file
+
+ Also, only query file size if needed for G_SEEK_END.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=709432
+
+M daemon/gvfsbackendafp.c
+
+commit d12755f991a14f4f7d5cc6930a9026e106b88933
+Author: Alexander Larsson
+Date: 2013-10-08
+
+ gphoto2: Allow seek past end of file
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=709432
+
+M daemon/gvfsbackendgphoto2.c
+
+commit 77f98e82f552ea464545b2e584b7a3011ae55a65
+Author: Alexander Larsson
+Date: 2013-10-08
+
+ cdda: Allow seek past end of file
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=709432
+
+M daemon/gvfsbackendcdda.c
+
+commit fb56d6dd8699ae73c732fd30dd8bb2034105ecb8
+Author: Alexander Larsson
+Date: 2013-10-08
+
+ mtp: Allow seek past end of file
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=709432
+
+M daemon/gvfsbackendmtp.c
+
+commit 5fb056ffea07aa415a676bc22d4b02e7d3fc482a
+Author: Alexander Larsson
+Date: 2013-10-08
+
+ sftp: Allow seek past end of file
+
+ also, don't query for the file size unless required for SEEK_END
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=709432
+
+M daemon/gvfsbackendsftp.c
+
commit 0e6434139716a63ce99e84525aa63890a6244378
Author: Alexander Larsson
-Date: 2013-10-03
+Date: 2013-10-03
Update for 1.18.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/NEWS new/gvfs-1.18.3/NEWS
--- old/gvfs-1.18.2/NEWS 2013-10-03 13:45:30.000000000 +0200
+++ new/gvfs-1.18.3/NEWS 2013-11-08 14:35:57.000000000 +0100
@@ -1,3 +1,9 @@
+Major changes in 1.18.3
+=======================
+* Fix seeking past end of file for various backends
+* fuse: Improve write performance
+* archive: Handle open failure
+
Major changes in 1.18.2
=======================
* Fix a client side regression in 1.18.1 where apps would stop responding
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/client/gdaemonfile.c new/gvfs-1.18.3/client/gdaemonfile.c
--- old/gvfs-1.18.2/client/gdaemonfile.c 2013-10-03 13:19:32.000000000 +0200
+++ new/gvfs-1.18.3/client/gdaemonfile.c 2013-11-08 14:29:22.000000000 +0100
@@ -2964,7 +2964,7 @@
if (g_error_matches (my_error, G_VFS_ERROR, G_VFS_ERROR_RETRY))
{
g_clear_error (&my_error);
- g_object_unref (proxy);
+ g_clear_object (&proxy);
goto retry;
}
_g_propagate_error_stripped (error, my_error);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/client/gvfsfusedaemon.c new/gvfs-1.18.3/client/gvfsfusedaemon.c
--- old/gvfs-1.18.2/client/gvfsfusedaemon.c 2013-10-03 11:55:12.000000000 +0200
+++ new/gvfs-1.18.3/client/gvfsfusedaemon.c 2013-11-07 16:12:17.000000000 +0100
@@ -2397,6 +2397,10 @@
/* Prevent out-of-order readahead */
conn->async_read = 0;
+ /* Use up to a 64KiB write block size. Only has an effect if -o big_writes
+ * is given on the command-line. */
+ conn->max_write = 65536;
+
return NULL;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/common/gvfsdbus.c new/gvfs-1.18.3/common/gvfsdbus.c
--- old/gvfs-1.18.2/common/gvfsdbus.c 2013-06-14 10:12:50.000000000 +0200
+++ new/gvfs-1.18.3/common/gvfsdbus.c 2013-11-07 16:13:29.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.37.2. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.39.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
@@ -858,6 +858,7 @@
static void gvfs_dbus_daemon_proxy_iface_init (GVfsDBusDaemonIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusDaemonProxy, gvfs_dbus_daemon_proxy, G_TYPE_DBUS_PROXY,
+ G_ADD_PRIVATE (GVfsDBusDaemonProxy)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_DAEMON, gvfs_dbus_daemon_proxy_iface_init));
static void
@@ -957,7 +958,7 @@
static void
gvfs_dbus_daemon_proxy_init (GVfsDBusDaemonProxy *proxy)
{
- proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_DAEMON_PROXY, GVfsDBusDaemonProxyPrivate);
+ proxy->priv = gvfs_dbus_daemon_proxy_get_instance_private (proxy);
g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_daemon_interface_info ());
}
@@ -967,8 +968,6 @@
GObjectClass *gobject_class;
GDBusProxyClass *proxy_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusDaemonProxyPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_daemon_proxy_finalize;
gobject_class->get_property = gvfs_dbus_daemon_proxy_get_property;
@@ -1379,6 +1378,7 @@
static void gvfs_dbus_daemon_skeleton_iface_init (GVfsDBusDaemonIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusDaemonSkeleton, gvfs_dbus_daemon_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+ G_ADD_PRIVATE (GVfsDBusDaemonSkeleton)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_DAEMON, gvfs_dbus_daemon_skeleton_iface_init));
static void
@@ -1396,7 +1396,7 @@
static void
gvfs_dbus_daemon_skeleton_init (GVfsDBusDaemonSkeleton *skeleton)
{
- skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_DAEMON_SKELETON, GVfsDBusDaemonSkeletonPrivate);
+ skeleton->priv = gvfs_dbus_daemon_skeleton_get_instance_private (skeleton);
g_mutex_init (&skeleton->priv->lock);
skeleton->priv->context = g_main_context_ref_thread_default ();
}
@@ -1407,8 +1407,6 @@
GObjectClass *gobject_class;
GDBusInterfaceSkeletonClass *skeleton_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusDaemonSkeletonPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_daemon_skeleton_finalize;
@@ -1756,6 +1754,7 @@
static void gvfs_dbus_spawner_proxy_iface_init (GVfsDBusSpawnerIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusSpawnerProxy, gvfs_dbus_spawner_proxy, G_TYPE_DBUS_PROXY,
+ G_ADD_PRIVATE (GVfsDBusSpawnerProxy)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_SPAWNER, gvfs_dbus_spawner_proxy_iface_init));
static void
@@ -1855,7 +1854,7 @@
static void
gvfs_dbus_spawner_proxy_init (GVfsDBusSpawnerProxy *proxy)
{
- proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_SPAWNER_PROXY, GVfsDBusSpawnerProxyPrivate);
+ proxy->priv = gvfs_dbus_spawner_proxy_get_instance_private (proxy);
g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_spawner_interface_info ());
}
@@ -1865,8 +1864,6 @@
GObjectClass *gobject_class;
GDBusProxyClass *proxy_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusSpawnerProxyPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_spawner_proxy_finalize;
gobject_class->get_property = gvfs_dbus_spawner_proxy_get_property;
@@ -2277,6 +2274,7 @@
static void gvfs_dbus_spawner_skeleton_iface_init (GVfsDBusSpawnerIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusSpawnerSkeleton, gvfs_dbus_spawner_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+ G_ADD_PRIVATE (GVfsDBusSpawnerSkeleton)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_SPAWNER, gvfs_dbus_spawner_skeleton_iface_init));
static void
@@ -2294,7 +2292,7 @@
static void
gvfs_dbus_spawner_skeleton_init (GVfsDBusSpawnerSkeleton *skeleton)
{
- skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_SPAWNER_SKELETON, GVfsDBusSpawnerSkeletonPrivate);
+ skeleton->priv = gvfs_dbus_spawner_skeleton_get_instance_private (skeleton);
g_mutex_init (&skeleton->priv->lock);
skeleton->priv->context = g_main_context_ref_thread_default ();
}
@@ -2305,8 +2303,6 @@
GObjectClass *gobject_class;
GDBusInterfaceSkeletonClass *skeleton_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusSpawnerSkeletonPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_spawner_skeleton_finalize;
@@ -4342,6 +4338,7 @@
static void gvfs_dbus_mount_tracker_proxy_iface_init (GVfsDBusMountTrackerIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusMountTrackerProxy, gvfs_dbus_mount_tracker_proxy, G_TYPE_DBUS_PROXY,
+ G_ADD_PRIVATE (GVfsDBusMountTrackerProxy)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_MOUNT_TRACKER, gvfs_dbus_mount_tracker_proxy_iface_init));
static void
@@ -4441,7 +4438,7 @@
static void
gvfs_dbus_mount_tracker_proxy_init (GVfsDBusMountTrackerProxy *proxy)
{
- proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_MOUNT_TRACKER_PROXY, GVfsDBusMountTrackerProxyPrivate);
+ proxy->priv = gvfs_dbus_mount_tracker_proxy_get_instance_private (proxy);
g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_mount_tracker_interface_info ());
}
@@ -4451,8 +4448,6 @@
GObjectClass *gobject_class;
GDBusProxyClass *proxy_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusMountTrackerProxyPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_mount_tracker_proxy_finalize;
gobject_class->get_property = gvfs_dbus_mount_tracker_proxy_get_property;
@@ -4911,6 +4906,7 @@
static void gvfs_dbus_mount_tracker_skeleton_iface_init (GVfsDBusMountTrackerIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusMountTrackerSkeleton, gvfs_dbus_mount_tracker_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+ G_ADD_PRIVATE (GVfsDBusMountTrackerSkeleton)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_MOUNT_TRACKER, gvfs_dbus_mount_tracker_skeleton_iface_init));
static void
@@ -4928,7 +4924,7 @@
static void
gvfs_dbus_mount_tracker_skeleton_init (GVfsDBusMountTrackerSkeleton *skeleton)
{
- skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_MOUNT_TRACKER_SKELETON, GVfsDBusMountTrackerSkeletonPrivate);
+ skeleton->priv = gvfs_dbus_mount_tracker_skeleton_get_instance_private (skeleton);
g_mutex_init (&skeleton->priv->lock);
skeleton->priv->context = g_main_context_ref_thread_default ();
}
@@ -4939,8 +4935,6 @@
GObjectClass *gobject_class;
GDBusInterfaceSkeletonClass *skeleton_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusMountTrackerSkeletonPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_mount_tracker_skeleton_finalize;
@@ -5290,6 +5284,7 @@
static void gvfs_dbus_mountable_proxy_iface_init (GVfsDBusMountableIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusMountableProxy, gvfs_dbus_mountable_proxy, G_TYPE_DBUS_PROXY,
+ G_ADD_PRIVATE (GVfsDBusMountableProxy)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_MOUNTABLE, gvfs_dbus_mountable_proxy_iface_init));
static void
@@ -5389,7 +5384,7 @@
static void
gvfs_dbus_mountable_proxy_init (GVfsDBusMountableProxy *proxy)
{
- proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_MOUNTABLE_PROXY, GVfsDBusMountableProxyPrivate);
+ proxy->priv = gvfs_dbus_mountable_proxy_get_instance_private (proxy);
g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_mountable_interface_info ());
}
@@ -5399,8 +5394,6 @@
GObjectClass *gobject_class;
GDBusProxyClass *proxy_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusMountableProxyPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_mountable_proxy_finalize;
gobject_class->get_property = gvfs_dbus_mountable_proxy_get_property;
@@ -5811,6 +5804,7 @@
static void gvfs_dbus_mountable_skeleton_iface_init (GVfsDBusMountableIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusMountableSkeleton, gvfs_dbus_mountable_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+ G_ADD_PRIVATE (GVfsDBusMountableSkeleton)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_MOUNTABLE, gvfs_dbus_mountable_skeleton_iface_init));
static void
@@ -5828,7 +5822,7 @@
static void
gvfs_dbus_mountable_skeleton_init (GVfsDBusMountableSkeleton *skeleton)
{
- skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_MOUNTABLE_SKELETON, GVfsDBusMountableSkeletonPrivate);
+ skeleton->priv = gvfs_dbus_mountable_skeleton_get_instance_private (skeleton);
g_mutex_init (&skeleton->priv->lock);
skeleton->priv->context = g_main_context_ref_thread_default ();
}
@@ -5839,8 +5833,6 @@
GObjectClass *gobject_class;
GDBusInterfaceSkeletonClass *skeleton_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusMountableSkeletonPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_mountable_skeleton_finalize;
@@ -7250,6 +7242,7 @@
static void gvfs_dbus_mount_operation_proxy_iface_init (GVfsDBusMountOperationIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusMountOperationProxy, gvfs_dbus_mount_operation_proxy, G_TYPE_DBUS_PROXY,
+ G_ADD_PRIVATE (GVfsDBusMountOperationProxy)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_MOUNT_OPERATION, gvfs_dbus_mount_operation_proxy_iface_init));
static void
@@ -7349,7 +7342,7 @@
static void
gvfs_dbus_mount_operation_proxy_init (GVfsDBusMountOperationProxy *proxy)
{
- proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_MOUNT_OPERATION_PROXY, GVfsDBusMountOperationProxyPrivate);
+ proxy->priv = gvfs_dbus_mount_operation_proxy_get_instance_private (proxy);
g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_mount_operation_interface_info ());
}
@@ -7359,8 +7352,6 @@
GObjectClass *gobject_class;
GDBusProxyClass *proxy_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusMountOperationProxyPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_mount_operation_proxy_finalize;
gobject_class->get_property = gvfs_dbus_mount_operation_proxy_get_property;
@@ -7771,6 +7762,7 @@
static void gvfs_dbus_mount_operation_skeleton_iface_init (GVfsDBusMountOperationIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusMountOperationSkeleton, gvfs_dbus_mount_operation_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+ G_ADD_PRIVATE (GVfsDBusMountOperationSkeleton)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_MOUNT_OPERATION, gvfs_dbus_mount_operation_skeleton_iface_init));
static void
@@ -7788,7 +7780,7 @@
static void
gvfs_dbus_mount_operation_skeleton_init (GVfsDBusMountOperationSkeleton *skeleton)
{
- skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_MOUNT_OPERATION_SKELETON, GVfsDBusMountOperationSkeletonPrivate);
+ skeleton->priv = gvfs_dbus_mount_operation_skeleton_get_instance_private (skeleton);
g_mutex_init (&skeleton->priv->lock);
skeleton->priv->context = g_main_context_ref_thread_default ();
}
@@ -7799,8 +7791,6 @@
GObjectClass *gobject_class;
GDBusInterfaceSkeletonClass *skeleton_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusMountOperationSkeletonPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_mount_operation_skeleton_finalize;
@@ -14003,6 +13993,7 @@
static void gvfs_dbus_mount_proxy_iface_init (GVfsDBusMountIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusMountProxy, gvfs_dbus_mount_proxy, G_TYPE_DBUS_PROXY,
+ G_ADD_PRIVATE (GVfsDBusMountProxy)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_MOUNT, gvfs_dbus_mount_proxy_iface_init));
static void
@@ -14102,7 +14093,7 @@
static void
gvfs_dbus_mount_proxy_init (GVfsDBusMountProxy *proxy)
{
- proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_MOUNT_PROXY, GVfsDBusMountProxyPrivate);
+ proxy->priv = gvfs_dbus_mount_proxy_get_instance_private (proxy);
g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_mount_interface_info ());
}
@@ -14112,8 +14103,6 @@
GObjectClass *gobject_class;
GDBusProxyClass *proxy_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusMountProxyPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_mount_proxy_finalize;
gobject_class->get_property = gvfs_dbus_mount_proxy_get_property;
@@ -14524,6 +14513,7 @@
static void gvfs_dbus_mount_skeleton_iface_init (GVfsDBusMountIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusMountSkeleton, gvfs_dbus_mount_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+ G_ADD_PRIVATE (GVfsDBusMountSkeleton)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_MOUNT, gvfs_dbus_mount_skeleton_iface_init));
static void
@@ -14541,7 +14531,7 @@
static void
gvfs_dbus_mount_skeleton_init (GVfsDBusMountSkeleton *skeleton)
{
- skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_MOUNT_SKELETON, GVfsDBusMountSkeletonPrivate);
+ skeleton->priv = gvfs_dbus_mount_skeleton_get_instance_private (skeleton);
g_mutex_init (&skeleton->priv->lock);
skeleton->priv->context = g_main_context_ref_thread_default ();
}
@@ -14552,8 +14542,6 @@
GObjectClass *gobject_class;
GDBusInterfaceSkeletonClass *skeleton_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusMountSkeletonPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_mount_skeleton_finalize;
@@ -15010,6 +14998,7 @@
static void gvfs_dbus_enumerator_proxy_iface_init (GVfsDBusEnumeratorIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusEnumeratorProxy, gvfs_dbus_enumerator_proxy, G_TYPE_DBUS_PROXY,
+ G_ADD_PRIVATE (GVfsDBusEnumeratorProxy)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_ENUMERATOR, gvfs_dbus_enumerator_proxy_iface_init));
static void
@@ -15109,7 +15098,7 @@
static void
gvfs_dbus_enumerator_proxy_init (GVfsDBusEnumeratorProxy *proxy)
{
- proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_ENUMERATOR_PROXY, GVfsDBusEnumeratorProxyPrivate);
+ proxy->priv = gvfs_dbus_enumerator_proxy_get_instance_private (proxy);
g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_enumerator_interface_info ());
}
@@ -15119,8 +15108,6 @@
GObjectClass *gobject_class;
GDBusProxyClass *proxy_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusEnumeratorProxyPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_enumerator_proxy_finalize;
gobject_class->get_property = gvfs_dbus_enumerator_proxy_get_property;
@@ -15531,6 +15518,7 @@
static void gvfs_dbus_enumerator_skeleton_iface_init (GVfsDBusEnumeratorIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusEnumeratorSkeleton, gvfs_dbus_enumerator_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+ G_ADD_PRIVATE (GVfsDBusEnumeratorSkeleton)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_ENUMERATOR, gvfs_dbus_enumerator_skeleton_iface_init));
static void
@@ -15548,7 +15536,7 @@
static void
gvfs_dbus_enumerator_skeleton_init (GVfsDBusEnumeratorSkeleton *skeleton)
{
- skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_ENUMERATOR_SKELETON, GVfsDBusEnumeratorSkeletonPrivate);
+ skeleton->priv = gvfs_dbus_enumerator_skeleton_get_instance_private (skeleton);
g_mutex_init (&skeleton->priv->lock);
skeleton->priv->context = g_main_context_ref_thread_default ();
}
@@ -15559,8 +15547,6 @@
GObjectClass *gobject_class;
GDBusInterfaceSkeletonClass *skeleton_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusEnumeratorSkeletonPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_enumerator_skeleton_finalize;
@@ -15889,6 +15875,7 @@
static void gvfs_dbus_progress_proxy_iface_init (GVfsDBusProgressIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusProgressProxy, gvfs_dbus_progress_proxy, G_TYPE_DBUS_PROXY,
+ G_ADD_PRIVATE (GVfsDBusProgressProxy)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_PROGRESS, gvfs_dbus_progress_proxy_iface_init));
static void
@@ -15988,7 +15975,7 @@
static void
gvfs_dbus_progress_proxy_init (GVfsDBusProgressProxy *proxy)
{
- proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_PROGRESS_PROXY, GVfsDBusProgressProxyPrivate);
+ proxy->priv = gvfs_dbus_progress_proxy_get_instance_private (proxy);
g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_progress_interface_info ());
}
@@ -15998,8 +15985,6 @@
GObjectClass *gobject_class;
GDBusProxyClass *proxy_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusProgressProxyPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_progress_proxy_finalize;
gobject_class->get_property = gvfs_dbus_progress_proxy_get_property;
@@ -16410,6 +16395,7 @@
static void gvfs_dbus_progress_skeleton_iface_init (GVfsDBusProgressIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusProgressSkeleton, gvfs_dbus_progress_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+ G_ADD_PRIVATE (GVfsDBusProgressSkeleton)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_PROGRESS, gvfs_dbus_progress_skeleton_iface_init));
static void
@@ -16427,7 +16413,7 @@
static void
gvfs_dbus_progress_skeleton_init (GVfsDBusProgressSkeleton *skeleton)
{
- skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_PROGRESS_SKELETON, GVfsDBusProgressSkeletonPrivate);
+ skeleton->priv = gvfs_dbus_progress_skeleton_get_instance_private (skeleton);
g_mutex_init (&skeleton->priv->lock);
skeleton->priv->context = g_main_context_ref_thread_default ();
}
@@ -16438,8 +16424,6 @@
GObjectClass *gobject_class;
GDBusInterfaceSkeletonClass *skeleton_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusProgressSkeletonPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_progress_skeleton_finalize;
@@ -16920,6 +16904,7 @@
static void gvfs_dbus_monitor_proxy_iface_init (GVfsDBusMonitorIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusMonitorProxy, gvfs_dbus_monitor_proxy, G_TYPE_DBUS_PROXY,
+ G_ADD_PRIVATE (GVfsDBusMonitorProxy)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_MONITOR, gvfs_dbus_monitor_proxy_iface_init));
static void
@@ -17019,7 +17004,7 @@
static void
gvfs_dbus_monitor_proxy_init (GVfsDBusMonitorProxy *proxy)
{
- proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_MONITOR_PROXY, GVfsDBusMonitorProxyPrivate);
+ proxy->priv = gvfs_dbus_monitor_proxy_get_instance_private (proxy);
g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_monitor_interface_info ());
}
@@ -17029,8 +17014,6 @@
GObjectClass *gobject_class;
GDBusProxyClass *proxy_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusMonitorProxyPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_monitor_proxy_finalize;
gobject_class->get_property = gvfs_dbus_monitor_proxy_get_property;
@@ -17441,6 +17424,7 @@
static void gvfs_dbus_monitor_skeleton_iface_init (GVfsDBusMonitorIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusMonitorSkeleton, gvfs_dbus_monitor_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+ G_ADD_PRIVATE (GVfsDBusMonitorSkeleton)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_MONITOR, gvfs_dbus_monitor_skeleton_iface_init));
static void
@@ -17458,7 +17442,7 @@
static void
gvfs_dbus_monitor_skeleton_init (GVfsDBusMonitorSkeleton *skeleton)
{
- skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_MONITOR_SKELETON, GVfsDBusMonitorSkeletonPrivate);
+ skeleton->priv = gvfs_dbus_monitor_skeleton_get_instance_private (skeleton);
g_mutex_init (&skeleton->priv->lock);
skeleton->priv->context = g_main_context_ref_thread_default ();
}
@@ -17469,8 +17453,6 @@
GObjectClass *gobject_class;
GDBusInterfaceSkeletonClass *skeleton_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusMonitorSkeletonPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_monitor_skeleton_finalize;
@@ -17856,6 +17838,7 @@
static void gvfs_dbus_monitor_client_proxy_iface_init (GVfsDBusMonitorClientIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusMonitorClientProxy, gvfs_dbus_monitor_client_proxy, G_TYPE_DBUS_PROXY,
+ G_ADD_PRIVATE (GVfsDBusMonitorClientProxy)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_MONITOR_CLIENT, gvfs_dbus_monitor_client_proxy_iface_init));
static void
@@ -17955,7 +17938,7 @@
static void
gvfs_dbus_monitor_client_proxy_init (GVfsDBusMonitorClientProxy *proxy)
{
- proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_MONITOR_CLIENT_PROXY, GVfsDBusMonitorClientProxyPrivate);
+ proxy->priv = gvfs_dbus_monitor_client_proxy_get_instance_private (proxy);
g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_monitor_client_interface_info ());
}
@@ -17965,8 +17948,6 @@
GObjectClass *gobject_class;
GDBusProxyClass *proxy_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusMonitorClientProxyPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_monitor_client_proxy_finalize;
gobject_class->get_property = gvfs_dbus_monitor_client_proxy_get_property;
@@ -18377,6 +18358,7 @@
static void gvfs_dbus_monitor_client_skeleton_iface_init (GVfsDBusMonitorClientIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsDBusMonitorClientSkeleton, gvfs_dbus_monitor_client_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+ G_ADD_PRIVATE (GVfsDBusMonitorClientSkeleton)
G_IMPLEMENT_INTERFACE (GVFS_DBUS_TYPE_MONITOR_CLIENT, gvfs_dbus_monitor_client_skeleton_iface_init));
static void
@@ -18394,7 +18376,7 @@
static void
gvfs_dbus_monitor_client_skeleton_init (GVfsDBusMonitorClientSkeleton *skeleton)
{
- skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_MONITOR_CLIENT_SKELETON, GVfsDBusMonitorClientSkeletonPrivate);
+ skeleton->priv = gvfs_dbus_monitor_client_skeleton_get_instance_private (skeleton);
g_mutex_init (&skeleton->priv->lock);
skeleton->priv->context = g_main_context_ref_thread_default ();
}
@@ -18405,8 +18387,6 @@
GObjectClass *gobject_class;
GDBusInterfaceSkeletonClass *skeleton_class;
- g_type_class_add_private (klass, sizeof (GVfsDBusMonitorClientSkeletonPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_dbus_monitor_client_skeleton_finalize;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/common/gvfsdbus.h new/gvfs-1.18.3/common/gvfsdbus.h
--- old/gvfs-1.18.2/common/gvfsdbus.h 2013-06-14 10:12:50.000000000 +0200
+++ new/gvfs-1.18.3/common/gvfsdbus.h 2013-11-07 16:13:29.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.37.2. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.39.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/configure.ac new/gvfs-1.18.3/configure.ac
--- old/gvfs-1.18.2/configure.ac 2013-09-30 10:47:02.000000000 +0200
+++ new/gvfs-1.18.3/configure.ac 2013-11-08 14:36:42.000000000 +0100
@@ -1,6 +1,6 @@
AC_PREREQ([2.64])
-AC_INIT([gvfs],[1.18.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs])
+AC_INIT([gvfs],[1.18.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs])
AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz tar-ustar])
AC_CONFIG_HEADERS(config.h)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/daemon/gvfsbackendafp.c new/gvfs-1.18.3/daemon/gvfsbackendafp.c
--- old/gvfs-1.18.2/daemon/gvfsbackendafp.c 2012-09-06 12:55:22.000000000 +0200
+++ new/gvfs-1.18.3/daemon/gvfsbackendafp.c 2013-11-07 16:12:17.000000000 +0100
@@ -725,23 +725,10 @@
size = g_file_info_get_size (info);
g_object_unref (info);
- switch (job->seek_type)
- {
- case G_SEEK_CUR:
- afp_handle->offset += job->requested_offset;
- break;
- case G_SEEK_SET:
- afp_handle->offset = job->requested_offset;
- break;
- case G_SEEK_END:
- afp_handle->offset = size + job->requested_offset;
- break;
- }
+ afp_handle->offset = size + job->requested_offset;
if (afp_handle->offset < 0)
afp_handle->offset = 0;
- else if (afp_handle->offset > size)
- afp_handle->offset = size;
g_vfs_job_seek_write_set_offset (job, afp_handle->offset);
g_vfs_job_succeeded (G_VFS_JOB (job));
@@ -757,7 +744,8 @@
GVfsBackendAfp *afp_backend = G_VFS_BACKEND_AFP (backend);
AfpHandle *afp_handle = (AfpHandle *)handle;
- if (afp_handle->type == AFP_HANDLE_TYPE_REPLACE_FILE_DIRECT)
+ if (afp_handle->type == AFP_HANDLE_TYPE_REPLACE_FILE_DIRECT ||
+ job->seek_type != G_SEEK_END)
{
switch (job->seek_type)
{
@@ -774,8 +762,6 @@
if (afp_handle->offset < 0)
afp_handle->offset = 0;
- else if (afp_handle->offset > afp_handle->size)
- afp_handle->offset = afp_handle->size;
g_vfs_job_seek_write_set_offset (job, afp_handle->offset);
g_vfs_job_succeeded (G_VFS_JOB (job));
@@ -813,23 +799,10 @@
size = g_file_info_get_size (info);
g_object_unref (info);
- switch (job->seek_type)
- {
- case G_SEEK_CUR:
- afp_handle->offset += job->requested_offset;
- break;
- case G_SEEK_SET:
- afp_handle->offset = job->requested_offset;
- break;
- case G_SEEK_END:
- afp_handle->offset = size + job->requested_offset;
- break;
- }
+ afp_handle->offset = size + job->requested_offset;
if (afp_handle->offset < 0)
afp_handle->offset = 0;
- else if (afp_handle->offset > size)
- afp_handle->offset = size;
g_vfs_job_seek_read_set_offset (job, afp_handle->offset);
g_vfs_job_succeeded (G_VFS_JOB (job));
@@ -845,10 +818,29 @@
GVfsBackendAfp *afp_backend = G_VFS_BACKEND_AFP (backend);
AfpHandle *afp_handle = (AfpHandle *)handle;
- g_vfs_afp_volume_get_fork_parms (afp_backend->volume, afp_handle->fork_refnum,
- AFP_FILE_BITMAP_EXT_DATA_FORK_LEN_BIT,
- G_VFS_JOB (job)->cancellable, seek_on_read_cb, job);
-
+ if (job->seek_type != G_SEEK_END)
+ {
+ switch (job->seek_type)
+ {
+ case G_SEEK_CUR:
+ afp_handle->offset += job->requested_offset;
+ break;
+ case G_SEEK_SET:
+ afp_handle->offset = job->requested_offset;
+ break;
+ }
+
+ if (afp_handle->offset < 0)
+ afp_handle->offset = 0;
+
+ g_vfs_job_seek_read_set_offset (job, afp_handle->offset);
+ g_vfs_job_succeeded (G_VFS_JOB (job));
+ }
+ else
+ g_vfs_afp_volume_get_fork_parms (afp_backend->volume, afp_handle->fork_refnum,
+ AFP_FILE_BITMAP_EXT_DATA_FORK_LEN_BIT,
+ G_VFS_JOB (job)->cancellable, seek_on_read_cb, job);
+
return TRUE;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/daemon/gvfsbackendarchive.c new/gvfs-1.18.3/daemon/gvfsbackendarchive.c
--- old/gvfs-1.18.2/daemon/gvfsbackendarchive.c 2013-09-30 10:47:02.000000000 +0200
+++ new/gvfs-1.18.3/daemon/gvfsbackendarchive.c 2013-11-08 14:23:39.000000000 +0100
@@ -83,6 +83,7 @@
GFile * file;
GFileInputStream *stream;
GVfsJob * job;
+ GVfsBackendArchive *backend;
GError * error;
guchar data[4096];
} GVfsArchive;
@@ -156,8 +157,9 @@
GVfsArchive *d = data;
DEBUG ("CLOSE\n");
- g_object_unref (d->stream);
- d->stream = NULL;
+ if (!d->stream)
+ g_vfs_backend_force_unmount (G_VFS_BACKEND (d->backend));
+ g_clear_object (&d->stream);
return ARCHIVE_OK;
}
@@ -205,6 +207,7 @@
{
gvfs_archive_pop_job (archive);
+ g_object_unref (archive->backend);
archive_read_free (archive->archive);
g_slice_free (GVfsArchive, archive);
}
@@ -217,6 +220,7 @@
d = g_slice_new0 (GVfsArchive);
+ d->backend = g_object_ref (ba);
d->file = ba->file;
gvfs_archive_push_job (d, job);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/daemon/gvfsbackendcdda.c new/gvfs-1.18.3/daemon/gvfsbackendcdda.c
--- old/gvfs-1.18.2/daemon/gvfsbackendcdda.c 2013-09-30 10:47:02.000000000 +0200
+++ new/gvfs-1.18.3/daemon/gvfsbackendcdda.c 2013-11-07 16:12:17.000000000 +0100
@@ -886,7 +886,7 @@
break;
}
- if (new_offset < 0 || new_offset >= read_handle->size)
+ if (new_offset < 0)
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_FAILED,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/daemon/gvfsbackenddav.c new/gvfs-1.18.3/daemon/gvfsbackenddav.c
--- old/gvfs-1.18.2/daemon/gvfsbackenddav.c 2013-04-04 14:49:02.000000000 +0200
+++ new/gvfs-1.18.3/daemon/gvfsbackenddav.c 2013-11-07 16:12:17.000000000 +0100
@@ -991,7 +991,7 @@
g_file_info_set_name (info, basename);
g_file_info_set_edit_name (info, basename);
- file_type = G_FILE_TYPE_UNKNOWN;
+ file_type = G_FILE_TYPE_REGULAR;
mime_type = NULL;
have_display_name = FALSE;
@@ -1013,7 +1013,6 @@
if (node_has_name (node, "resourcetype"))
{
file_type = parse_resourcetype (node);
- g_file_info_set_file_type (info, file_type);
}
else if (node_has_name (node, "displayname") && text)
{
@@ -1059,6 +1058,7 @@
}
}
+ g_file_info_set_file_type (info, file_type);
if (file_type == G_FILE_TYPE_DIRECTORY)
{
icon = g_themed_icon_new ("folder");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/daemon/gvfsbackendgphoto2.c new/gvfs-1.18.3/daemon/gvfsbackendgphoto2.c
--- old/gvfs-1.18.2/daemon/gvfsbackendgphoto2.c 2013-01-28 13:25:44.000000000 +0100
+++ new/gvfs-1.18.3/daemon/gvfsbackendgphoto2.c 2013-11-07 16:12:17.000000000 +0100
@@ -2024,7 +2024,7 @@
break;
}
- if (new_offset < 0 || new_offset > read_handle->size)
+ if (new_offset < 0)
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_FAILED,
@@ -3212,7 +3212,7 @@
break;
}
- if (new_offset < 0 || new_offset > write_handle->size)
+ if (new_offset < 0)
{
g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
G_IO_ERROR_FAILED,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/daemon/gvfsbackendhttp.c new/gvfs-1.18.3/daemon/gvfsbackendhttp.c
--- old/gvfs-1.18.2/daemon/gvfsbackendhttp.c 2013-09-30 10:47:02.000000000 +0200
+++ new/gvfs-1.18.3/daemon/gvfsbackendhttp.c 2013-11-08 14:23:39.000000000 +0100
@@ -505,7 +505,7 @@
{
GInputStream *stream;
GVfsJob *job;
- GError *error;
+ GError *error = NULL;
gboolean res;
job = G_VFS_JOB (user_data);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/daemon/gvfsbackendmtp.c new/gvfs-1.18.3/daemon/gvfsbackendmtp.c
--- old/gvfs-1.18.2/daemon/gvfsbackendmtp.c 2013-09-30 10:47:02.000000000 +0200
+++ new/gvfs-1.18.3/daemon/gvfsbackendmtp.c 2013-11-08 14:23:39.000000000 +0100
@@ -1830,7 +1830,7 @@
offset += old_offset;
}
- if (offset > size || offset < 0) {
+ if (offset < 0) {
g_vfs_job_failed_literal (G_VFS_JOB (job),
G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
_("End of stream"));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/daemon/gvfsbackendsftp.c new/gvfs-1.18.3/daemon/gvfsbackendsftp.c
--- old/gvfs-1.18.2/daemon/gvfsbackendsftp.c 2013-07-25 16:49:48.000000000 +0200
+++ new/gvfs-1.18.3/daemon/gvfsbackendsftp.c 2013-11-08 14:23:39.000000000 +0100
@@ -2539,24 +2539,11 @@
op_job = G_VFS_JOB_SEEK_READ (job);
- switch (op_job->seek_type)
- {
- case G_SEEK_CUR:
- handle->offset += op_job->requested_offset;
- break;
- case G_SEEK_SET:
- handle->offset = op_job->requested_offset;
- break;
- case G_SEEK_END:
- handle->offset = file_size + op_job->requested_offset;
- break;
- }
+ handle->offset = file_size + op_job->requested_offset;
if (handle->offset < 0)
handle->offset = 0;
- if (handle->offset > file_size)
- handle->offset = file_size;
-
+
g_vfs_job_seek_read_set_offset (op_job, handle->offset);
g_vfs_job_succeeded (job);
}
@@ -2572,11 +2559,31 @@
GVfsBackendSftp *op_backend = G_VFS_BACKEND_SFTP (backend);
GDataOutputStream *command;
- command = new_command_stream (op_backend,
- SSH_FXP_FSTAT);
- put_data_buffer (command, handle->raw_handle);
-
- queue_command_stream_and_free (op_backend, command, seek_read_fstat_reply, G_VFS_JOB (job), handle);
+ if (job->seek_type == G_SEEK_END)
+ {
+ command = new_command_stream (op_backend,
+ SSH_FXP_FSTAT);
+ put_data_buffer (command, handle->raw_handle);
+ queue_command_stream_and_free (op_backend, command, seek_read_fstat_reply, G_VFS_JOB (job), handle);
+ }
+ else
+ {
+ switch (job->seek_type)
+ {
+ case G_SEEK_CUR:
+ handle->offset += job->requested_offset;
+ break;
+ case G_SEEK_SET:
+ handle->offset = job->requested_offset;
+ break;
+ }
+
+ if (handle->offset < 0)
+ handle->offset = 0;
+
+ g_vfs_job_seek_read_set_offset (job, handle->offset);
+ g_vfs_job_succeeded (G_VFS_JOB (job));
+ }
return TRUE;
}
@@ -3612,24 +3619,11 @@
op_job = G_VFS_JOB_SEEK_WRITE (job);
- switch (op_job->seek_type)
- {
- case G_SEEK_CUR:
- handle->offset += op_job->requested_offset;
- break;
- case G_SEEK_SET:
- handle->offset = op_job->requested_offset;
- break;
- case G_SEEK_END:
- handle->offset = file_size + op_job->requested_offset;
- break;
- }
+ handle->offset = file_size + op_job->requested_offset;
if (handle->offset < 0)
handle->offset = 0;
- if (handle->offset > file_size)
- handle->offset = file_size;
-
+
g_vfs_job_seek_write_set_offset (op_job, handle->offset);
g_vfs_job_succeeded (job);
}
@@ -3645,11 +3639,31 @@
GVfsBackendSftp *op_backend = G_VFS_BACKEND_SFTP (backend);
GDataOutputStream *command;
- command = new_command_stream (op_backend,
- SSH_FXP_FSTAT);
- put_data_buffer (command, handle->raw_handle);
-
- queue_command_stream_and_free (op_backend, command, seek_write_fstat_reply, G_VFS_JOB (job), handle);
+ if (job->seek_type == G_SEEK_END)
+ {
+ command = new_command_stream (op_backend,
+ SSH_FXP_FSTAT);
+ put_data_buffer (command, handle->raw_handle);
+ queue_command_stream_and_free (op_backend, command, seek_write_fstat_reply, G_VFS_JOB (job), handle);
+ }
+ else
+ {
+ switch (job->seek_type)
+ {
+ case G_SEEK_CUR:
+ handle->offset += job->requested_offset;
+ break;
+ case G_SEEK_SET:
+ handle->offset = job->requested_offset;
+ break;
+ }
+
+ if (handle->offset < 0)
+ handle->offset = 0;
+
+ g_vfs_job_seek_write_set_offset (job, handle->offset);
+ g_vfs_job_succeeded (G_VFS_JOB (job));
+ }
return TRUE;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/daemon/main.c new/gvfs-1.18.3/daemon/main.c
--- old/gvfs-1.18.2/daemon/main.c 2013-07-25 16:49:48.000000000 +0200
+++ new/gvfs-1.18.3/daemon/main.c 2013-11-07 16:12:17.000000000 +0100
@@ -83,7 +83,7 @@
if (!no_fuse)
{
char *fuse_path;
- char *argv2[4];
+ char *argv2[6];
/* Use the old .gvfs location as fallback, not .cache/gvfs */
if (g_get_user_runtime_dir() == g_get_user_cache_dir ())
@@ -101,9 +101,11 @@
/* Opengroup. On system with the uClibc library this will badly */
/* hang the process. */
argv2[0] = LIBEXEC_DIR "/gvfsd-fuse";
- argv2[1] = "-f";
- argv2[2] = fuse_path;
- argv2[3] = NULL;
+ argv2[1] = fuse_path;
+ argv2[2] = "-f";
+ argv2[3] = "-o";
+ argv2[4] = "big_writes";
+ argv2[5] = NULL;
g_spawn_async (NULL,
argv2,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/m4/gtk-doc.m4 new/gvfs-1.18.3/m4/gtk-doc.m4
--- old/gvfs-1.18.2/m4/gtk-doc.m4 2013-10-03 13:43:33.000000000 +0200
+++ new/gvfs-1.18.3/m4/gtk-doc.m4 2013-11-08 14:39:28.000000000 +0100
@@ -11,12 +11,7 @@
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
dnl check for tools we added during development
- dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that
- dnl may not be writable by the user. Currently, automake requires that the
- dnl test name must end in '.test'.
- dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638
- AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test])
- AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check])
+ AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/m4/libtool.m4 new/gvfs-1.18.3/m4/libtool.m4
--- old/gvfs-1.18.2/m4/libtool.m4 2013-10-03 13:43:33.000000000 +0200
+++ new/gvfs-1.18.3/m4/libtool.m4 2013-11-08 14:39:28.000000000 +0100
@@ -1312,7 +1312,7 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -1326,7 +1326,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -1345,7 +1348,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/metadata/metadata-dbus.c new/gvfs-1.18.3/metadata/metadata-dbus.c
--- old/gvfs-1.18.2/metadata/metadata-dbus.c 2013-06-14 10:12:54.000000000 +0200
+++ new/gvfs-1.18.3/metadata/metadata-dbus.c 2013-11-07 16:13:31.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.37.2. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.39.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
@@ -1310,6 +1310,7 @@
static void gvfs_metadata_proxy_iface_init (GVfsMetadataIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsMetadataProxy, gvfs_metadata_proxy, G_TYPE_DBUS_PROXY,
+ G_ADD_PRIVATE (GVfsMetadataProxy)
G_IMPLEMENT_INTERFACE (GVFS_TYPE_METADATA, gvfs_metadata_proxy_iface_init));
static void
@@ -1409,7 +1410,7 @@
static void
gvfs_metadata_proxy_init (GVfsMetadataProxy *proxy)
{
- proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_TYPE_METADATA_PROXY, GVfsMetadataProxyPrivate);
+ proxy->priv = gvfs_metadata_proxy_get_instance_private (proxy);
g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_metadata_interface_info ());
}
@@ -1419,8 +1420,6 @@
GObjectClass *gobject_class;
GDBusProxyClass *proxy_class;
- g_type_class_add_private (klass, sizeof (GVfsMetadataProxyPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_metadata_proxy_finalize;
gobject_class->get_property = gvfs_metadata_proxy_get_property;
@@ -1831,6 +1830,7 @@
static void gvfs_metadata_skeleton_iface_init (GVfsMetadataIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsMetadataSkeleton, gvfs_metadata_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+ G_ADD_PRIVATE (GVfsMetadataSkeleton)
G_IMPLEMENT_INTERFACE (GVFS_TYPE_METADATA, gvfs_metadata_skeleton_iface_init));
static void
@@ -1848,7 +1848,7 @@
static void
gvfs_metadata_skeleton_init (GVfsMetadataSkeleton *skeleton)
{
- skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_TYPE_METADATA_SKELETON, GVfsMetadataSkeletonPrivate);
+ skeleton->priv = gvfs_metadata_skeleton_get_instance_private (skeleton);
g_mutex_init (&skeleton->priv->lock);
skeleton->priv->context = g_main_context_ref_thread_default ();
}
@@ -1859,8 +1859,6 @@
GObjectClass *gobject_class;
GDBusInterfaceSkeletonClass *skeleton_class;
- g_type_class_add_private (klass, sizeof (GVfsMetadataSkeletonPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_metadata_skeleton_finalize;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/metadata/metadata-dbus.h new/gvfs-1.18.3/metadata/metadata-dbus.h
--- old/gvfs-1.18.2/metadata/metadata-dbus.h 2013-06-14 10:12:54.000000000 +0200
+++ new/gvfs-1.18.3/metadata/metadata-dbus.h 2013-11-07 16:13:31.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.37.2. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.39.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/monitor/proxy/gvfsvolumemonitordbus.c new/gvfs-1.18.3/monitor/proxy/gvfsvolumemonitordbus.c
--- old/gvfs-1.18.2/monitor/proxy/gvfsvolumemonitordbus.c 2013-06-14 10:13:15.000000000 +0200
+++ new/gvfs-1.18.3/monitor/proxy/gvfsvolumemonitordbus.c 2013-11-07 16:13:43.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.37.2. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.39.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
@@ -4186,6 +4186,7 @@
static void gvfs_remote_volume_monitor_proxy_iface_init (GVfsRemoteVolumeMonitorIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsRemoteVolumeMonitorProxy, gvfs_remote_volume_monitor_proxy, G_TYPE_DBUS_PROXY,
+ G_ADD_PRIVATE (GVfsRemoteVolumeMonitorProxy)
G_IMPLEMENT_INTERFACE (GVFS_TYPE_REMOTE_VOLUME_MONITOR, gvfs_remote_volume_monitor_proxy_iface_init));
static void
@@ -4285,7 +4286,7 @@
static void
gvfs_remote_volume_monitor_proxy_init (GVfsRemoteVolumeMonitorProxy *proxy)
{
- proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_TYPE_REMOTE_VOLUME_MONITOR_PROXY, GVfsRemoteVolumeMonitorProxyPrivate);
+ proxy->priv = gvfs_remote_volume_monitor_proxy_get_instance_private (proxy);
g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_remote_volume_monitor_interface_info ());
}
@@ -4295,8 +4296,6 @@
GObjectClass *gobject_class;
GDBusProxyClass *proxy_class;
- g_type_class_add_private (klass, sizeof (GVfsRemoteVolumeMonitorProxyPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_remote_volume_monitor_proxy_finalize;
gobject_class->get_property = gvfs_remote_volume_monitor_proxy_get_property;
@@ -5197,6 +5196,7 @@
static void gvfs_remote_volume_monitor_skeleton_iface_init (GVfsRemoteVolumeMonitorIface *iface);
G_DEFINE_TYPE_WITH_CODE (GVfsRemoteVolumeMonitorSkeleton, gvfs_remote_volume_monitor_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
+ G_ADD_PRIVATE (GVfsRemoteVolumeMonitorSkeleton)
G_IMPLEMENT_INTERFACE (GVFS_TYPE_REMOTE_VOLUME_MONITOR, gvfs_remote_volume_monitor_skeleton_iface_init));
static void
@@ -5214,7 +5214,7 @@
static void
gvfs_remote_volume_monitor_skeleton_init (GVfsRemoteVolumeMonitorSkeleton *skeleton)
{
- skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_TYPE_REMOTE_VOLUME_MONITOR_SKELETON, GVfsRemoteVolumeMonitorSkeletonPrivate);
+ skeleton->priv = gvfs_remote_volume_monitor_skeleton_get_instance_private (skeleton);
g_mutex_init (&skeleton->priv->lock);
skeleton->priv->context = g_main_context_ref_thread_default ();
}
@@ -5225,8 +5225,6 @@
GObjectClass *gobject_class;
GDBusInterfaceSkeletonClass *skeleton_class;
- g_type_class_add_private (klass, sizeof (GVfsRemoteVolumeMonitorSkeletonPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gvfs_remote_volume_monitor_skeleton_finalize;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.18.2/monitor/proxy/gvfsvolumemonitordbus.h new/gvfs-1.18.3/monitor/proxy/gvfsvolumemonitordbus.h
--- old/gvfs-1.18.2/monitor/proxy/gvfsvolumemonitordbus.h 2013-06-14 10:13:15.000000000 +0200
+++ new/gvfs-1.18.3/monitor/proxy/gvfsvolumemonitordbus.h 2013-11-07 16:13:43.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.37.2. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.39.0. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org