diff options
| author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-05-18 16:59:56 -0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2012-05-18 15:04:59 -0700 |
| commit | f8d972365610fc66f6c4c49b6ae42b442d3cd4e2 (patch) | |
| tree | 7e0d492a32a360c5910c2da2918c0e1275f1209b | |
| parent | 4efd19fce5b56b20763c13f412c137d93a10e770 (diff) | |
| download | mmsd-f8d972365610fc66f6c4c49b6ae42b442d3cd4e2.tar.gz | |
gdbus: remove signature and reply from tables
| -rw-r--r-- | gdbus/gdbus.h | 60 | ||||
| -rw-r--r-- | gdbus/object.c | 2 |
2 files changed, 1 insertions, 61 deletions
diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 868c8d5..0a8a27c 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -89,8 +89,6 @@ typedef struct { typedef struct { const char *name; - const char *signature; - const char *reply; GDBusMethodFunction function; GDBusMethodFlags flags; unsigned int privilege; @@ -100,7 +98,6 @@ typedef struct { typedef struct { const char *name; - const char *signature; GDBusSignalFlags flags; const GDBusArgInfo *args; } GDBusSignalTable; @@ -120,63 +117,6 @@ typedef struct { #define GDBUS_ARGS(args...) (const GDBusArgInfo[]) { args, { } } -#define _GDBUS_METHOD(_name, _signature, _reply, _in_args, _out_args, _function) \ - .name = _name, \ - .signature = _signature, \ - .reply = _reply, \ - .in_args = _in_args, \ - .out_args = _out_args, \ - .function = _function - -#define _GDBUS_ASYNC_METHOD(_name, _signature, _reply, _in_args, _out_args, _function) \ - .name = _name, \ - .signature = _signature, \ - .reply = _reply, \ - .in_args = _in_args, \ - .out_args = _out_args, \ - .function = _function, \ - .flags = G_DBUS_METHOD_FLAG_ASYNC - -#define _GDBUS_DEPRECATED_METHOD(_name, _signature, _reply, _in_args, _out_args, _function) \ - .name = _name, \ - .signature = _signature, \ - .reply = _reply, \ - .in_args = _in_args, \ - .out_args = _out_args, \ - .function = _function, \ - .flags = G_DBUS_METHOD_FLAG_DEPRECATED - -#define _GDBUS_DEPRECATED_ASYNC_METHOD(_name, _signature, _reply, _in_args, _out_args, _function) \ - .name = _name, \ - .signature = _signature, \ - .reply = _reply, \ - .in_args = _in_args, \ - .out_args = _out_args, \ - .function = _function, \ - .flags = G_DBUS_METHOD_FLAG_ASYNC | G_DBUS_METHOD_FLAG_DEPRECATED - -#define _GDBUS_NOREPLY_METHOD(_name, _signature, _reply, _in_args, _out_args, _function) \ - .name = _name, \ - .signature = _signature, \ - .reply = _reply, \ - .in_args = _in_args, \ - .out_args = _out_args, \ - .function = _function, \ - .flags = G_DBUS_METHOD_FLAG_NOREPLY - -#define _GDBUS_SIGNAL(_name, _signature, _args) \ - .name = _name, \ - .signature = _signature, \ - .args = _args - -#define _GDBUS_DEPRECATED_SIGNAL(_name, _signature, _args) \ - .name = _name, \ - .signature = _signature, \ - .args = _args, \ - .flags = G_DBUS_SIGNAL_FLAG_DEPRECATED - -/* Helpers with no signature and reply */ - #define GDBUS_METHOD(_name, _in_args, _out_args, _function) \ .name = _name, \ .in_args = _in_args, \ diff --git a/gdbus/object.c b/gdbus/object.c index b187bb5..fcdd6ec 100644 --- a/gdbus/object.c +++ b/gdbus/object.c @@ -471,7 +471,7 @@ done: } static const GDBusMethodTable introspect_methods[] = { - { _GDBUS_METHOD("Introspect", "", "s", NULL, + { GDBUS_METHOD("Introspect", NULL, GDBUS_ARGS({ "xml", "s" }), introspect) }, { } }; |