diff options
author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2012-10-04 04:26:25 -0300 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-10-04 17:05:20 +0300 |
commit | 7084f0baf5cb73d7a3632233fe409bb4bd652210 (patch) | |
tree | b6e049feca4678880a75b034c5b0e8649601cc6b | |
parent | d21f6a666a8a1ea31615830be78c2d474b01a83e (diff) | |
download | bluez-7084f0baf5cb73d7a3632233fe409bb4bd652210.tar.gz |
gdbus: Move typedefs up
Move the typedefs up so they can be used by functions and callbacks.
-rw-r--r-- | gdbus/gdbus.h | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 0a8a27c54..34e3cb32b 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -31,6 +31,17 @@ extern "C" { #include <dbus/dbus.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, void *user_data); @@ -62,58 +73,58 @@ typedef void (* GDBusSecurityFunction) (DBusConnection *connection, gboolean interaction, GDBusPendingReply pending); -typedef enum { +enum GDBusMethodFlags { G_DBUS_METHOD_FLAG_DEPRECATED = (1 << 0), G_DBUS_METHOD_FLAG_NOREPLY = (1 << 1), G_DBUS_METHOD_FLAG_ASYNC = (1 << 2), -} GDBusMethodFlags; +}; -typedef enum { +enum GDBusSignalFlags { G_DBUS_SIGNAL_FLAG_DEPRECATED = (1 << 0), -} GDBusSignalFlags; +}; -typedef enum { +enum GDBusPropertyFlags { G_DBUS_PROPERTY_FLAG_DEPRECATED = (1 << 0), -} GDBusPropertyFlags; +}; -typedef enum { +enum GDBusSecurityFlags { G_DBUS_SECURITY_FLAG_DEPRECATED = (1 << 0), G_DBUS_SECURITY_FLAG_BUILTIN = (1 << 1), G_DBUS_SECURITY_FLAG_ALLOW_INTERACTION = (1 << 2), -} GDBusSecurityFlags; +}; -typedef struct { +struct GDBusArgInfo { const char *name; const char *signature; -} GDBusArgInfo; +}; -typedef struct { +struct GDBusMethodTable { const char *name; GDBusMethodFunction function; GDBusMethodFlags flags; unsigned int privilege; const GDBusArgInfo *in_args; const GDBusArgInfo *out_args; -} GDBusMethodTable; +}; -typedef struct { +struct GDBusSignalTable { const char *name; GDBusSignalFlags flags; const GDBusArgInfo *args; -} GDBusSignalTable; +}; -typedef struct { +struct GDBusPropertyTable { const char *name; const char *type; GDBusPropertyFlags flags; -} GDBusPropertyTable; +}; -typedef struct { +struct GDBusSecurityTable { unsigned int privilege; const char *action; GDBusSecurityFlags flags; GDBusSecurityFunction function; -} GDBusSecurityTable; +}; #define GDBUS_ARGS(args...) (const GDBusArgInfo[]) { args, { } } |