diff options
Diffstat (limited to 'dbus/dbus-glib.h')
| -rw-r--r-- | dbus/dbus-glib.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/dbus/dbus-glib.h b/dbus/dbus-glib.h index 5c002f49..a9aad540 100644 --- a/dbus/dbus-glib.h +++ b/dbus/dbus-glib.h @@ -89,25 +89,21 @@ DBusGConnection* dbus_g_bus_get (DBusBusType type, typedef struct DBusGObjectInfo DBusGObjectInfo; typedef struct DBusGMethodInfo DBusGMethodInfo; -typedef DBusHandlerResult (* DBusGMethodMarshaller) (DBusGConnection *connection, - DBusGMessage *message, - void *user_data); - /** - * Object typically generated by dbus-glib-tool that + * Object typically generated by dbus-binding-tool that * stores a mapping from introspection data to a * function pointer for a C method to be invoked. */ struct DBusGMethodInfo { GCallback function; /**< C method to invoke */ - DBusGMethodMarshaller marshaller; /**< Marshaller to go DBusGMessage to C method */ + GClosureMarshal marshaller; /**< Marshaller to invoke method */ int data_offset; /**< Offset into the introspection data */ }; /** * Introspection data for a GObject, normally autogenerated by - * a tool such as dbus-glib-tool. + * a tool such as dbus-binding-tool. */ struct DBusGObjectInfo { @@ -115,7 +111,8 @@ struct DBusGObjectInfo * by adding DBusGObjectInfo2, DBusGObjectInfo3, etc. */ const DBusGMethodInfo *infos; /**< Array of method pointers */ - const unsigned char *data; /**< Introspection data */ + int n_infos; /**< Length of the infos array */ + const char *data; /**< Introspection data */ }; void dbus_g_object_class_install_info (GObjectClass *object_class, @@ -174,6 +171,7 @@ void dbus_g_proxy_call_no_reply (DBusGProxy *proxy, const char *method, int first_arg_type, ...); + const char* dbus_g_proxy_get_bus_name (DBusGProxy *proxy); #undef DBUS_INSIDE_DBUS_GLIB_H |