sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

gdbus: remove signature and reply from tables

This commit is contained in:
Lucas De Marchi 2012-05-20 02:07:33 -03:00 committed by Marcel Holtmann
parent e0d6f9f0ce
commit 7f2b69d7b8
2 changed files with 1 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
gdbus/gdbus.h
View File

@ -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, \

2
gdbus/object.c
View File

@ -471,7 +471,7 @@ done:
}
static const GDBusMethodTable introspect_methods[] = {
{ _GDBUS_METHOD("Introspect", "", "s", NULL,
{ GDBUS_METHOD("Introspect", NULL,
GDBUS_ARGS({ "xml", "s" }), introspect) },
{ }
};