diff options
| author | Tomas Bzatek <tbzatek@redhat.com> | 2012-07-31 11:58:09 +0200 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@redhat.com> | 2012-07-31 11:58:09 +0200 |
| commit | 622a5c0d167556188c38fcde40a42a0dfad9c625 (patch) | |
| tree | 04f27be7f2a54779e17029ede2554e39c3464aa0 /common/gmountspec.h | |
| parent | a494b809eaf82994108bfbbe5d950fed1a0a8c7c (diff) | |
| download | gvfs-622a5c0d167556188c38fcde40a42a0dfad9c625.tar.gz | |
gdbus: Core daemon and client port
Port of most of the gvfs core, few bits still missing. Lot of debug prints around,
will be removed in further commits. Same amount of TODOs and FIXMEs.
Notes:
* kill serials?
* get rid of mainloops where applicable (copy/move progress callback, enumerator)
* fix keyring integration
* use gdbus builtin fd passing within gvfsdaemon.c, kill the extra_fd stuff
Diffstat (limited to 'common/gmountspec.h')
| -rw-r--r-- | common/gmountspec.h | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/common/gmountspec.h b/common/gmountspec.h index f7837e65..da903e1b 100644 --- a/common/gmountspec.h +++ b/common/gmountspec.h @@ -24,28 +24,10 @@ #define __G_MOUNT_SPEC_H__ #include <glib.h> -#include <dbus/dbus.h> +#include <gio/gio.h> G_BEGIN_DECLS -#define G_MOUNT_SPEC_ITEM_INNER_TYPE_AS_STRING \ - DBUS_TYPE_STRING_AS_STRING \ - DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING - -#define G_MOUNT_SPEC_ITEM_TYPE_AS_STRING \ - DBUS_STRUCT_BEGIN_CHAR_AS_STRING \ - G_MOUNT_SPEC_ITEM_INNER_TYPE_AS_STRING \ - DBUS_STRUCT_END_CHAR_AS_STRING - -#define G_MOUNT_SPEC_INNER_TYPE_AS_STRING \ - DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING \ - DBUS_TYPE_ARRAY_AS_STRING G_MOUNT_SPEC_ITEM_TYPE_AS_STRING - -#define G_MOUNT_SPEC_TYPE_AS_STRING \ - DBUS_STRUCT_BEGIN_CHAR_AS_STRING \ - G_MOUNT_SPEC_INNER_TYPE_AS_STRING \ - DBUS_STRUCT_END_CHAR_AS_STRING - typedef struct { char *key; char *value; @@ -65,11 +47,9 @@ GMountSpec *g_mount_spec_ref (GMountSpec *spec); void g_mount_spec_unref (GMountSpec *spec); GMountSpec *g_mount_spec_get_unique_for (GMountSpec *spec); GMountSpec *g_mount_spec_copy (GMountSpec *spec); -GMountSpec *g_mount_spec_from_dbus (DBusMessageIter *iter); -void g_mount_spec_to_dbus (DBusMessageIter *iter, - GMountSpec *spec); -void g_mount_spec_to_dbus_with_path (DBusMessageIter *iter, - GMountSpec *spec, +GMountSpec *g_mount_spec_from_dbus (GVariant *iter); +GVariant *g_mount_spec_to_dbus (GMountSpec *spec); +GVariant *g_mount_spec_to_dbus_with_path (GMountSpec *spec, const char *path); void g_mount_spec_set_mount_prefix (GMountSpec *spec, const char *mount_prefix); |