diff options
76 files changed, 154 insertions, 114 deletions
@@ -1,3 +1,82 @@ +2007-12-14 Alexander Larsson <alexl@redhat.com> + + * client/gdaemondirectorymonitor.c: + * client/gdaemondirectorymonitor.h: + * client/gdaemonfile.c: + * client/gdaemonfile.h: + * client/gdaemonfileenumerator.c: + * client/gdaemonfileenumerator.h: + * client/gdaemonfileinputstream.c: + * client/gdaemonfileinputstream.h: + * client/gdaemonfilemonitor.c: + * client/gdaemonfilemonitor.h: + * client/gdaemonfileoutputstream.c: + * client/gdaemonfileoutputstream.h: + * client/gdaemonmount.c: + * client/gdaemonmount.h: + * client/gdaemonvfs.c: + * client/gdaemonvfs.h: + * client/gdaemonvolumemonitor.h: + * client/gvfsdaemondbus.c: + * client/gvfsdaemondbus.h: + * client/gvfsfusedaemon.c: + * client/gvfsurimapper.h: + * client/smburi.c: + * common/gdbusutils.c: + * common/gdbusutils.h: + * common/gmountoperationdbus.c: + * common/gmountoperationdbus.h: + * common/gmountsource.c: + * common/gmountsource.h: + * common/gsysutils.c: + * common/gvfsdaemonprotocol.c: + * common/gvfsdaemonprotocol.h: + * daemon/gvfsbackend.h: + * daemon/gvfsbackendftp.c: + * daemon/gvfsbackendsftp.c: + * daemon/gvfsbackendsmb.c: + * daemon/gvfsbackendsmbbrowse.c: + * daemon/gvfsbackendtest.c: + * daemon/gvfsbackendtrash.c: + * daemon/gvfsdaemonutils.c: + * daemon/gvfsjob.c: + * daemon/gvfsjob.h: + * daemon/gvfsjobcopy.h: + * daemon/gvfsjobcreatemonitor.h: + * daemon/gvfsjobdelete.h: + * daemon/gvfsjobenumerate.h: + * daemon/gvfsjobmakedirectory.h: + * daemon/gvfsjobmakesymlink.h: + * daemon/gvfsjobmount.h: + * daemon/gvfsjobmountmountable.h: + * daemon/gvfsjobmove.h: + * daemon/gvfsjobqueryattributes.h: + * daemon/gvfsjobqueryfsinfo.h: + * daemon/gvfsjobqueryinfo.h: + * daemon/gvfsjobsetattribute.h: + * daemon/gvfsjobsetdisplayname.h: + * daemon/gvfsjobtrash.h: + * daemon/gvfsjobunmount.h: + * daemon/gvfsmonitor.h: + * daemon/mount.c: + * daemon/mount.h: + * programs/gvfs-cat.c: + * programs/gvfs-copy.c: + * programs/gvfs-info.c: + * programs/gvfs-ls.c: + * programs/gvfs-monitor-dir.c: + * programs/gvfs-monitor-file.c: + * programs/gvfs-mount.c: + * programs/gvfs-move.c: + * programs/gvfs-rm.c: + * programs/gvfs-save.c: + * programs/gvfs-trash.c: + * test/benchmark-gvfs-big-files.c: + * test/benchmark-gvfs-small-files.c: + * test/benchmark-posix-big-files.c: + * test/benchmark-posix-small-files.c: + Only use <gio/gio.h> include + 2007-12-13 Alexander Larsson <alexl@redhat.com> * client/gdaemonfile.c: diff --git a/client/gdaemondirectorymonitor.c b/client/gdaemondirectorymonitor.c index 9f3506bc..be652eea 100644 --- a/client/gdaemondirectorymonitor.c +++ b/client/gdaemondirectorymonitor.c @@ -24,7 +24,7 @@ #include <string.h> #include "gdaemondirectorymonitor.h" -#include <gio/gdirectorymonitor.h> +#include <gio/gio.h> #include <gvfsdaemondbus.h> #include <gvfsdaemonprotocol.h> #include "gdbusutils.h" diff --git a/client/gdaemondirectorymonitor.h b/client/gdaemondirectorymonitor.h index f684de1b..bc5892c0 100644 --- a/client/gdaemondirectorymonitor.h +++ b/client/gdaemondirectorymonitor.h @@ -24,7 +24,7 @@ #define __G_DAEMON_DIRECTORY_MONITOR_H__ #include <glib-object.h> -#include <gio/gdirectorymonitor.h> +#include <gio/gio.h> G_BEGIN_DECLS diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c index 769de147..dbce27dd 100644 --- a/client/gdaemonfile.c +++ b/client/gdaemonfile.c @@ -40,7 +40,7 @@ #include <glib/gi18n-lib.h> #include "gdbusutils.h" #include "gmountoperationdbus.h" -#include <gio/gsimpleasyncresult.h> +#include <gio/gio.h> static void g_daemon_file_file_iface_init (GFileIface *iface); diff --git a/client/gdaemonfile.h b/client/gdaemonfile.h index 10499897..297066a9 100644 --- a/client/gdaemonfile.h +++ b/client/gdaemonfile.h @@ -23,7 +23,7 @@ #ifndef __G_DAEMON_FILE_H__ #define __G_DAEMON_FILE_H__ -#include <gio/gfile.h> +#include <gio/gio.h> #include "gdaemonvfs.h" #include "gmountspec.h" diff --git a/client/gdaemonfileenumerator.c b/client/gdaemonfileenumerator.c index af2b884b..cbaab2da 100644 --- a/client/gdaemonfileenumerator.c +++ b/client/gdaemonfileenumerator.c @@ -27,7 +27,7 @@ #include <glib.h> #include <glib/gi18n-lib.h> #include <gdaemonfileenumerator.h> -#include <gio/gfileinfo.h> +#include <gio/gio.h> #include <gvfsdaemondbus.h> #include <gvfsdaemonprotocol.h> diff --git a/client/gdaemonfileenumerator.h b/client/gdaemonfileenumerator.h index 900010e2..cb5a14b3 100644 --- a/client/gdaemonfileenumerator.h +++ b/client/gdaemonfileenumerator.h @@ -23,8 +23,7 @@ #ifndef __G_DAEMON_FILE_ENUMERATOR_H__ #define __G_DAEMON_FILE_ENUMERATOR_H__ -#include <gio/gfileenumerator.h> -#include <gio/gfileinfo.h> +#include <gio/gio.h> #include <dbus/dbus.h> G_BEGIN_DECLS diff --git a/client/gdaemonfileinputstream.c b/client/gdaemonfileinputstream.c index 2b02ec38..6cb74992 100644 --- a/client/gdaemonfileinputstream.c +++ b/client/gdaemonfileinputstream.c @@ -56,13 +56,9 @@ #include <glib.h> #include <glib/gstdio.h> #include <glib/gi18n-lib.h> -#include <gio/gioerror.h> -#include <gio/gseekable.h> +#include <gio/gio.h> #include "gdaemonfileinputstream.h" #include "gvfsdaemondbus.h" -#include <gio/gunixinputstream.h> -#include <gio/gunixoutputstream.h> -#include <gio/gsimpleasyncresult.h> #include <gvfsdaemonprotocol.h> #define MAX_READ_SIZE (4*1024*1024) diff --git a/client/gdaemonfileinputstream.h b/client/gdaemonfileinputstream.h index a2e9c3d4..2d4cc4ce 100644 --- a/client/gdaemonfileinputstream.h +++ b/client/gdaemonfileinputstream.h @@ -23,7 +23,7 @@ #ifndef __G_DAEMON_FILE_INPUT_STREAM_H__ #define __G_DAEMON_FILE_INPUT_STREAM_H__ -#include <gio/gfileinputstream.h> +#include <gio/gio.h> G_BEGIN_DECLS diff --git a/client/gdaemonfilemonitor.c b/client/gdaemonfilemonitor.c index 41ccb17d..61b35e54 100644 --- a/client/gdaemonfilemonitor.c +++ b/client/gdaemonfilemonitor.c @@ -24,7 +24,7 @@ #include <string.h> #include "gdaemonfilemonitor.h" -#include <gio/gfilemonitor.h> +#include <gio/gio.h> #include <gvfsdaemondbus.h> #include <gvfsdaemonprotocol.h> #include "gdbusutils.h" diff --git a/client/gdaemonfilemonitor.h b/client/gdaemonfilemonitor.h index 0d3f7dc7..9cd02175 100644 --- a/client/gdaemonfilemonitor.h +++ b/client/gdaemonfilemonitor.h @@ -24,7 +24,7 @@ #define __G_DAEMON_FILE_MONITOR_H__ #include <glib-object.h> -#include <gio/gfilemonitor.h> +#include <gio/gio.h> G_BEGIN_DECLS diff --git a/client/gdaemonfileoutputstream.c b/client/gdaemonfileoutputstream.c index 017835a1..0916df08 100644 --- a/client/gdaemonfileoutputstream.c +++ b/client/gdaemonfileoutputstream.c @@ -34,13 +34,9 @@ #include <glib.h> #include <glib/gstdio.h> #include <glib/gi18n-lib.h> -#include <gio/gioerror.h> -#include <gio/gseekable.h> +#include <gio/gio.h> #include "gdaemonfileoutputstream.h" #include "gvfsdaemondbus.h" -#include <gio/gunixinputstream.h> -#include <gio/gunixoutputstream.h> -#include <gio/gsimpleasyncresult.h> #include <gvfsdaemonprotocol.h> #define MAX_WRITE_SIZE (4*1024*1024) diff --git a/client/gdaemonfileoutputstream.h b/client/gdaemonfileoutputstream.h index 83487937..e609a48b 100644 --- a/client/gdaemonfileoutputstream.h +++ b/client/gdaemonfileoutputstream.h @@ -23,7 +23,7 @@ #ifndef __G_DAEMON_FILE_OUTPUT_STREAM_H__ #define __G_DAEMON_FILE_OUTPUT_STREAM_H__ -#include <gio/gfileoutputstream.h> +#include <gio/gio.h> G_BEGIN_DECLS diff --git a/client/gdaemonmount.c b/client/gdaemonmount.c index 0f4f7984..b8beac0a 100644 --- a/client/gdaemonmount.c +++ b/client/gdaemonmount.c @@ -26,8 +26,7 @@ #include <glib.h> #include <glib/gi18n-lib.h> -#include <gio/gthemedicon.h> -#include <gio/gsimpleasyncresult.h> +#include <gio/gio.h> #include "gdaemonvolumemonitor.h" #include "gdaemonmount.h" #include "gvfsdaemondbus.h" diff --git a/client/gdaemonmount.h b/client/gdaemonmount.h index bf121d96..e44421cc 100644 --- a/client/gdaemonmount.h +++ b/client/gdaemonmount.h @@ -24,7 +24,7 @@ #define __G_DAEMON_MOUNT_H__ #include <glib-object.h> -#include <gio/gmount.h> +#include <gio/gio.h> #include "gdaemonvfs.h" #include "gdaemonvolumemonitor.h" #include "gmounttracker.h" diff --git a/client/gdaemonvfs.c b/client/gdaemonvfs.c index a4088b81..50220ef6 100644 --- a/client/gdaemonvfs.c +++ b/client/gdaemonvfs.c @@ -28,7 +28,7 @@ #include "gdaemonvfs.h" #include "gvfsuriutils.h" #include "gdaemonfile.h" -#include <gio/giomodule.h> +#include <gio/gio.h> #include <gvfsdaemonprotocol.h> #include <gmodule.h> #include "gvfsdaemondbus.h" diff --git a/client/gdaemonvfs.h b/client/gdaemonvfs.h index 8bc92b6b..4b7ed693 100644 --- a/client/gdaemonvfs.h +++ b/client/gdaemonvfs.h @@ -23,7 +23,7 @@ #ifndef __G_DAEMON_VFS_H__ #define __G_DAEMON_VFS_H__ -#include <gio/gvfs.h> +#include <gio/gio.h> #include <dbus/dbus.h> #include "gmountspec.h" #include "gmounttracker.h" diff --git a/client/gdaemonvolumemonitor.h b/client/gdaemonvolumemonitor.h index 491db1cc..2e3e3014 100644 --- a/client/gdaemonvolumemonitor.h +++ b/client/gdaemonvolumemonitor.h @@ -24,7 +24,7 @@ #define __G_DAEMON_VOLUME_MONITOR_H__ #include <glib-object.h> -#include <gio/gvolumemonitor.h> +#include <gio/gio.h> G_BEGIN_DECLS diff --git a/client/gvfsdaemondbus.c b/client/gvfsdaemondbus.c index 4bc96f2b..4a2cb45f 100644 --- a/client/gvfsdaemondbus.c +++ b/client/gvfsdaemondbus.c @@ -33,9 +33,7 @@ #include <glib/gi18n-lib.h> -#include <gio/gioerror.h> -#include <gio/gthemedicon.h> -#include <gio/gfileicon.h> +#include <gio/gio.h> #include "gvfsdaemondbus.h" #include <gvfsdaemonprotocol.h> #include <gdaemonvfs.h> diff --git a/client/gvfsdaemondbus.h b/client/gvfsdaemondbus.h index 6a8af3a0..46874f7e 100644 --- a/client/gvfsdaemondbus.h +++ b/client/gvfsdaemondbus.h @@ -25,8 +25,7 @@ #include <glib.h> #include <dbus/dbus.h> -#include <gio/gcancellable.h> -#include <gio/gfileinfo.h> +#include <gio/gio.h> G_BEGIN_DECLS diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c index bdf7eed2..a0c53cc3 100644 --- a/client/gvfsfusedaemon.c +++ b/client/gvfsfusedaemon.c @@ -41,13 +41,9 @@ #include <glib.h> #include <glib/gi18n.h> #include <glib/gprintf.h> -#include <gio/giomodule.h> +#include <gio/gio.h> -#include <gio/gvfs.h> #include <glib/gurifuncs.h> -#include <gio/gseekable.h> -#include <gio/gioerror.h> -#include <gio/gvolumemonitor.h> /* stuff from common/ */ #include <gvfsdaemonprotocol.h> diff --git a/client/gvfsurimapper.h b/client/gvfsurimapper.h index 393dbae7..5cdef03a 100644 --- a/client/gvfsurimapper.h +++ b/client/gvfsurimapper.h @@ -24,7 +24,7 @@ #define __G_VFS_URI_MAPPER_H__ #include <glib-object.h> -#include <gio/giomodule.h> +#include <gio/gio.h> G_BEGIN_DECLS diff --git a/client/smburi.c b/client/smburi.c index 67877b88..c7871115 100644 --- a/client/smburi.c +++ b/client/smburi.c @@ -23,7 +23,7 @@ #include <config.h> #include <string.h> -#include <gio/giomodule.h> +#include <gio/gio.h> #include <gvfsurimapper.h> #include <gvfsuriutils.h> diff --git a/common/gdbusutils.c b/common/gdbusutils.c index e023c126..c9e17953 100644 --- a/common/gdbusutils.c +++ b/common/gdbusutils.c @@ -27,8 +27,7 @@ #include <glib/gi18n-lib.h> #include <gdbusutils.h> -#include <gio/gcancellable.h> -#include <gio/gioerror.h> +#include <gio/gio.h> void _g_dbus_oom (void) diff --git a/common/gdbusutils.h b/common/gdbusutils.h index 1300b35e..dc40457e 100644 --- a/common/gdbusutils.h +++ b/common/gdbusutils.h @@ -25,7 +25,7 @@ #include <glib.h> #include <dbus/dbus.h> -#include <gio/gcancellable.h> +#include <gio/gio.h> G_BEGIN_DECLS diff --git a/common/gmountoperationdbus.c b/common/gmountoperationdbus.c index 52156638..1f46ab04 100644 --- a/common/gmountoperationdbus.c +++ b/common/gmountoperationdbus.c @@ -28,7 +28,7 @@ #define I_(string) g_intern_static_string (string) -#include <gio/gioerror.h> +#include <gio/gio.h> #include "gmountoperationdbus.h" #include "gvfsdaemonprotocol.h" #include "gdbusutils.h" diff --git a/common/gmountoperationdbus.h b/common/gmountoperationdbus.h index 47184b1f..26ee4013 100644 --- a/common/gmountoperationdbus.h +++ b/common/gmountoperationdbus.h @@ -26,7 +26,7 @@ #include <sys/stat.h> #include <glib-object.h> -#include <gio/gmountoperation.h> +#include <gio/gio.h> #include <gmountspec.h> #include <gmountsource.h> diff --git a/common/gmountsource.c b/common/gmountsource.c index 34f27b06..74647ce8 100644 --- a/common/gmountsource.c +++ b/common/gmountsource.c @@ -24,7 +24,7 @@ #include <gmountsource.h> #include <gdbusutils.h> -#include <gio/gioerror.h> +#include <gio/gio.h> #include <gvfsdaemonprotocol.h> struct _GMountSource diff --git a/common/gmountsource.h b/common/gmountsource.h index ac7f80e7..fcb76394 100644 --- a/common/gmountsource.h +++ b/common/gmountsource.h @@ -25,7 +25,7 @@ #include <glib-object.h> #include <gmountspec.h> -#include <gio/gmountoperation.h> +#include <gio/gio.h> G_BEGIN_DECLS diff --git a/common/gsysutils.c b/common/gsysutils.c index ce07a287..4b64adeb 100644 --- a/common/gsysutils.c +++ b/common/gsysutils.c @@ -29,7 +29,7 @@ #include <strings.h> #include <errno.h> #include <unistd.h> -#include <gio/gioerror.h> +#include <gio/gio.h> #include <glib/gi18n-lib.h> diff --git a/common/gvfsdaemonprotocol.c b/common/gvfsdaemonprotocol.c index 7b4efebc..fd6bf7de 100644 --- a/common/gvfsdaemonprotocol.c +++ b/common/gvfsdaemonprotocol.c @@ -27,8 +27,7 @@ #include <glib/gi18n-lib.h> #include <gvfsdaemonprotocol.h> #include <gdbusutils.h> -#include <gio/gthemedicon.h> -#include <gio/gfileicon.h> +#include <gio/gio.h> static const char * get_object_signature (GObject *obj) diff --git a/common/gvfsdaemonprotocol.h b/common/gvfsdaemonprotocol.h index eef045ea..5e12cec5 100644 --- a/common/gvfsdaemonprotocol.h +++ b/common/gvfsdaemonprotocol.h @@ -1,7 +1,7 @@ #ifndef __G_VFS_DAEMON_PROTOCOL_H__ #define __G_VFS_DAEMON_PROTOCOL_H__ -#include <gio/gfileinfo.h> +#include <gio/gio.h> G_BEGIN_DECLS diff --git a/daemon/gvfsbackend.h b/daemon/gvfsbackend.h index 60ead913..02d24e7c 100644 --- a/daemon/gvfsbackend.h +++ b/daemon/gvfsbackend.h @@ -24,8 +24,7 @@ #define __G_VFS_BACKEND_H__ #include <dbus/dbus.h> -#include <gio/gfileinfo.h> -#include <gio/gfile.h> +#include <gio/gio.h> #include <gvfsdaemon.h> #include <gvfsjob.h> #include <gmountspec.h> diff --git a/daemon/gvfsbackendftp.c b/daemon/gvfsbackendftp.c index 729b822b..cf292aea 100644 --- a/daemon/gvfsbackendftp.c +++ b/daemon/gvfsbackendftp.c @@ -33,8 +33,7 @@ #include <glib/gstdio.h> #include <glib/gi18n.h> -#include <gio/gioerror.h> -#include <gio/gfile.h> +#include <gio/gio.h> #include "gvfsbackendftp.h" #include "gvfsjobopenforread.h" diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c index 56814b92..4b85e3ac 100644 --- a/daemon/gvfsbackendsftp.c +++ b/daemon/gvfsbackendsftp.c @@ -33,15 +33,9 @@ #include <glib/gstdio.h> #include <glib/gi18n.h> -#include <gio/gioerror.h> -#include <gio/gfile.h> -#include <gio/gdatainputstream.h> -#include <gio/gdataoutputstream.h> +#include <gio/gio.h> #include <gio/gunixinputstream.h> #include <gio/gunixoutputstream.h> -#include <gio/gmemoryoutputstream.h> -#include <gio/gmemoryinputstream.h> -#include <gio/gcontenttype.h> #include "gvfsbackendsftp.h" #include "gvfsjobopenforread.h" diff --git a/daemon/gvfsbackendsmb.c b/daemon/gvfsbackendsmb.c index 33a76a37..cbf9581f 100644 --- a/daemon/gvfsbackendsmb.c +++ b/daemon/gvfsbackendsmb.c @@ -31,10 +31,7 @@ #include <glib/gstdio.h> #include <glib/gi18n.h> -#include <gio/gioerror.h> -#include <gio/gfile.h> -#include <gio/gcontenttype.h> -#include <gio/gthemedicon.h> +#include <gio/gio.h> #include "gvfsbackendsmb.h" #include "gvfsjobopenforread.h" diff --git a/daemon/gvfsbackendsmbbrowse.c b/daemon/gvfsbackendsmbbrowse.c index b2148b29..79d6362d 100644 --- a/daemon/gvfsbackendsmbbrowse.c +++ b/daemon/gvfsbackendsmbbrowse.c @@ -31,9 +31,7 @@ #include <glib/gstdio.h> #include <glib/gi18n.h> -#include <gio/gioerror.h> -#include <gio/gthemedicon.h> -#include <gio/gfile.h> +#include <gio/gio.h> #include "gvfsbackendsmbbrowse.h" #include "gvfsjobmountmountable.h" diff --git a/daemon/gvfsbackendtest.c b/daemon/gvfsbackendtest.c index ee17428a..bc1fc9d1 100644 --- a/daemon/gvfsbackendtest.c +++ b/daemon/gvfsbackendtest.c @@ -31,9 +31,7 @@ #include <glib/gstdio.h> #include <glib/gi18n.h> -#include <gio/gioerror.h> -#include <gio/gfile.h> -#include <gio/gvfs.h> +#include <gio/gio.h> #include "gvfsbackendtest.h" #include "gvfsjobopenforread.h" diff --git a/daemon/gvfsbackendtrash.c b/daemon/gvfsbackendtrash.c index 706f868b..5cf8d284 100644 --- a/daemon/gvfsbackendtrash.c +++ b/daemon/gvfsbackendtrash.c @@ -34,9 +34,7 @@ #include <glib/gstdio.h> #include <glib/gi18n.h> -#include <gio/gioerror.h> -#include <gio/gfile.h> -#include <gio/gthemedicon.h> +#include <gio/gio.h> #include <gio/gunixmounts.h> #include <glib/gurifuncs.h> diff --git a/daemon/gvfsdaemonutils.c b/daemon/gvfsdaemonutils.c index e1268f24..16970bd2 100644 --- a/daemon/gvfsdaemonutils.c +++ b/daemon/gvfsdaemonutils.c @@ -34,7 +34,7 @@ #include <glib/gthread.h> #include <glib/gi18n.h> -#include <gio/gioerror.h> +#include <gio/gio.h> #include "gdbusutils.h" #include "gsysutils.h" #include "gvfsdaemonutils.h" diff --git a/daemon/gvfsjob.c b/daemon/gvfsjob.c index 73ddd839..392af67c 100644 --- a/daemon/gvfsjob.c +++ b/daemon/gvfsjob.c @@ -30,7 +30,7 @@ #include <glib.h> #include <dbus/dbus.h> #include <glib/gi18n.h> -#include <gio/gioerror.h> +#include <gio/gio.h> #include "gvfsjob.h" #include "gvfsjobsource.h" diff --git a/daemon/gvfsjob.h b/daemon/gvfsjob.h index 0821f033..b34d43e4 100644 --- a/daemon/gvfsjob.h +++ b/daemon/gvfsjob.h @@ -24,7 +24,7 @@ #define __G_VFS_JOB_H__ #include <glib-object.h> -#include <gio/gcancellable.h> +#include <gio/gio.h> G_BEGIN_DECLS diff --git a/daemon/gvfsjobcopy.h b/daemon/gvfsjobcopy.h index e0142164..20a8b7be 100644 --- a/daemon/gvfsjobcopy.h +++ b/daemon/gvfsjobcopy.h @@ -23,7 +23,7 @@ #ifndef __G_VFS_JOB_COPY_H__ #define __G_VFS_JOB_COPY_H__ -#include <gio/gfileinfo.h> +#include <gio/gio.h> #include <gvfsjob.h> #include <gvfsjobdbus.h> #include <gvfsbackend.h> diff --git a/daemon/gvfsjobcreatemonitor.h b/daemon/gvfsjobcreatemonitor.h index 6c746f2c..fd5d4a66 100644 --- a/daemon/gvfsjobcreatemonitor.h +++ b/daemon/gvfsjobcreatemonitor.h @@ -23,7 +23,7 @@ #ifndef __G_VFS_JOB_CREATE_MONITOR_H__ #define __G_VFS_JOB_CREATE_MONITOR_H__ -#include <gio/gfileinfo.h> +#include <gio/gio.h> #include <gvfsjob.h> #include <gvfsjobdbus.h> #include <gvfsbackend.h> diff --git a/daemon/gvfsjobdelete.h b/daemon/gvfsjobdelete.h index 54c4c3ca..10db6521 100644 --- a/daemon/gvfsjobdelete.h +++ b/daemon/gvfsjobdelete.h @@ -23,7 +23,7 @@ #ifndef __G_VFS_JOB_DELETE_H__ #define __G_VFS_JOB_DELETE_H__ -#include <gio/gfileinfo.h> +#include <gio/gio.h> #include <gvfsjob.h> #include <gvfsjobdbus.h> #include <gvfsbackend.h> diff --git a/daemon/gvfsjobenumerate.h b/daemon/gvfsjobenumerate.h index b4eb59a6..b8936f5b 100644 --- a/daemon/gvfsjobenumerate.h +++ b/daemon/gvfsjobenumerate.h @@ -23,7 +23,7 @@ #ifndef __G_VFS_JOB_ENUMERATE_H__ #define __G_VFS_JOB_ENUMERATE_H__ -#include <gio/gfileinfo.h> +#include <gio/gio.h> #include <gvfsjob.h> #include <gvfsjobdbus.h> #include <gvfsbackend.h> diff --git a/daemon/gvfsjobmakedirectory.h b/daemon/gvfsjobmakedirectory.h index 687eb230..00cbaf0f 100644 --- a/daemon/gvfsjobmakedirectory.h +++ b/daemon/gvfsjobmakedirectory.h @@ -23,7 +23,7 @@ #ifndef __G_VFS_JOB_MAKE_DIRECTORY_H__ #define __G_VFS_JOB_MAKE_DIRECTORY_H__ -#include <gio/gfileinfo.h> +#include <gio/gio.h> #include <gvfsjob.h> #include <gvfsjobdbus.h> #include <gvfsbackend.h> diff --git a/daemon/gvfsjobmakesymlink.h b/daemon/gvfsjobmakesymlink.h index 9e3404e4..a662f2b4 100644 --- a/daemon/gvfsjobmakesymlink.h +++ b/daemon/gvfsjobmakesymlink.h @@ -23,7 +23,7 @@ #ifndef __G_VFS_JOB_MAKE_SYMLINK_H__ #define __G_VFS_JOB_MAKE_SYMLINK_H__ -#include <gio/gfileinfo.h> +#include <gio/gio.h> #include <gvfsjob.h> #include <gvfsjobdbus.h> #include <gvfsbackend.h> diff --git a/daemon/gvfsjobmount.h b/daemon/gvfsjobmount.h index 02e44272..8e8f312e 100644 --- a/daemon/gvfsjobmount.h +++ b/daemon/gvfsjobmount.h @@ -23,7 +23,7 @@ #ifndef __G_VFS_JOB_MOUNT_H__ #define __G_VFS_JOB_MOUNT_H__ -#include <gio/gfileinfo.h> +#include <gio/gio.h> #include <gvfsjob.h> #include <gvfsjobdbus.h> #include <gvfsbackend.h> diff --git a/daemon/gvfsjobmountmountable.h b/daemon/gvfsjobmountmountable.h index c2046f73..87e95085 100644 --- a/daemon/gvfsjobmountmountable.h +++ b/daemon/gvfsjobmountmountable.h @@ -23,7 +23,7 @@ #ifndef __G_VFS_JOB_MOUNT_MOUNTABLE_H__ #define __G_VFS_JOB_MOUNT_MOUNTABLE_H__ -#include <gio/gfileinfo.h> +#include <gio/gio.h> #include <gvfsjob.h> #include <gvfsjobdbus.h> #include <gvfsbackend.h> diff --git a/daemon/gvfsjobmove.h b/daemon/gvfsjobmove.h index 030f3283..d662edaa 100644 --- a/daemon/gvfsjobmove.h +++ b/daemon/gvfsjobmove.h @@ -23,7 +23,7 @@ #ifndef __G_VFS_JOB_MOVE_H__ #define __G_VFS_JOB_MOVE_H__ -#include <gio/gfileinfo.h> +#include <gio/gio.h> #include <gvfsjob.h> #include <gvfsjobdbus.h> #include <gvfsbackend.h> diff --git a/daemon/gvfsjobqueryattributes.h b/daemon/gvfsjobqueryattributes.h index dc652ede..33b923a7 100644 --- a/daemon/gvfsjobqueryattributes.h +++ b/daemon/gvfsjobqueryattributes.h @@ -23,7 +23,7 @@ #ifndef __G_VFS_JOB_QUERY_ATTRIBUTES_H__ #define __G_VFS_JOB_QUERY_ATTRIBUTES_H__ -#include <gio/gfileinfo.h> +#include <gio/gio.h> #include <gvfsjob.h> #include <gvfsjobdbus.h> #include <gvfsbackend.h> diff --git a/daemon/gvfsjobqueryfsinfo.h b/daemon/gvfsjobqueryfsinfo.h index 07b08877..c273fee5 100644 --- a/daemon/gvfsjobqueryfsinfo.h +++ b/daemon/gvfsjobqueryfsinfo.h @@ -23,7 +23,7 @@ #ifndef __G_VFS_JOB_QUERY_FS_INFO_H__ #define __G_VFS_JOB_QUERY_FS_INFO_H__ -#include <gio/gfileinfo.h> +#include <gio/gio.h> #include <gvfsjob.h> #include <gvfsjobdbus.h> #include <gvfsbackend.h> diff --git a/daemon/gvfsjobqueryinfo.h b/daemon/gvfsjobqueryinfo.h index a1ac91db..8f15d246 100644 --- a/daemon/gvfsjobqueryinfo.h +++ b/daemon/gvfsjobqueryinfo.h @@ -23,7 +23,7 @@ #ifndef __G_VFS_JOB_QUERY_INFO_H__ #define __G_VFS_JOB_QUERY_INFO_H__ -#include <gio/gfileinfo.h> +#include <gio/gio.h> #include <gvfsjob.h> #include <gvfsjobdbus.h> #include <gvfsbackend.h> diff --git a/daemon/gvfsjobsetattribute.h b/daemon/gvfsjobsetattribute.h index d5625b0d..21d35bcb 100644 --- a/daemon/gvfsjobsetattribute.h +++ b/daemon/gvfsjobsetattribute.h @@ -23,7 +23,7 @@ #ifndef __G_VFS_JOB_SET_ATTRIBUTE_H__ #define __G_VFS_JOB_SET_ATTRIBUTE_H__ -#include <gio/gfileinfo.h> +#include <gio/gio.h> #include <gvfsjob.h> #include <gvfsjobdbus.h> #include <gvfsbackend.h> diff --git a/daemon/gvfsjobsetdisplayname.h b/daemon/gvfsjobsetdisplayname.h index f42f42b0..9e773f46 100644 --- a/daemon/gvfsjobsetdisplayname.h +++ b/daemon/gvfsjobsetdisplayname.h @@ -23,7 +23,7 @@ #ifndef __G_VFS_JOB_SET_DISPLAY_NAME_H__ #define __G_VFS_JOB_SET_DISPLAY_NAME_H__ -#include <gio/gfileinfo.h> +#include <gio/gio.h> #include <gvfsjob.h> #include <gvfsjobdbus.h> #include <gvfsbackend.h> diff --git a/daemon/gvfsjobtrash.h b/daemon/gvfsjobtrash.h index 42b8db42..aa23a03e 100644 --- a/daemon/gvfsjobtrash.h +++ b/daemon/gvfsjobtrash.h @@ -23,7 +23,7 @@ #ifndef __G_VFS_JOB_TRASH_H__ #define __G_VFS_JOB_TRASH_H__ -#include <gio/gfileinfo.h> +#include <gio/gio.h> #include <gvfsjob.h> #include <gvfsjobdbus.h> #include <gvfsbackend.h> diff --git a/daemon/gvfsjobunmount.h b/daemon/gvfsjobunmount.h index 77076412..aaa18db2 100644 --- a/daemon/gvfsjobunmount.h +++ b/daemon/gvfsjobunmount.h @@ -23,7 +23,7 @@ #ifndef __G_VFS_JOB_UNMOUNT_H__ #define __G_VFS_JOB_UNMOUNT_H__ -#include <gio/gfileinfo.h> +#include <gio/gio.h> #include <gvfsjob.h> #include <gvfsjobdbus.h> #include <gvfsbackend.h> diff --git a/daemon/gvfsmonitor.h b/daemon/gvfsmonitor.h index fe92799a..70e35982 100644 --- a/daemon/gvfsmonitor.h +++ b/daemon/gvfsmonitor.h @@ -24,7 +24,7 @@ #define __G_VFS_MONITOR_H__ #include <glib-object.h> -#include <gio/gfilemonitor.h> +#include <gio/gio.h> #include <gmountspec.h> #include <gvfsdaemon.h> diff --git a/daemon/mount.c b/daemon/mount.c index e88b6846..12d3ff81 100644 --- a/daemon/mount.c +++ b/daemon/mount.c @@ -32,7 +32,7 @@ #include "gvfsdaemonprotocol.h" #include "gdbusutils.h" #include <glib/gurifuncs.h> -#include <gio/gioerror.h> +#include <gio/gio.h> typedef struct { char *display_name; diff --git a/daemon/mount.h b/daemon/mount.h index 075d6f15..ff244b5b 100644 --- a/daemon/mount.h +++ b/daemon/mount.h @@ -24,7 +24,7 @@ #define __MOUNT_H__ #include <glib-object.h> -#include <gio/gmountoperation.h> +#include <gio/gio.h> #include <gmountsource.h> G_BEGIN_DECLS diff --git a/programs/gvfs-cat.c b/programs/gvfs-cat.c index 1386c1ab..0d6c9b41 100644 --- a/programs/gvfs-cat.c +++ b/programs/gvfs-cat.c @@ -28,7 +28,7 @@ #include <errno.h> #include <glib.h> -#include <gio/gfile.h> +#include <gio/gio.h> static GOptionEntry entries[] = { diff --git a/programs/gvfs-copy.c b/programs/gvfs-copy.c index 05e961d1..db8bb9fa 100644 --- a/programs/gvfs-copy.c +++ b/programs/gvfs-copy.c @@ -29,7 +29,7 @@ #include <string.h> #include <glib.h> -#include <gio/gfile.h> +#include <gio/gio.h> static gboolean progress = FALSE; static gboolean interactive = FALSE; diff --git a/programs/gvfs-info.c b/programs/gvfs-info.c index 55db25df..10e185cd 100644 --- a/programs/gvfs-info.c +++ b/programs/gvfs-info.c @@ -24,7 +24,7 @@ #include <glib.h> #include <locale.h> -#include <gio/gfile.h> +#include <gio/gio.h> static char *attributes = NULL; static gboolean nofollow_symlinks = FALSE; diff --git a/programs/gvfs-ls.c b/programs/gvfs-ls.c index 474b1d76..033b76a9 100644 --- a/programs/gvfs-ls.c +++ b/programs/gvfs-ls.c @@ -25,7 +25,7 @@ #include <glib.h> #include <locale.h> #include <string.h> -#include <gio/gfile.h> +#include <gio/gio.h> static char *attributes = NULL; static gboolean show_hidden = FALSE; diff --git a/programs/gvfs-monitor-dir.c b/programs/gvfs-monitor-dir.c index cf8e189d..fd64cf05 100644 --- a/programs/gvfs-monitor-dir.c +++ b/programs/gvfs-monitor-dir.c @@ -28,8 +28,7 @@ #include <errno.h> #include <glib.h> -#include <gio/gfile.h> -#include <gio/gdirectorymonitor.h> +#include <gio/gio.h> static GMainLoop *main_loop; diff --git a/programs/gvfs-monitor-file.c b/programs/gvfs-monitor-file.c index b23e2bc9..38131e38 100644 --- a/programs/gvfs-monitor-file.c +++ b/programs/gvfs-monitor-file.c @@ -28,8 +28,7 @@ #include <errno.h> #include <glib.h> -#include <gio/gfile.h> -#include <gio/gfilemonitor.h> +#include <gio/gio.h> static GMainLoop *main_loop; diff --git a/programs/gvfs-mount.c b/programs/gvfs-mount.c index edbeebfd..4a738bf8 100644 --- a/programs/gvfs-mount.c +++ b/programs/gvfs-mount.c @@ -27,7 +27,7 @@ #include <glib.h> #include <locale.h> -#include <gio/gfile.h> +#include <gio/gio.h> static int outstanding_mounts = 0; static GMainLoop *main_loop; diff --git a/programs/gvfs-move.c b/programs/gvfs-move.c index bbda06e0..9a221603 100644 --- a/programs/gvfs-move.c +++ b/programs/gvfs-move.c @@ -29,7 +29,7 @@ #include <string.h> #include <glib.h> -#include <gio/gfile.h> +#include <gio/gio.h> static gboolean progress = FALSE; static gboolean interactive = FALSE; diff --git a/programs/gvfs-rm.c b/programs/gvfs-rm.c index 222026b2..cb666549 100644 --- a/programs/gvfs-rm.c +++ b/programs/gvfs-rm.c @@ -24,8 +24,7 @@ #include <glib.h> #include <locale.h> -#include <gio/gfile.h> - +#include <gio/gio.h> static GOptionEntry entries[] = { diff --git a/programs/gvfs-save.c b/programs/gvfs-save.c index 98843796..71f8780d 100644 --- a/programs/gvfs-save.c +++ b/programs/gvfs-save.c @@ -28,7 +28,7 @@ #include <errno.h> #include <glib.h> -#include <gio/gfile.h> +#include <gio/gio.h> static char *etag = NULL; static gboolean backup = FALSE; diff --git a/programs/gvfs-trash.c b/programs/gvfs-trash.c index e59f5339..7fa1aecd 100644 --- a/programs/gvfs-trash.c +++ b/programs/gvfs-trash.c @@ -24,7 +24,7 @@ #include <glib.h> #include <locale.h> -#include <gio/gfile.h> +#include <gio/gio.h> static GOptionEntry entries[] = diff --git a/test/benchmark-gvfs-big-files.c b/test/benchmark-gvfs-big-files.c index 7e8c9cac..621adbeb 100644 --- a/test/benchmark-gvfs-big-files.c +++ b/test/benchmark-gvfs-big-files.c @@ -31,7 +31,7 @@ #include <string.h> #include <glib.h> -#include <gio/gfile.h> +#include <gio/gio.h> #define BENCHMARK_UNIT_NAME "gvfs-big-file" diff --git a/test/benchmark-gvfs-small-files.c b/test/benchmark-gvfs-small-files.c index b3c8bb92..e7785683 100644 --- a/test/benchmark-gvfs-small-files.c +++ b/test/benchmark-gvfs-small-files.c @@ -31,7 +31,7 @@ #include <string.h> #include <glib.h> -#include <gio/gfile.h> +#include <gio/gio.h> #define BENCHMARK_UNIT_NAME "gvfs-big-file" diff --git a/test/benchmark-posix-big-files.c b/test/benchmark-posix-big-files.c index 92b2a997..875dd233 100644 --- a/test/benchmark-posix-big-files.c +++ b/test/benchmark-posix-big-files.c @@ -34,7 +34,7 @@ #include <fcntl.h> #include <glib.h> -#include <gio/gfile.h> +#include <gio/gio.h> #define BENCHMARK_UNIT_NAME "posix-big-file" diff --git a/test/benchmark-posix-small-files.c b/test/benchmark-posix-small-files.c index 76b14d61..81a39dd3 100644 --- a/test/benchmark-posix-small-files.c +++ b/test/benchmark-posix-small-files.c @@ -34,7 +34,7 @@ #include <fcntl.h> #include <glib.h> -#include <gio/gfile.h> +#include <gio/gio.h> #define BENCHMARK_UNIT_NAME "posix-big-file" |