commit gvfs for openSUSE:13.1

Hello community, here is the log from the commit of package gvfs for openSUSE:13.1 checked in at 2013-10-04 12:10:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/gvfs (Old) and /work/SRC/openSUSE:13.1/.gvfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gvfs" Changes: -------- --- /work/SRC/openSUSE:13.1/gvfs/gvfs.changes 2013-09-27 17:32:20.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.gvfs.new/gvfs.changes 2013-10-04 12:10:46.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Oct 3 12:50:22 UTC 2013 - dimstar@opensuse.org + +- Update to version 1.18.2: + + Fix a client side regression in 1.18.1 where apps would stop + responding. + + Fix a race condition in job handling that could cause large + copies to hang. + + Various fixes to the fuse implementation. + +------------------------------------------------------------------- Old: ---- gvfs-1.18.1.tar.xz New: ---- gvfs-1.18.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gvfs.spec ++++++ --- /var/tmp/diff_new_pack.npuYeF/_old 2013-10-04 12:10:46.000000000 +0200 +++ /var/tmp/diff_new_pack.npuYeF/_new 2013-10-04 12:10:46.000000000 +0200 @@ -20,7 +20,7 @@ %define with_cdda 1 Name: gvfs -Version: 1.18.1 +Version: 1.18.2 Release: 0 Summary: VFS functionality for GLib License: LGPL-2.0+ ++++++ gvfs-1.18.1.tar.xz -> gvfs-1.18.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/ChangeLog new/gvfs-1.18.2/ChangeLog --- old/gvfs-1.18.1/ChangeLog 2013-09-26 15:45:54.000000000 +0200 +++ new/gvfs-1.18.2/ChangeLog 2013-10-03 13:46:12.000000000 +0200 @@ -1,6 +1,114 @@ +commit 0e6434139716a63ce99e84525aa63890a6244378 +Author: Alexander Larsson +Date: 2013-10-03 + + Update for 1.18.2 + +M NEWS + +commit 33df4211825ad9ef36272a3e5cf987ea8f7cfe01 +Author: Alexander Larsson +Date: 2013-10-03 + + client: Don't user g_source_remove() on non-default main context + + We created a GSource, attached it to a non-default main context and + then removed it via g_source_remove, which removed the source with the + same id on the main context, which typically was the X fd, causing + everything to stop working! + + Non-default main contexts must use g_source_destroy() + + https://bugzilla.gnome.org/show_bug.cgi?id=708744 + +M client/gdaemonfileenumerator.c + +commit 50e927218909b87bce5bc792621b7db8c47538fc +Author: Ross Lagerwall +Date: 2013-09-25 + + fuse: Make file nonseekable if it actually is + + Instead of failing in read() with ENOTSUPP after the lseek on a + nonseekable stream succeeds, make the lseek fail with ESPIPE, as it + should. This is important for applications which test the return + value + of lseek to determine if the file descriptor is seekable. + +M client/gvfsfusedaemon.c + +commit 3e8cc556fe13a32518ebdd4c11a11f0006083844 +Author: Ross Lagerwall +Date: 2013-09-25 + + fuse: Enforce sync_read + + When running multithreaded, fuse can issue readahead requests out of + order which can cause subsequent reads to fail with ENOTSUPP + (if seeking + backward is not supported on the stream). + + Force readahead to occur in order to prevent this problem. + +M client/gvfsfusedaemon.c + +commit 64ccbde184653f2ce3ed3e5395eb336b379e5847 +Author: Ross Lagerwall +Date: 2013-09-25 + + fuse: Fix seek offset calculation + + Since fh->pos is already incremented by n_bytes_skipped, check if + offset == fh->pos. + + This error was hidden by the fact that the operation is retried when + -EIO is returned. When it was retried, the stream was already in the + correct position and so no seek operation was required. + +M client/gvfsfusedaemon.c + +commit bdc3babbe21e5fed06876db4d56d1b13915fe1cb +Author: Ross Lagerwall +Date: 2013-09-21 + + daemon: Emit signal before returning dbus value + + In gvfsjobopenforread.c, the dbus method returns a value in + create_reply + which eventually results in a GVfsJobRead job to be sent to the + backend. + This could happen before the "new-source" signal is emitted. If this + happens, the job is not queued because the "new_job" signal would not + have been connected to a job source yet. The read then hangs because + the GVfsJobRead is lost. + + This is hit often when performing large smb transfers (see + https://bugzilla.gnome.org/show_bug.cgi?id=697782 and + https://bugs.launchpad.net/ubuntu/+source/gvfs/+bug/1075923). + It can be reproduced by putting a small sleep before the + g_signal_emit_by_name call. + + Fix this by emitting the "new-source" signal *before* the dbus method + value is returned. This ensures that the "new_job" signal is set up + before any further jobs are sent. + + Note that the same problem and solution applies for + gvfsjobopenforwrite.c. + +M daemon/gvfsjobopenforread.c +M daemon/gvfsjobopenforwrite.c + +commit a1dd98ffa979441a0b9db3289287eaeab2c1aadf +Author: Ondrej Holy +Date: 2013-09-26 + + Post release version bump + +M configure.ac + commit 5d64580fb5ae224763b695f5f015cabd62a5e7f3 Author: Ondrej Holy -Date: 2013-09-26 +Date: 2013-09-26 Update NEWS for 1.18.1 release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/Makefile.in new/gvfs-1.18.2/Makefile.in --- old/gvfs-1.18.1/Makefile.in 2013-09-26 15:41:13.000000000 +0200 +++ new/gvfs-1.18.2/Makefile.in 2013-10-03 13:43:38.000000000 +0200 @@ -261,6 +261,7 @@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/NEWS new/gvfs-1.18.2/NEWS --- old/gvfs-1.18.1/NEWS 2013-09-26 15:39:27.000000000 +0200 +++ new/gvfs-1.18.2/NEWS 2013-10-03 13:45:30.000000000 +0200 @@ -1,3 +1,9 @@ +Major changes in 1.18.2 +======================= +* Fix a client side regression in 1.18.1 where apps would stop responding +* Fix a race condition in job handling that could cause large copies to hang +* Various fixes to the fuse implementation + Major changes in 1.18.1 ======================= * GVfsDaemon: Don't deadlock on cliend disconnect diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/aclocal.m4 new/gvfs-1.18.2/aclocal.m4 --- old/gvfs-1.18.1/aclocal.m4 2013-09-26 15:41:11.000000000 +0200 +++ new/gvfs-1.18.2/aclocal.m4 2013-09-30 11:02:48.000000000 +0200 @@ -1086,78 +1086,6 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -dnl -*- mode: autoconf -*- - -# serial 1 - -dnl Usage: -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -AC_DEFUN([GTK_DOC_CHECK], -[ - AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - - dnl check for tools we added during development - AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) - AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) - AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) - - dnl for overriding the documentation installation directory - AC_ARG_WITH([html-dir], - AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" - AC_SUBST([HTML_DIR]) - - dnl enable/disable documentation building - AC_ARG_ENABLE([gtk-doc], - AS_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [[default=no]]]),, - [enable_gtk_doc=no]) - - if test x$enable_gtk_doc = xyes; then - ifelse([$1],[], - [PKG_CHECK_EXISTS([gtk-doc],, - AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], - [PKG_CHECK_EXISTS([gtk-doc >= $1],, - AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) - dnl don't check for glib if we build glib - if test "x$PACKAGE_NAME" != "xglib"; then - dnl don't fail if someone does not have glib - PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) - fi - fi - - AC_MSG_CHECKING([whether to build gtk-doc documentation]) - AC_MSG_RESULT($enable_gtk_doc) - - dnl enable/disable output formats - AC_ARG_ENABLE([gtk-doc-html], - AS_HELP_STRING([--enable-gtk-doc-html], - [build documentation in html format [[default=yes]]]),, - [enable_gtk_doc_html=yes]) - AC_ARG_ENABLE([gtk-doc-pdf], - AS_HELP_STRING([--enable-gtk-doc-pdf], - [build documentation in pdf format [[default=no]]]),, - [enable_gtk_doc_pdf=no]) - - if test -z "$GTKDOC_MKPDF"; then - enable_gtk_doc_pdf=no - fi - - if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 - fi - AC_SUBST([AM_DEFAULT_VERBOSITY]) - - AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) - AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) - AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) -]) - dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) # serial 42 IT_PROG_INTLTOOL @@ -10841,3 +10769,80 @@ ] ) +dnl -*- mode: autoconf -*- + +# serial 1 + +dnl Usage: +dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +AC_DEFUN([GTK_DOC_CHECK], +[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + 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_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) + AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) + + dnl for overriding the documentation installation directory + AC_ARG_WITH([html-dir], + AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" + AC_SUBST([HTML_DIR]) + + dnl enable/disable documentation building + AC_ARG_ENABLE([gtk-doc], + AS_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [[default=no]]]),, + [enable_gtk_doc=no]) + + if test x$enable_gtk_doc = xyes; then + ifelse([$1],[], + [PKG_CHECK_EXISTS([gtk-doc],, + AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], + [PKG_CHECK_EXISTS([gtk-doc >= $1],, + AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) + fi + fi + + AC_MSG_CHECKING([whether to build gtk-doc documentation]) + AC_MSG_RESULT($enable_gtk_doc) + + dnl enable/disable output formats + AC_ARG_ENABLE([gtk-doc-html], + AS_HELP_STRING([--enable-gtk-doc-html], + [build documentation in html format [[default=yes]]]),, + [enable_gtk_doc_html=yes]) + AC_ARG_ENABLE([gtk-doc-pdf], + AS_HELP_STRING([--enable-gtk-doc-pdf], + [build documentation in pdf format [[default=no]]]),, + [enable_gtk_doc_pdf=no]) + + if test -z "$GTKDOC_MKPDF"; then + enable_gtk_doc_pdf=no + fi + + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + AC_SUBST([AM_DEFAULT_VERBOSITY]) + + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) + AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) + AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) +]) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/client/Makefile.in new/gvfs-1.18.2/client/Makefile.in --- old/gvfs-1.18.1/client/Makefile.in 2013-09-26 15:41:13.000000000 +0200 +++ new/gvfs-1.18.2/client/Makefile.in 2013-10-03 13:43:38.000000000 +0200 @@ -299,6 +299,7 @@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/client/gdaemonfileenumerator.c new/gvfs-1.18.2/client/gdaemonfileenumerator.c --- old/gvfs-1.18.1/client/gdaemonfileenumerator.c 2013-09-26 15:17:55.000000000 +0200 +++ new/gvfs-1.18.2/client/gdaemonfileenumerator.c 2013-10-03 13:41:16.000000000 +0200 @@ -61,7 +61,7 @@ GSimpleAsyncResult *async_res; GMainLoop *next_files_mainloop; GMainContext *next_files_context; - guint next_files_sync_timeout_tag; + GSource *next_files_sync_timeout_source; GMutex next_files_mutex; GFileAttributeMatcher *matcher; @@ -102,7 +102,7 @@ g_list_free_full (infos, g_object_unref); } -static guint +static GSource * add_timeout_for_context (GMainContext *context, guint32 interval, GSourceFunc function, @@ -116,10 +116,9 @@ source = g_timeout_source_new (interval); g_source_set_callback (source, function, data, NULL); - id = g_source_attach (source, context); - g_source_unref (source); + g_source_attach (source, context); - return id; + return source; } @@ -486,7 +485,7 @@ { GDaemonFileEnumerator *daemon = G_DAEMON_FILE_ENUMERATOR (enumerator); GFileInfo *info; - + if (daemon->sync_connection == NULL) { /* The enumerator was initialized by an async call, so responses will @@ -509,14 +508,15 @@ g_mutex_unlock (&daemon->next_files_mutex); g_main_context_push_thread_default (daemon->next_files_context); - daemon->next_files_sync_timeout_tag = add_timeout_for_context (daemon->next_files_context, - G_VFS_DBUS_TIMEOUT_MSECS, - sync_timeout, daemon); + daemon->next_files_sync_timeout_source = add_timeout_for_context (daemon->next_files_context, + G_VFS_DBUS_TIMEOUT_MSECS, + sync_timeout, daemon); g_main_loop_run (daemon->next_files_mainloop); g_main_context_pop_thread_default (daemon->next_files_context); g_mutex_lock (&daemon->next_files_mutex); - g_source_remove (daemon->next_files_sync_timeout_tag); + g_source_destroy (daemon->next_files_sync_timeout_source); + g_source_unref (daemon->next_files_sync_timeout_source); g_main_loop_unref (daemon->next_files_mainloop); daemon->next_files_mainloop = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/client/gvfsfusedaemon.c new/gvfs-1.18.2/client/gvfsfusedaemon.c --- old/gvfs-1.18.1/client/gvfsfusedaemon.c 2013-09-16 18:23:24.000000000 +0200 +++ new/gvfs-1.18.2/client/gvfsfusedaemon.c 2013-10-03 11:55:12.000000000 +0200 @@ -998,6 +998,9 @@ else result = setup_input_stream (file, fh); + if (fh->stream) + fi->nonseekable = !g_seekable_can_seek (G_SEEKABLE (fh->stream)); + g_mutex_unlock (&fh->mutex); /* The added reference to the file handle is released in vfs_release() */ @@ -1198,7 +1201,7 @@ if (n_bytes_skipped > 0) fh->pos += n_bytes_skipped; - if (n_bytes_skipped != offset - fh->pos) + if (offset != fh->pos) { if (error) { @@ -2391,6 +2394,9 @@ /* Indicate O_TRUNC support for open() */ conn->want |= FUSE_CAP_ATOMIC_O_TRUNC; + /* Prevent out-of-order readahead */ + conn->async_read = 0; + return NULL; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/common/Makefile.in new/gvfs-1.18.2/common/Makefile.in --- old/gvfs-1.18.1/common/Makefile.in 2013-09-26 15:41:13.000000000 +0200 +++ new/gvfs-1.18.2/common/Makefile.in 2013-10-03 13:43:38.000000000 +0200 @@ -293,6 +293,7 @@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/common/gvfsdbus.c new/gvfs-1.18.2/common/gvfsdbus.c --- old/gvfs-1.18.1/common/gvfsdbus.c 2013-09-26 15:41:20.000000000 +0200 +++ new/gvfs-1.18.2/common/gvfsdbus.c 2013-06-14 10:12:50.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.37.8. DO NOT EDIT. + * Generated by gdbus-codegen 2.37.2. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ @@ -858,7 +858,6 @@ 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 @@ -958,7 +957,7 @@ static void gvfs_dbus_daemon_proxy_init (GVfsDBusDaemonProxy *proxy) { - proxy->priv = gvfs_dbus_daemon_proxy_get_instance_private (proxy); + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_DAEMON_PROXY, GVfsDBusDaemonProxyPrivate); g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_daemon_interface_info ()); } @@ -968,6 +967,8 @@ 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; @@ -1378,7 +1379,6 @@ 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 = gvfs_dbus_daemon_skeleton_get_instance_private (skeleton); + skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_DAEMON_SKELETON, GVfsDBusDaemonSkeletonPrivate); g_mutex_init (&skeleton->priv->lock); skeleton->priv->context = g_main_context_ref_thread_default (); } @@ -1407,6 +1407,8 @@ 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; @@ -1754,7 +1756,6 @@ 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 @@ -1854,7 +1855,7 @@ static void gvfs_dbus_spawner_proxy_init (GVfsDBusSpawnerProxy *proxy) { - proxy->priv = gvfs_dbus_spawner_proxy_get_instance_private (proxy); + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_SPAWNER_PROXY, GVfsDBusSpawnerProxyPrivate); g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_spawner_interface_info ()); } @@ -1864,6 +1865,8 @@ 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; @@ -2274,7 +2277,6 @@ 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 @@ -2292,7 +2294,7 @@ static void gvfs_dbus_spawner_skeleton_init (GVfsDBusSpawnerSkeleton *skeleton) { - skeleton->priv = gvfs_dbus_spawner_skeleton_get_instance_private (skeleton); + skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_SPAWNER_SKELETON, GVfsDBusSpawnerSkeletonPrivate); g_mutex_init (&skeleton->priv->lock); skeleton->priv->context = g_main_context_ref_thread_default (); } @@ -2303,6 +2305,8 @@ 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; @@ -4338,7 +4342,6 @@ 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 @@ -4438,7 +4441,7 @@ static void gvfs_dbus_mount_tracker_proxy_init (GVfsDBusMountTrackerProxy *proxy) { - proxy->priv = gvfs_dbus_mount_tracker_proxy_get_instance_private (proxy); + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_MOUNT_TRACKER_PROXY, GVfsDBusMountTrackerProxyPrivate); g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_mount_tracker_interface_info ()); } @@ -4448,6 +4451,8 @@ 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; @@ -4906,7 +4911,6 @@ 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 @@ -4924,7 +4928,7 @@ static void gvfs_dbus_mount_tracker_skeleton_init (GVfsDBusMountTrackerSkeleton *skeleton) { - skeleton->priv = gvfs_dbus_mount_tracker_skeleton_get_instance_private (skeleton); + skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_MOUNT_TRACKER_SKELETON, GVfsDBusMountTrackerSkeletonPrivate); g_mutex_init (&skeleton->priv->lock); skeleton->priv->context = g_main_context_ref_thread_default (); } @@ -4935,6 +4939,8 @@ 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; @@ -5284,7 +5290,6 @@ 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 @@ -5384,7 +5389,7 @@ static void gvfs_dbus_mountable_proxy_init (GVfsDBusMountableProxy *proxy) { - proxy->priv = gvfs_dbus_mountable_proxy_get_instance_private (proxy); + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_MOUNTABLE_PROXY, GVfsDBusMountableProxyPrivate); g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_mountable_interface_info ()); } @@ -5394,6 +5399,8 @@ 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; @@ -5804,7 +5811,6 @@ 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 @@ -5822,7 +5828,7 @@ static void gvfs_dbus_mountable_skeleton_init (GVfsDBusMountableSkeleton *skeleton) { - skeleton->priv = gvfs_dbus_mountable_skeleton_get_instance_private (skeleton); + skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_MOUNTABLE_SKELETON, GVfsDBusMountableSkeletonPrivate); g_mutex_init (&skeleton->priv->lock); skeleton->priv->context = g_main_context_ref_thread_default (); } @@ -5833,6 +5839,8 @@ 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; @@ -7242,7 +7250,6 @@ 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 @@ -7342,7 +7349,7 @@ static void gvfs_dbus_mount_operation_proxy_init (GVfsDBusMountOperationProxy *proxy) { - proxy->priv = gvfs_dbus_mount_operation_proxy_get_instance_private (proxy); + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_MOUNT_OPERATION_PROXY, GVfsDBusMountOperationProxyPrivate); g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_mount_operation_interface_info ()); } @@ -7352,6 +7359,8 @@ 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; @@ -7762,7 +7771,6 @@ 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 @@ -7780,7 +7788,7 @@ static void gvfs_dbus_mount_operation_skeleton_init (GVfsDBusMountOperationSkeleton *skeleton) { - skeleton->priv = gvfs_dbus_mount_operation_skeleton_get_instance_private (skeleton); + skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_MOUNT_OPERATION_SKELETON, GVfsDBusMountOperationSkeletonPrivate); g_mutex_init (&skeleton->priv->lock); skeleton->priv->context = g_main_context_ref_thread_default (); } @@ -7791,6 +7799,8 @@ 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; @@ -13993,7 +14003,6 @@ 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 @@ -14093,7 +14102,7 @@ static void gvfs_dbus_mount_proxy_init (GVfsDBusMountProxy *proxy) { - proxy->priv = gvfs_dbus_mount_proxy_get_instance_private (proxy); + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_MOUNT_PROXY, GVfsDBusMountProxyPrivate); g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_mount_interface_info ()); } @@ -14103,6 +14112,8 @@ 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; @@ -14513,7 +14524,6 @@ 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 @@ -14531,7 +14541,7 @@ static void gvfs_dbus_mount_skeleton_init (GVfsDBusMountSkeleton *skeleton) { - skeleton->priv = gvfs_dbus_mount_skeleton_get_instance_private (skeleton); + skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_MOUNT_SKELETON, GVfsDBusMountSkeletonPrivate); g_mutex_init (&skeleton->priv->lock); skeleton->priv->context = g_main_context_ref_thread_default (); } @@ -14542,6 +14552,8 @@ 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; @@ -14998,7 +15010,6 @@ 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 @@ -15098,7 +15109,7 @@ static void gvfs_dbus_enumerator_proxy_init (GVfsDBusEnumeratorProxy *proxy) { - proxy->priv = gvfs_dbus_enumerator_proxy_get_instance_private (proxy); + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_ENUMERATOR_PROXY, GVfsDBusEnumeratorProxyPrivate); g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_enumerator_interface_info ()); } @@ -15108,6 +15119,8 @@ 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; @@ -15518,7 +15531,6 @@ 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 @@ -15536,7 +15548,7 @@ static void gvfs_dbus_enumerator_skeleton_init (GVfsDBusEnumeratorSkeleton *skeleton) { - skeleton->priv = gvfs_dbus_enumerator_skeleton_get_instance_private (skeleton); + skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_ENUMERATOR_SKELETON, GVfsDBusEnumeratorSkeletonPrivate); g_mutex_init (&skeleton->priv->lock); skeleton->priv->context = g_main_context_ref_thread_default (); } @@ -15547,6 +15559,8 @@ 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; @@ -15875,7 +15889,6 @@ 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 @@ -15975,7 +15988,7 @@ static void gvfs_dbus_progress_proxy_init (GVfsDBusProgressProxy *proxy) { - proxy->priv = gvfs_dbus_progress_proxy_get_instance_private (proxy); + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_PROGRESS_PROXY, GVfsDBusProgressProxyPrivate); g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_progress_interface_info ()); } @@ -15985,6 +15998,8 @@ 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; @@ -16395,7 +16410,6 @@ 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 @@ -16413,7 +16427,7 @@ static void gvfs_dbus_progress_skeleton_init (GVfsDBusProgressSkeleton *skeleton) { - skeleton->priv = gvfs_dbus_progress_skeleton_get_instance_private (skeleton); + skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_PROGRESS_SKELETON, GVfsDBusProgressSkeletonPrivate); g_mutex_init (&skeleton->priv->lock); skeleton->priv->context = g_main_context_ref_thread_default (); } @@ -16424,6 +16438,8 @@ 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; @@ -16904,7 +16920,6 @@ 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 @@ -17004,7 +17019,7 @@ static void gvfs_dbus_monitor_proxy_init (GVfsDBusMonitorProxy *proxy) { - proxy->priv = gvfs_dbus_monitor_proxy_get_instance_private (proxy); + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_MONITOR_PROXY, GVfsDBusMonitorProxyPrivate); g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_monitor_interface_info ()); } @@ -17014,6 +17029,8 @@ 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; @@ -17424,7 +17441,6 @@ 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 @@ -17442,7 +17458,7 @@ static void gvfs_dbus_monitor_skeleton_init (GVfsDBusMonitorSkeleton *skeleton) { - skeleton->priv = gvfs_dbus_monitor_skeleton_get_instance_private (skeleton); + skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_MONITOR_SKELETON, GVfsDBusMonitorSkeletonPrivate); g_mutex_init (&skeleton->priv->lock); skeleton->priv->context = g_main_context_ref_thread_default (); } @@ -17453,6 +17469,8 @@ 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; @@ -17838,7 +17856,6 @@ 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 @@ -17938,7 +17955,7 @@ static void gvfs_dbus_monitor_client_proxy_init (GVfsDBusMonitorClientProxy *proxy) { - proxy->priv = gvfs_dbus_monitor_client_proxy_get_instance_private (proxy); + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_DBUS_TYPE_MONITOR_CLIENT_PROXY, GVfsDBusMonitorClientProxyPrivate); g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_dbus_monitor_client_interface_info ()); } @@ -17948,6 +17965,8 @@ 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; @@ -18358,7 +18377,6 @@ 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 @@ -18376,7 +18394,7 @@ static void gvfs_dbus_monitor_client_skeleton_init (GVfsDBusMonitorClientSkeleton *skeleton) { - skeleton->priv = gvfs_dbus_monitor_client_skeleton_get_instance_private (skeleton); + skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_DBUS_TYPE_MONITOR_CLIENT_SKELETON, GVfsDBusMonitorClientSkeletonPrivate); g_mutex_init (&skeleton->priv->lock); skeleton->priv->context = g_main_context_ref_thread_default (); } @@ -18387,6 +18405,8 @@ 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' old/gvfs-1.18.1/common/gvfsdbus.h new/gvfs-1.18.2/common/gvfsdbus.h --- old/gvfs-1.18.1/common/gvfsdbus.h 2013-09-26 15:41:20.000000000 +0200 +++ new/gvfs-1.18.2/common/gvfsdbus.h 2013-06-14 10:12:50.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.37.8. DO NOT EDIT. + * Generated by gdbus-codegen 2.37.2. 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' old/gvfs-1.18.1/configure new/gvfs-1.18.2/configure --- old/gvfs-1.18.1/configure 2013-09-26 15:41:14.000000000 +0200 +++ new/gvfs-1.18.2/configure 2013-10-03 13:43:40.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gvfs 1.18.1. +# Generated by GNU Autoconf 2.69 for gvfs 1.18.2. # # Report bugs to http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='gvfs' PACKAGE_TARNAME='gvfs' -PACKAGE_VERSION='1.18.1' -PACKAGE_STRING='gvfs 1.18.1' +PACKAGE_VERSION='1.18.2' +PACKAGE_STRING='gvfs 1.18.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs' PACKAGE_URL='' @@ -808,6 +808,7 @@ HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE +GTKDOC_CHECK_PATH GTKDOC_CHECK GSETTINGS_RULES GLIB_COMPILE_SCHEMAS @@ -1587,7 +1588,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gvfs 1.18.1 to adapt to many kinds of systems. +\`configure' configures gvfs 1.18.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1657,7 +1658,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gvfs 1.18.1:";; + short | recursive ) echo "Configuration of gvfs 1.18.2:";; esac cat <<\_ACEOF @@ -1892,7 +1893,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gvfs configure 1.18.1 +gvfs configure 1.18.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2372,7 +2373,7 @@ 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.18.1, which was +It was created by gvfs $as_me 1.18.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3235,7 +3236,7 @@ # Define the identity of the package. PACKAGE='gvfs' - VERSION='1.18.1' + VERSION='1.18.2' cat >>confdefs.h <<_ACEOF @@ -13638,16 +13639,53 @@ - # Extract the first word of "gtkdoc-check", so it can be a program name with args. + # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; 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_GTKDOC_CHECK+:} false; then : +if ${ac_cv_prog_GTKDOC_CHECK+:} false; then : $as_echo_n "(cached) " >&6 else - case $GTKDOC_CHECK in + if test -n "$GTKDOC_CHECK"; then + ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test. +else +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_prog_GTKDOC_CHECK="gtkdoc-check.test" + $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 + +fi +fi +GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK +if test -n "$GTKDOC_CHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +$as_echo "$GTKDOC_CHECK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. +set dummy gtkdoc-check; 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_GTKDOC_CHECK_PATH+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GTKDOC_CHECK_PATH in [\\/]* | ?:[\\/]*) - ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. + ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -13657,7 +13695,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GTKDOC_CHECK_PATH="$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 @@ -13668,10 +13706,10 @@ ;; esac fi -GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK -if test -n "$GTKDOC_CHECK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 -$as_echo "$GTKDOC_CHECK" >&6; } +GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH +if test -n "$GTKDOC_CHECK_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5 +$as_echo "$GTKDOC_CHECK_PATH" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -20144,7 +20182,7 @@ # 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.18.1, which was +This file was extended by gvfs $as_me 1.18.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20210,7 +20248,7 @@ 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.18.1 +gvfs config.status 1.18.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/configure.ac new/gvfs-1.18.2/configure.ac --- old/gvfs-1.18.1/configure.ac 2013-09-26 15:40:03.000000000 +0200 +++ new/gvfs-1.18.2/configure.ac 2013-09-30 10:47:02.000000000 +0200 @@ -1,6 +1,6 @@ AC_PREREQ([2.64]) -AC_INIT([gvfs],[1.18.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs]) +AC_INIT([gvfs],[1.18.2],[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' old/gvfs-1.18.1/daemon/Makefile.in new/gvfs-1.18.2/daemon/Makefile.in --- old/gvfs-1.18.1/daemon/Makefile.in 2013-09-26 15:41:13.000000000 +0200 +++ new/gvfs-1.18.2/daemon/Makefile.in 2013-10-03 13:43:38.000000000 +0200 @@ -556,6 +556,7 @@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/daemon/gvfsjobopenforread.c new/gvfs-1.18.2/daemon/gvfsjobopenforread.c --- old/gvfs-1.18.1/daemon/gvfsjobopenforread.c 2013-06-25 11:24:48.000000000 +0200 +++ new/gvfs-1.18.2/daemon/gvfsjobopenforread.c 2013-09-30 10:48:09.000000000 +0200 @@ -194,6 +194,12 @@ g_error_free (error); } + g_vfs_channel_set_backend_handle (G_VFS_CHANNEL (channel), open_job->backend_handle); + open_job->backend_handle = NULL; + open_job->read_channel = channel; + + g_signal_emit_by_name (job, "new-source", channel); + if (open_job->read_icon) gvfs_dbus_mount_complete_open_icon_for_read (object, invocation, fd_list, g_variant_new_handle (fd_id), @@ -206,12 +212,6 @@ /* FIXME: this could cause issues as long as fd_list closes all its fd's when it's finalized */ close (remote_fd); g_object_unref (fd_list); - - g_vfs_channel_set_backend_handle (G_VFS_CHANNEL (channel), open_job->backend_handle); - open_job->backend_handle = NULL; - open_job->read_channel = channel; - - g_signal_emit_by_name (job, "new-source", open_job->read_channel); } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/daemon/gvfsjobopenforwrite.c new/gvfs-1.18.2/daemon/gvfsjobopenforwrite.c --- old/gvfs-1.18.1/daemon/gvfsjobopenforwrite.c 2013-06-25 11:24:48.000000000 +0200 +++ new/gvfs-1.18.2/daemon/gvfsjobopenforwrite.c 2013-09-30 10:48:09.000000000 +0200 @@ -278,6 +278,12 @@ g_error_free (error); } + g_vfs_channel_set_backend_handle (G_VFS_CHANNEL (channel), open_job->backend_handle); + open_job->backend_handle = NULL; + open_job->write_channel = channel; + + g_signal_emit_by_name (job, "new-source", open_job->write_channel); + gvfs_dbus_mount_complete_open_for_write (object, invocation, fd_list, g_variant_new_handle (fd_id), open_job->can_seek, @@ -285,12 +291,6 @@ close (remote_fd); g_object_unref (fd_list); - - g_vfs_channel_set_backend_handle (G_VFS_CHANNEL (channel), open_job->backend_handle); - open_job->backend_handle = NULL; - open_job->write_channel = channel; - - g_signal_emit_by_name (job, "new-source", open_job->write_channel); } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/daemon/trashlib/Makefile.in new/gvfs-1.18.2/daemon/trashlib/Makefile.in --- old/gvfs-1.18.1/daemon/trashlib/Makefile.in 2013-09-26 15:41:13.000000000 +0200 +++ new/gvfs-1.18.2/daemon/trashlib/Makefile.in 2013-10-03 13:43:38.000000000 +0200 @@ -234,6 +234,7 @@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/m4/gtk-doc.m4 new/gvfs-1.18.2/m4/gtk-doc.m4 --- old/gvfs-1.18.1/m4/gtk-doc.m4 2013-09-26 15:41:08.000000000 +0200 +++ new/gvfs-1.18.2/m4/gtk-doc.m4 2013-10-03 13:43:33.000000000 +0200 @@ -11,7 +11,12 @@ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first dnl check for tools we added during development - AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) + 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_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/man/Makefile.in new/gvfs-1.18.2/man/Makefile.in --- old/gvfs-1.18.1/man/Makefile.in 2013-09-26 15:41:13.000000000 +0200 +++ new/gvfs-1.18.2/man/Makefile.in 2013-10-03 13:43:38.000000000 +0200 @@ -207,6 +207,7 @@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/metadata/Makefile.in new/gvfs-1.18.2/metadata/Makefile.in --- old/gvfs-1.18.1/metadata/Makefile.in 2013-09-26 15:41:13.000000000 +0200 +++ new/gvfs-1.18.2/metadata/Makefile.in 2013-10-03 13:43:38.000000000 +0200 @@ -296,6 +296,7 @@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/metadata/metadata-dbus.c new/gvfs-1.18.2/metadata/metadata-dbus.c --- old/gvfs-1.18.1/metadata/metadata-dbus.c 2013-09-26 15:41:21.000000000 +0200 +++ new/gvfs-1.18.2/metadata/metadata-dbus.c 2013-06-14 10:12:54.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.37.8. DO NOT EDIT. + * Generated by gdbus-codegen 2.37.2. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ @@ -1310,7 +1310,6 @@ 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 @@ -1410,7 +1409,7 @@ static void gvfs_metadata_proxy_init (GVfsMetadataProxy *proxy) { - proxy->priv = gvfs_metadata_proxy_get_instance_private (proxy); + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_TYPE_METADATA_PROXY, GVfsMetadataProxyPrivate); g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_metadata_interface_info ()); } @@ -1420,6 +1419,8 @@ 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; @@ -1830,7 +1831,6 @@ 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 = gvfs_metadata_skeleton_get_instance_private (skeleton); + skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_TYPE_METADATA_SKELETON, GVfsMetadataSkeletonPrivate); g_mutex_init (&skeleton->priv->lock); skeleton->priv->context = g_main_context_ref_thread_default (); } @@ -1859,6 +1859,8 @@ 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' old/gvfs-1.18.1/metadata/metadata-dbus.h new/gvfs-1.18.2/metadata/metadata-dbus.h --- old/gvfs-1.18.1/metadata/metadata-dbus.h 2013-09-26 15:41:21.000000000 +0200 +++ new/gvfs-1.18.2/metadata/metadata-dbus.h 2013-06-14 10:12:54.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.37.8. DO NOT EDIT. + * Generated by gdbus-codegen 2.37.2. 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' old/gvfs-1.18.1/monitor/Makefile.in new/gvfs-1.18.2/monitor/Makefile.in --- old/gvfs-1.18.1/monitor/Makefile.in 2013-09-26 15:41:13.000000000 +0200 +++ new/gvfs-1.18.2/monitor/Makefile.in 2013-10-03 13:43:38.000000000 +0200 @@ -241,6 +241,7 @@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/monitor/afc/Makefile.in new/gvfs-1.18.2/monitor/afc/Makefile.in --- old/gvfs-1.18.1/monitor/afc/Makefile.in 2013-09-26 15:41:13.000000000 +0200 +++ new/gvfs-1.18.2/monitor/afc/Makefile.in 2013-10-03 13:43:38.000000000 +0200 @@ -272,6 +272,7 @@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/monitor/gdu/Makefile.in new/gvfs-1.18.2/monitor/gdu/Makefile.in --- old/gvfs-1.18.1/monitor/gdu/Makefile.in 2013-09-26 15:41:13.000000000 +0200 +++ new/gvfs-1.18.2/monitor/gdu/Makefile.in 2013-10-03 13:43:38.000000000 +0200 @@ -276,6 +276,7 @@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/monitor/goa/Makefile.in new/gvfs-1.18.2/monitor/goa/Makefile.in --- old/gvfs-1.18.1/monitor/goa/Makefile.in 2013-09-26 15:41:14.000000000 +0200 +++ new/gvfs-1.18.2/monitor/goa/Makefile.in 2013-10-03 13:43:39.000000000 +0200 @@ -272,6 +272,7 @@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/monitor/gphoto2/Makefile.in new/gvfs-1.18.2/monitor/gphoto2/Makefile.in --- old/gvfs-1.18.1/monitor/gphoto2/Makefile.in 2013-09-26 15:41:14.000000000 +0200 +++ new/gvfs-1.18.2/monitor/gphoto2/Makefile.in 2013-10-03 13:43:39.000000000 +0200 @@ -292,6 +292,7 @@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/monitor/hal/Makefile.in new/gvfs-1.18.2/monitor/hal/Makefile.in --- old/gvfs-1.18.1/monitor/hal/Makefile.in 2013-09-26 15:41:14.000000000 +0200 +++ new/gvfs-1.18.2/monitor/hal/Makefile.in 2013-10-03 13:43:39.000000000 +0200 @@ -281,6 +281,7 @@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/monitor/mtp/Makefile.in new/gvfs-1.18.2/monitor/mtp/Makefile.in --- old/gvfs-1.18.1/monitor/mtp/Makefile.in 2013-09-26 15:41:14.000000000 +0200 +++ new/gvfs-1.18.2/monitor/mtp/Makefile.in 2013-10-03 13:43:39.000000000 +0200 @@ -272,6 +272,7 @@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/monitor/proxy/Makefile.in new/gvfs-1.18.2/monitor/proxy/Makefile.in --- old/gvfs-1.18.1/monitor/proxy/Makefile.in 2013-09-26 15:41:14.000000000 +0200 +++ new/gvfs-1.18.2/monitor/proxy/Makefile.in 2013-10-03 13:43:39.000000000 +0200 @@ -284,6 +284,7 @@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/monitor/proxy/gvfsvolumemonitordbus.c new/gvfs-1.18.2/monitor/proxy/gvfsvolumemonitordbus.c --- old/gvfs-1.18.1/monitor/proxy/gvfsvolumemonitordbus.c 2013-09-26 15:41:33.000000000 +0200 +++ new/gvfs-1.18.2/monitor/proxy/gvfsvolumemonitordbus.c 2013-06-14 10:13:15.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.37.8. DO NOT EDIT. + * Generated by gdbus-codegen 2.37.2. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ @@ -4186,7 +4186,6 @@ 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 @@ -4286,7 +4285,7 @@ static void gvfs_remote_volume_monitor_proxy_init (GVfsRemoteVolumeMonitorProxy *proxy) { - proxy->priv = gvfs_remote_volume_monitor_proxy_get_instance_private (proxy); + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, GVFS_TYPE_REMOTE_VOLUME_MONITOR_PROXY, GVfsRemoteVolumeMonitorProxyPrivate); g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), gvfs_remote_volume_monitor_interface_info ()); } @@ -4296,6 +4295,8 @@ 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; @@ -5196,7 +5197,6 @@ 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 = gvfs_remote_volume_monitor_skeleton_get_instance_private (skeleton); + skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, GVFS_TYPE_REMOTE_VOLUME_MONITOR_SKELETON, GVfsRemoteVolumeMonitorSkeletonPrivate); g_mutex_init (&skeleton->priv->lock); skeleton->priv->context = g_main_context_ref_thread_default (); } @@ -5225,6 +5225,8 @@ 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' old/gvfs-1.18.1/monitor/proxy/gvfsvolumemonitordbus.h new/gvfs-1.18.2/monitor/proxy/gvfsvolumemonitordbus.h --- old/gvfs-1.18.1/monitor/proxy/gvfsvolumemonitordbus.h 2013-09-26 15:41:33.000000000 +0200 +++ new/gvfs-1.18.2/monitor/proxy/gvfsvolumemonitordbus.h 2013-06-14 10:13:15.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.37.8. DO NOT EDIT. + * Generated by gdbus-codegen 2.37.2. 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' old/gvfs-1.18.1/monitor/udisks2/Makefile.in new/gvfs-1.18.2/monitor/udisks2/Makefile.in --- old/gvfs-1.18.1/monitor/udisks2/Makefile.in 2013-09-26 15:41:14.000000000 +0200 +++ new/gvfs-1.18.2/monitor/udisks2/Makefile.in 2013-10-03 13:43:39.000000000 +0200 @@ -277,6 +277,7 @@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/programs/Makefile.in new/gvfs-1.18.2/programs/Makefile.in --- old/gvfs-1.18.1/programs/Makefile.in 2013-09-26 15:41:14.000000000 +0200 +++ new/gvfs-1.18.2/programs/Makefile.in 2013-10-03 13:43:39.000000000 +0200 @@ -331,6 +331,7 @@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.18.1/test/Makefile.in new/gvfs-1.18.2/test/Makefile.in --- old/gvfs-1.18.1/test/Makefile.in 2013-09-26 15:41:14.000000000 +0200 +++ new/gvfs-1.18.2/test/Makefile.in 2013-10-03 13:43:39.000000000 +0200 @@ -257,6 +257,7 @@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org