gdbus: Move typedefs up

Move the typedefs up so they can be used by functions and callbacks.
This commit is contained in:
Lucas De Marchi 2012-10-04 04:26:25 -03:00 committed by Marcel Holtmann
parent 55215c3113
commit 0e1baf1997
1 changed files with 29 additions and 18 deletions

View File

@ -31,6 +31,17 @@ extern "C" {
#include <dbus/dbus.h> #include <dbus/dbus.h>
#include <glib.h> #include <glib.h>
typedef enum GDBusMethodFlags GDBusMethodFlags;
typedef enum GDBusSignalFlags GDBusSignalFlags;
typedef enum GDBusPropertyFlags GDBusPropertyFlags;
typedef enum GDBusSecurityFlags GDBusSecurityFlags;
typedef struct GDBusArgInfo GDBusArgInfo;
typedef struct GDBusMethodTable GDBusMethodTable;
typedef struct GDBusSignalTable GDBusSignalTable;
typedef struct GDBusPropertyTable GDBusPropertyTable;
typedef struct GDBusSecurityTable GDBusSecurityTable;
typedef void (* GDBusWatchFunction) (DBusConnection *connection, typedef void (* GDBusWatchFunction) (DBusConnection *connection,
void *user_data); void *user_data);
@ -62,58 +73,58 @@ typedef void (* GDBusSecurityFunction) (DBusConnection *connection,
gboolean interaction, gboolean interaction,
GDBusPendingReply pending); GDBusPendingReply pending);
typedef enum { enum GDBusMethodFlags {
G_DBUS_METHOD_FLAG_DEPRECATED = (1 << 0), G_DBUS_METHOD_FLAG_DEPRECATED = (1 << 0),
G_DBUS_METHOD_FLAG_NOREPLY = (1 << 1), G_DBUS_METHOD_FLAG_NOREPLY = (1 << 1),
G_DBUS_METHOD_FLAG_ASYNC = (1 << 2), G_DBUS_METHOD_FLAG_ASYNC = (1 << 2),
} GDBusMethodFlags; };
typedef enum { enum GDBusSignalFlags {
G_DBUS_SIGNAL_FLAG_DEPRECATED = (1 << 0), G_DBUS_SIGNAL_FLAG_DEPRECATED = (1 << 0),
} GDBusSignalFlags; };
typedef enum { enum GDBusPropertyFlags {
G_DBUS_PROPERTY_FLAG_DEPRECATED = (1 << 0), G_DBUS_PROPERTY_FLAG_DEPRECATED = (1 << 0),
} GDBusPropertyFlags; };
typedef enum { enum GDBusSecurityFlags {
G_DBUS_SECURITY_FLAG_DEPRECATED = (1 << 0), G_DBUS_SECURITY_FLAG_DEPRECATED = (1 << 0),
G_DBUS_SECURITY_FLAG_BUILTIN = (1 << 1), G_DBUS_SECURITY_FLAG_BUILTIN = (1 << 1),
G_DBUS_SECURITY_FLAG_ALLOW_INTERACTION = (1 << 2), G_DBUS_SECURITY_FLAG_ALLOW_INTERACTION = (1 << 2),
} GDBusSecurityFlags; };
typedef struct { struct GDBusArgInfo {
const char *name; const char *name;
const char *signature; const char *signature;
} GDBusArgInfo; };
typedef struct { struct GDBusMethodTable {
const char *name; const char *name;
GDBusMethodFunction function; GDBusMethodFunction function;
GDBusMethodFlags flags; GDBusMethodFlags flags;
unsigned int privilege; unsigned int privilege;
const GDBusArgInfo *in_args; const GDBusArgInfo *in_args;
const GDBusArgInfo *out_args; const GDBusArgInfo *out_args;
} GDBusMethodTable; };
typedef struct { struct GDBusSignalTable {
const char *name; const char *name;
GDBusSignalFlags flags; GDBusSignalFlags flags;
const GDBusArgInfo *args; const GDBusArgInfo *args;
} GDBusSignalTable; };
typedef struct { struct GDBusPropertyTable {
const char *name; const char *name;
const char *type; const char *type;
GDBusPropertyFlags flags; GDBusPropertyFlags flags;
} GDBusPropertyTable; };
typedef struct { struct GDBusSecurityTable {
unsigned int privilege; unsigned int privilege;
const char *action; const char *action;
GDBusSecurityFlags flags; GDBusSecurityFlags flags;
GDBusSecurityFunction function; GDBusSecurityFunction function;
} GDBusSecurityTable; };
#define GDBUS_ARGS(args...) (const GDBusArgInfo[]) { args, { } } #define GDBUS_ARGS(args...) (const GDBusArgInfo[]) { args, { } }