[gvfs: 52/54] Merge branch 'gdbus-core'

[Tomas Bzatek <tbzatek src gnome org>]

commit fe7e66b5efbc0d2589e326c7ca10fd9451e4e894
Merge: 071e9b4 7a71fe8
Author: Tomas Bzatek <tbzatek redhat com>
Date:   Tue Jul 31 17:12:28 2012 +0200

    Merge branch 'gdbus-core'

 .gitignore                       |    1 +
 client/Makefile.am               |    2 +
 client/gdaemonfile.c             | 3257 ++++++++++++++++++++++----------------
 client/gdaemonfileenumerator.c   |  333 +++--
 client/gdaemonfileenumerator.h   |    8 +-
 client/gdaemonfilemonitor.c      |  316 +++--
 client/gdaemonmount.c            |  194 ++-
 client/gdaemonvfs.c              |  404 ++---
 client/gdaemonvfs.h              |    7 +-
 client/gvfsdaemondbus.c          |  996 ++++--------
 client/gvfsdaemondbus.h          |   51 +-
 client/gvfsfusedaemon.c          |  147 +-
 client/gvfsiconloadable.c        |  444 +++---
 common/Makefile.am               |   16 +
 common/gmountoperationdbus.c     |  514 +++----
 common/gmountoperationdbus.h     |    2 +-
 common/gmountsource.c            |  476 +++---
 common/gmountsource.h            |    4 +-
 common/gmountspec.c              |  108 +-
 common/gmountspec.h              |   28 +-
 common/gmounttracker.c           |  262 ++--
 common/gmounttracker.h           |    4 +-
 common/gvfsdaemonprotocol.c      |  556 ++-----
 common/gvfsdaemonprotocol.h      |  130 +--
 common/org.gtk.vfs.xml           |  382 +++++
 daemon/Makefile.am               |    2 +
 daemon/daemon-main.c             |  290 +++-
 daemon/gvfsbackend.c             |  388 +++---
 daemon/gvfsbackend.h             |   10 +-
 daemon/gvfsbackendsftp.c         |  111 +-
 daemon/gvfsdaemon.c              |  851 +++++------
 daemon/gvfsdaemon.h              |   15 +-
 daemon/gvfsdaemonutils.c         |   75 -
 daemon/gvfsdaemonutils.h         |    7 -
 daemon/gvfsjob.c                 |    1 -
 daemon/gvfsjobcopy.c             |  158 +--
 daemon/gvfsjobcopy.h             |   17 +-
 daemon/gvfsjobcreatemonitor.c    |  109 +-
 daemon/gvfsjobcreatemonitor.h    |   15 +-
 daemon/gvfsjobdbus.c             |   86 +-
 daemon/gvfsjobdbus.h             |   19 +-
 daemon/gvfsjobdelete.c           |   67 +-
 daemon/gvfsjobdelete.h           |    8 +-
 daemon/gvfsjobenumerate.c        |  220 ++--
 daemon/gvfsjobenumerate.h        |   16 +-
 daemon/gvfsjobmakedirectory.c    |   65 +-
 daemon/gvfsjobmakedirectory.h    |    8 +-
 daemon/gvfsjobmakesymlink.c      |   70 +-
 daemon/gvfsjobmakesymlink.h      |    8 +-
 daemon/gvfsjobmount.c            |   69 +-
 daemon/gvfsjobmount.h            |    8 +-
 daemon/gvfsjobmountmountable.c   |  109 +-
 daemon/gvfsjobmountmountable.h   |   10 +-
 daemon/gvfsjobmove.c             |  156 +--
 daemon/gvfsjobmove.h             |   17 +-
 daemon/gvfsjobopenforread.c      |  110 +-
 daemon/gvfsjobopenforread.h      |   11 +-
 daemon/gvfsjobopenforwrite.c     |  134 +-
 daemon/gvfsjobopenforwrite.h     |   14 +-
 daemon/gvfsjobopeniconforread.c  |   53 +-
 daemon/gvfsjobopeniconforread.h  |    9 +-
 daemon/gvfsjobpollmountable.c    |   69 +-
 daemon/gvfsjobpollmountable.h    |    5 +-
 daemon/gvfsjobprogress.c         |  105 ++
 daemon/gvfsjobprogress.h         |   67 +
 daemon/gvfsjobpull.c             |  169 +--
 daemon/gvfsjobpull.h             |   19 +-
 daemon/gvfsjobpush.c             |  169 +--
 daemon/gvfsjobpush.h             |   19 +-
 daemon/gvfsjobqueryattributes.c  |  105 +-
 daemon/gvfsjobqueryattributes.h  |   12 +-
 daemon/gvfsjobqueryfsinfo.c      |   74 +-
 daemon/gvfsjobqueryfsinfo.h      |    8 +-
 daemon/gvfsjobqueryinfo.c        |  104 +-
 daemon/gvfsjobqueryinfo.h        |   11 +-
 daemon/gvfsjobsetattribute.c     |   91 +-
 daemon/gvfsjobsetattribute.h     |   11 +-
 daemon/gvfsjobsetdisplayname.c   |   75 +-
 daemon/gvfsjobsetdisplayname.h   |    8 +-
 daemon/gvfsjobstartmountable.c   |   76 +-
 daemon/gvfsjobstartmountable.h   |    9 +-
 daemon/gvfsjobstopmountable.c    |   83 +-
 daemon/gvfsjobstopmountable.h    |    8 +-
 daemon/gvfsjobtrash.c            |   66 +-
 daemon/gvfsjobtrash.h            |    8 +-
 daemon/gvfsjobunmount.c          |  101 +-
 daemon/gvfsjobunmount.h          |    9 +-
 daemon/gvfsjobunmountmountable.c |  121 +-
 daemon/gvfsjobunmountmountable.h |   19 +-
 daemon/gvfsmonitor.c             |  302 ++--
 daemon/main.c                    |  157 ++-
 daemon/mount.c                   | 1173 ++++++---------
 daemon/mount.h                   |    3 +-
 metadata/Makefile.am             |    6 +-
 metadata/meta-daemon.c           |    2 -
 metadata/meta-set.c              |    2 -
 96 files changed, 7397 insertions(+), 7827 deletions(-)
---