diff options
Diffstat (limited to 'generate')
26 files changed, 1440 insertions, 619 deletions
diff --git a/generate/src/gabble-connection-manager.c b/generate/src/gabble-connection-manager.c index c008294ee..75d363ed7 100644 --- a/generate/src/gabble-connection-manager.c +++ b/generate/src/gabble-connection-manager.c @@ -46,12 +46,16 @@ struct _GabbleConnectionManagerPrivate gboolean dispose_has_run; }; -#define GABBLE_CONNECTION_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GABBLE_TYPE_CONNECTION_MANAGER, GabbleConnectionManagerPrivate)) +#define GABBLE_CONNECTION_MANAGER_GET_PRIVATE(obj) \ + ((GabbleConnectionManagerPrivate *)obj->priv) static void -gabble_connection_manager_init (GabbleConnectionManager *obj) +gabble_connection_manager_init (GabbleConnectionManager *self) { - GabbleConnectionManagerPrivate *priv = GABBLE_CONNECTION_MANAGER_GET_PRIVATE (obj); + GabbleConnectionManagerPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GABBLE_TYPE_CONNECTION_MANAGER, GabbleConnectionManagerPrivate); + + self->priv = priv; /* allocate any data required by the object here */ } @@ -114,16 +118,20 @@ gabble_connection_manager_finalize (GObject *object) /** * gabble_connection_manager_get_parameters * - * Implements DBus method GetParameters + * Implements D-Bus method GetParameters * on interface org.freedesktop.Telepathy.ConnectionManager * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_manager_get_parameters (GabbleConnectionManager *obj, const gchar * proto, GPtrArray ** ret, GError **error) +gboolean +gabble_connection_manager_get_parameters (GabbleConnectionManager *self, + const gchar *proto, + GPtrArray **ret, + GError **error) { return TRUE; } @@ -132,16 +140,19 @@ gboolean gabble_connection_manager_get_parameters (GabbleConnectionManager *obj, /** * gabble_connection_manager_list_protocols * - * Implements DBus method ListProtocols + * Implements D-Bus method ListProtocols * on interface org.freedesktop.Telepathy.ConnectionManager * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_manager_list_protocols (GabbleConnectionManager *obj, gchar *** ret, GError **error) +gboolean +gabble_connection_manager_list_protocols (GabbleConnectionManager *self, + gchar ***ret, + GError **error) { return TRUE; } @@ -150,16 +161,22 @@ gboolean gabble_connection_manager_list_protocols (GabbleConnectionManager *obj, /** * gabble_connection_manager_request_connection * - * Implements DBus method RequestConnection + * Implements D-Bus method RequestConnection * on interface org.freedesktop.Telepathy.ConnectionManager * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_manager_request_connection (GabbleConnectionManager *obj, const gchar * proto, GHashTable * parameters, gchar ** ret, gchar ** ret1, GError **error) +gboolean +gabble_connection_manager_request_connection (GabbleConnectionManager *self, + const gchar *proto, + GHashTable *parameters, + gchar **ret, + gchar **ret1, + GError **error) { return TRUE; } diff --git a/generate/src/gabble-connection-manager.h b/generate/src/gabble-connection-manager.h index 43a1934fe..1605b0b65 100644 --- a/generate/src/gabble-connection-manager.h +++ b/generate/src/gabble-connection-manager.h @@ -34,6 +34,8 @@ struct _GabbleConnectionManagerClass { struct _GabbleConnectionManager { GObject parent; + + gpointer priv; }; GType gabble_connection_manager_get_type(void); @@ -53,9 +55,25 @@ GType gabble_connection_manager_get_type(void); (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_CONNECTION_MANAGER, GabbleConnectionManagerClass)) -gboolean gabble_connection_manager_get_parameters (GabbleConnectionManager *obj, const gchar * proto, GPtrArray ** ret, GError **error); -gboolean gabble_connection_manager_list_protocols (GabbleConnectionManager *obj, gchar *** ret, GError **error); -gboolean gabble_connection_manager_request_connection (GabbleConnectionManager *obj, const gchar * proto, GHashTable * parameters, gchar ** ret, gchar ** ret1, GError **error); +gboolean +gabble_connection_manager_get_parameters (GabbleConnectionManager *self, + const gchar *proto, + GPtrArray **ret, + GError **error); + +gboolean +gabble_connection_manager_list_protocols (GabbleConnectionManager *self, + gchar ***ret, + GError **error); + +gboolean +gabble_connection_manager_request_connection (GabbleConnectionManager *self, + const gchar *proto, + GHashTable *parameters, + gchar **ret, + gchar **ret1, + GError **error); + G_END_DECLS diff --git a/generate/src/gabble-connection-signals-marshal.list b/generate/src/gabble-connection-signals-marshal.list index d20ebedc6..454f56795 100644 --- a/generate/src/gabble-connection-signals-marshal.list +++ b/generate/src/gabble-connection-signals-marshal.list @@ -1,6 +1,2 @@ -VOID:BOXED -VOID:STRING,STRING,INT,INT,BOOLEAN -VOID:BOXED -VOID:BOXED -VOID:BOXED -VOID:INT,INT +VOID:STRING,STRING,UINT,UINT,BOOLEAN +VOID:UINT,UINT diff --git a/generate/src/gabble-connection.c b/generate/src/gabble-connection.c index 721c1d6c1..e49172828 100644 --- a/generate/src/gabble-connection.c +++ b/generate/src/gabble-connection.c @@ -51,12 +51,16 @@ struct _GabbleConnectionPrivate gboolean dispose_has_run; }; -#define GABBLE_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GABBLE_TYPE_CONNECTION, GabbleConnectionPrivate)) +#define GABBLE_CONNECTION_GET_PRIVATE(obj) \ + ((GabbleConnectionPrivate *)obj->priv) static void -gabble_connection_init (GabbleConnection *obj) +gabble_connection_init (GabbleConnection *self) { - GabbleConnectionPrivate *priv = GABBLE_CONNECTION_GET_PRIVATE (obj); + GabbleConnectionPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GABBLE_TYPE_CONNECTION, GabbleConnectionPrivate); + + self->priv = priv; /* allocate any data required by the object here */ } @@ -80,7 +84,7 @@ gabble_connection_class_init (GabbleConnectionClass *gabble_connection_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_connection_marshal_VOID__BOXED, + g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, (dbus_g_type_get_collection ("GPtrArray", (dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID))))); signals[NEW_CHANNEL] = @@ -89,7 +93,7 @@ gabble_connection_class_init (GabbleConnectionClass *gabble_connection_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_connection_marshal_VOID__STRING_STRING_INT_INT_BOOLEAN, + gabble_connection_marshal_VOID__STRING_STRING_UINT_UINT_BOOLEAN, G_TYPE_NONE, 5, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_BOOLEAN); signals[PRESENCE_UPDATE] = @@ -98,7 +102,7 @@ gabble_connection_class_init (GabbleConnectionClass *gabble_connection_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_connection_marshal_VOID__BOXED, + g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, (dbus_g_type_get_map ("GHashTable", G_TYPE_UINT, (dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE)))), G_TYPE_INVALID))))); signals[PROPERTIES_CHANGED] = @@ -107,7 +111,7 @@ gabble_connection_class_init (GabbleConnectionClass *gabble_connection_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_connection_marshal_VOID__BOXED, + g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, (dbus_g_type_get_collection ("GPtrArray", (dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G_TYPE_VALUE, G_TYPE_INVALID))))); signals[PROPERTY_FLAGS_CHANGED] = @@ -116,7 +120,7 @@ gabble_connection_class_init (GabbleConnectionClass *gabble_connection_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_connection_marshal_VOID__BOXED, + g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, (dbus_g_type_get_collection ("GPtrArray", (dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID))))); signals[STATUS_CHANGED] = @@ -125,7 +129,7 @@ gabble_connection_class_init (GabbleConnectionClass *gabble_connection_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_connection_marshal_VOID__INT_INT, + gabble_connection_marshal_VOID__UINT_UINT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (gabble_connection_class), &dbus_glib_gabble_connection_object_info); @@ -164,16 +168,20 @@ gabble_connection_finalize (GObject *object) /** * gabble_connection_add_status * - * Implements DBus method AddStatus + * Implements D-Bus method AddStatus * on interface org.freedesktop.Telepathy.Connection.Interface.Presence * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_add_status (GabbleConnection *obj, const gchar * status, GHashTable * parms, GError **error) +gboolean +gabble_connection_add_status (GabbleConnection *self, + const gchar *status, + GHashTable *parms, + GError **error) { return TRUE; } @@ -182,16 +190,18 @@ gboolean gabble_connection_add_status (GabbleConnection *obj, const gchar * stat /** * gabble_connection_clear_status * - * Implements DBus method ClearStatus + * Implements D-Bus method ClearStatus * on interface org.freedesktop.Telepathy.Connection.Interface.Presence * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_clear_status (GabbleConnection *obj, GError **error) +gboolean +gabble_connection_clear_status (GabbleConnection *self, + GError **error) { return TRUE; } @@ -200,16 +210,18 @@ gboolean gabble_connection_clear_status (GabbleConnection *obj, GError **error) /** * gabble_connection_connect * - * Implements DBus method Connect + * Implements D-Bus method Connect * on interface org.freedesktop.Telepathy.Connection * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_connect (GabbleConnection *obj, GError **error) +gboolean +gabble_connection_connect (GabbleConnection *self, + GError **error) { return TRUE; } @@ -218,16 +230,18 @@ gboolean gabble_connection_connect (GabbleConnection *obj, GError **error) /** * gabble_connection_disconnect * - * Implements DBus method Disconnect + * Implements D-Bus method Disconnect * on interface org.freedesktop.Telepathy.Connection * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_disconnect (GabbleConnection *obj, GError **error) +gboolean +gabble_connection_disconnect (GabbleConnection *self, + GError **error) { return TRUE; } @@ -236,16 +250,19 @@ gboolean gabble_connection_disconnect (GabbleConnection *obj, GError **error) /** * gabble_connection_get_alias_flags * - * Implements DBus method GetAliasFlags + * Implements D-Bus method GetAliasFlags * on interface org.freedesktop.Telepathy.Connection.Interface.Aliasing * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_get_alias_flags (GabbleConnection *obj, guint* ret, GError **error) +gboolean +gabble_connection_get_alias_flags (GabbleConnection *self, + guint *ret, + GError **error) { return TRUE; } @@ -254,16 +271,19 @@ gboolean gabble_connection_get_alias_flags (GabbleConnection *obj, guint* ret, G /** * gabble_connection_get_interfaces * - * Implements DBus method GetInterfaces + * Implements D-Bus method GetInterfaces * on interface org.freedesktop.Telepathy.Connection * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_get_interfaces (GabbleConnection *obj, gchar *** ret, GError **error) +gboolean +gabble_connection_get_interfaces (GabbleConnection *self, + gchar ***ret, + GError **error) { return TRUE; } @@ -272,16 +292,20 @@ gboolean gabble_connection_get_interfaces (GabbleConnection *obj, gchar *** ret, /** * gabble_connection_get_properties * - * Implements DBus method GetProperties + * Implements D-Bus method GetProperties * on interface org.freedesktop.Telepathy.Properties * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_get_properties (GabbleConnection *obj, const GArray * properties, GPtrArray ** ret, GError **error) +gboolean +gabble_connection_get_properties (GabbleConnection *self, + const GArray *properties, + GPtrArray **ret, + GError **error) { return TRUE; } @@ -290,16 +314,19 @@ gboolean gabble_connection_get_properties (GabbleConnection *obj, const GArray * /** * gabble_connection_get_protocol * - * Implements DBus method GetProtocol + * Implements D-Bus method GetProtocol * on interface org.freedesktop.Telepathy.Connection * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_get_protocol (GabbleConnection *obj, gchar ** ret, GError **error) +gboolean +gabble_connection_get_protocol (GabbleConnection *self, + gchar **ret, + GError **error) { return TRUE; } @@ -308,16 +335,19 @@ gboolean gabble_connection_get_protocol (GabbleConnection *obj, gchar ** ret, GE /** * gabble_connection_get_self_handle * - * Implements DBus method GetSelfHandle + * Implements D-Bus method GetSelfHandle * on interface org.freedesktop.Telepathy.Connection * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_get_self_handle (GabbleConnection *obj, guint* ret, GError **error) +gboolean +gabble_connection_get_self_handle (GabbleConnection *self, + guint *ret, + GError **error) { return TRUE; } @@ -326,16 +356,19 @@ gboolean gabble_connection_get_self_handle (GabbleConnection *obj, guint* ret, G /** * gabble_connection_get_status * - * Implements DBus method GetStatus + * Implements D-Bus method GetStatus * on interface org.freedesktop.Telepathy.Connection * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_get_status (GabbleConnection *obj, guint* ret, GError **error) +gboolean +gabble_connection_get_status (GabbleConnection *self, + guint *ret, + GError **error) { return TRUE; } @@ -344,16 +377,19 @@ gboolean gabble_connection_get_status (GabbleConnection *obj, guint* ret, GError /** * gabble_connection_get_statuses * - * Implements DBus method GetStatuses + * Implements D-Bus method GetStatuses * on interface org.freedesktop.Telepathy.Connection.Interface.Presence * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_get_statuses (GabbleConnection *obj, GHashTable ** ret, GError **error) +gboolean +gabble_connection_get_statuses (GabbleConnection *self, + GHashTable **ret, + GError **error) { return TRUE; } @@ -362,46 +398,57 @@ gboolean gabble_connection_get_statuses (GabbleConnection *obj, GHashTable ** re /** * gabble_connection_hold_handles * - * Implements DBus method HoldHandles + * Implements D-Bus method HoldHandles * on interface org.freedesktop.Telepathy.Connection * - * @context: The DBUS invocation context to use to return values + * @context: The D-Bus invocation context to use to return values * or throw an error. */ -gboolean gabble_connection_hold_handles (GabbleConnection *obj, guint handle_type, const GArray * handles, DBusGMethodInvocation *context) +void +gabble_connection_hold_handles (GabbleConnection *self, + guint handle_type, + const GArray *handles, + DBusGMethodInvocation *context) { - return TRUE; + return; } /** * gabble_connection_inspect_handles * - * Implements DBus method InspectHandles + * Implements D-Bus method InspectHandles * on interface org.freedesktop.Telepathy.Connection * - * @context: The DBUS invocation context to use to return values + * @context: The D-Bus invocation context to use to return values * or throw an error. */ -gboolean gabble_connection_inspect_handles (GabbleConnection *obj, guint handle_type, const GArray * handles, DBusGMethodInvocation *context) +void +gabble_connection_inspect_handles (GabbleConnection *self, + guint handle_type, + const GArray *handles, + DBusGMethodInvocation *context) { - return TRUE; + return; } /** * gabble_connection_list_channels * - * Implements DBus method ListChannels + * Implements D-Bus method ListChannels * on interface org.freedesktop.Telepathy.Connection * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_list_channels (GabbleConnection *obj, GPtrArray ** ret, GError **error) +gboolean +gabble_connection_list_channels (GabbleConnection *self, + GPtrArray **ret, + GError **error) { return TRUE; } @@ -410,16 +457,19 @@ gboolean gabble_connection_list_channels (GabbleConnection *obj, GPtrArray ** re /** * gabble_connection_list_properties * - * Implements DBus method ListProperties + * Implements D-Bus method ListProperties * on interface org.freedesktop.Telepathy.Properties * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_list_properties (GabbleConnection *obj, GPtrArray ** ret, GError **error) +gboolean +gabble_connection_list_properties (GabbleConnection *self, + GPtrArray **ret, + GError **error) { return TRUE; } @@ -428,31 +478,38 @@ gboolean gabble_connection_list_properties (GabbleConnection *obj, GPtrArray ** /** * gabble_connection_release_handles * - * Implements DBus method ReleaseHandles + * Implements D-Bus method ReleaseHandles * on interface org.freedesktop.Telepathy.Connection * - * @context: The DBUS invocation context to use to return values + * @context: The D-Bus invocation context to use to return values * or throw an error. */ -gboolean gabble_connection_release_handles (GabbleConnection *obj, guint handle_type, const GArray * handles, DBusGMethodInvocation *context) +void +gabble_connection_release_handles (GabbleConnection *self, + guint handle_type, + const GArray *handles, + DBusGMethodInvocation *context) { - return TRUE; + return; } /** * gabble_connection_remove_status * - * Implements DBus method RemoveStatus + * Implements D-Bus method RemoveStatus * on interface org.freedesktop.Telepathy.Connection.Interface.Presence * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_remove_status (GabbleConnection *obj, const gchar * status, GError **error) +gboolean +gabble_connection_remove_status (GabbleConnection *self, + const gchar *status, + GError **error) { return TRUE; } @@ -461,16 +518,20 @@ gboolean gabble_connection_remove_status (GabbleConnection *obj, const gchar * s /** * gabble_connection_request_aliases * - * Implements DBus method RequestAliases + * Implements D-Bus method RequestAliases * on interface org.freedesktop.Telepathy.Connection.Interface.Aliasing * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_request_aliases (GabbleConnection *obj, const GArray * contacts, gchar *** ret, GError **error) +gboolean +gabble_connection_request_aliases (GabbleConnection *self, + const GArray *contacts, + gchar ***ret, + GError **error) { return TRUE; } @@ -479,46 +540,59 @@ gboolean gabble_connection_request_aliases (GabbleConnection *obj, const GArray /** * gabble_connection_request_channel * - * Implements DBus method RequestChannel + * Implements D-Bus method RequestChannel * on interface org.freedesktop.Telepathy.Connection * - * @context: The DBUS invocation context to use to return values + * @context: The D-Bus invocation context to use to return values * or throw an error. */ -gboolean gabble_connection_request_channel (GabbleConnection *obj, const gchar * type, guint handle_type, guint handle, gboolean suppress_handler, DBusGMethodInvocation *context) +void +gabble_connection_request_channel (GabbleConnection *self, + const gchar *type, + guint handle_type, + guint handle, + gboolean suppress_handler, + DBusGMethodInvocation *context) { - return TRUE; + return; } /** * gabble_connection_request_handles * - * Implements DBus method RequestHandles + * Implements D-Bus method RequestHandles * on interface org.freedesktop.Telepathy.Connection * - * @context: The DBUS invocation context to use to return values + * @context: The D-Bus invocation context to use to return values * or throw an error. */ -gboolean gabble_connection_request_handles (GabbleConnection *obj, guint handle_type, const gchar ** names, DBusGMethodInvocation *context) +void +gabble_connection_request_handles (GabbleConnection *self, + guint handle_type, + const gchar **names, + DBusGMethodInvocation *context) { - return TRUE; + return; } /** * gabble_connection_request_presence * - * Implements DBus method RequestPresence + * Implements D-Bus method RequestPresence * on interface org.freedesktop.Telepathy.Connection.Interface.Presence * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_request_presence (GabbleConnection *obj, const GArray * contacts, GError **error) +gboolean +gabble_connection_request_presence (GabbleConnection *self, + const GArray *contacts, + GError **error) { return TRUE; } @@ -527,16 +601,19 @@ gboolean gabble_connection_request_presence (GabbleConnection *obj, const GArray /** * gabble_connection_set_aliases * - * Implements DBus method SetAliases + * Implements D-Bus method SetAliases * on interface org.freedesktop.Telepathy.Connection.Interface.Aliasing * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_set_aliases (GabbleConnection *obj, GHashTable * aliases, GError **error) +gboolean +gabble_connection_set_aliases (GabbleConnection *self, + GHashTable *aliases, + GError **error) { return TRUE; } @@ -545,16 +622,19 @@ gboolean gabble_connection_set_aliases (GabbleConnection *obj, GHashTable * alia /** * gabble_connection_set_last_activity_time * - * Implements DBus method SetLastActivityTime + * Implements D-Bus method SetLastActivityTime * on interface org.freedesktop.Telepathy.Connection.Interface.Presence * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_set_last_activity_time (GabbleConnection *obj, guint time, GError **error) +gboolean +gabble_connection_set_last_activity_time (GabbleConnection *self, + guint time, + GError **error) { return TRUE; } @@ -563,31 +643,37 @@ gboolean gabble_connection_set_last_activity_time (GabbleConnection *obj, guint /** * gabble_connection_set_properties * - * Implements DBus method SetProperties + * Implements D-Bus method SetProperties * on interface org.freedesktop.Telepathy.Properties * - * @context: The DBUS invocation context to use to return values + * @context: The D-Bus invocation context to use to return values * or throw an error. */ -gboolean gabble_connection_set_properties (GabbleConnection *obj, const GPtrArray * properties, DBusGMethodInvocation *context) +void +gabble_connection_set_properties (GabbleConnection *self, + const GPtrArray *properties, + DBusGMethodInvocation *context) { - return TRUE; + return; } /** * gabble_connection_set_status * - * Implements DBus method SetStatus + * Implements D-Bus method SetStatus * on interface org.freedesktop.Telepathy.Connection.Interface.Presence * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_connection_set_status (GabbleConnection *obj, GHashTable * statuses, GError **error) +gboolean +gabble_connection_set_status (GabbleConnection *self, + GHashTable *statuses, + GError **error) { return TRUE; } diff --git a/generate/src/gabble-connection.h b/generate/src/gabble-connection.h index 31de9d6aa..87bae1bf4 100644 --- a/generate/src/gabble-connection.h +++ b/generate/src/gabble-connection.h @@ -34,6 +34,8 @@ struct _GabbleConnectionClass { struct _GabbleConnection { GObject parent; + + gpointer priv; }; GType gabble_connection_get_type(void); @@ -53,31 +55,138 @@ GType gabble_connection_get_type(void); (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_CONNECTION, GabbleConnectionClass)) -gboolean gabble_connection_add_status (GabbleConnection *obj, const gchar * status, GHashTable * parms, GError **error); -gboolean gabble_connection_clear_status (GabbleConnection *obj, GError **error); -gboolean gabble_connection_connect (GabbleConnection *obj, GError **error); -gboolean gabble_connection_disconnect (GabbleConnection *obj, GError **error); -gboolean gabble_connection_get_alias_flags (GabbleConnection *obj, guint* ret, GError **error); -gboolean gabble_connection_get_interfaces (GabbleConnection *obj, gchar *** ret, GError **error); -gboolean gabble_connection_get_properties (GabbleConnection *obj, const GArray * properties, GPtrArray ** ret, GError **error); -gboolean gabble_connection_get_protocol (GabbleConnection *obj, gchar ** ret, GError **error); -gboolean gabble_connection_get_self_handle (GabbleConnection *obj, guint* ret, GError **error); -gboolean gabble_connection_get_status (GabbleConnection *obj, guint* ret, GError **error); -gboolean gabble_connection_get_statuses (GabbleConnection *obj, GHashTable ** ret, GError **error); -gboolean gabble_connection_hold_handles (GabbleConnection *obj, guint handle_type, const GArray * handles, DBusGMethodInvocation *context); -gboolean gabble_connection_inspect_handles (GabbleConnection *obj, guint handle_type, const GArray * handles, DBusGMethodInvocation *context); -gboolean gabble_connection_list_channels (GabbleConnection *obj, GPtrArray ** ret, GError **error); -gboolean gabble_connection_list_properties (GabbleConnection *obj, GPtrArray ** ret, GError **error); -gboolean gabble_connection_release_handles (GabbleConnection *obj, guint handle_type, const GArray * handles, DBusGMethodInvocation *context); -gboolean gabble_connection_remove_status (GabbleConnection *obj, const gchar * status, GError **error); -gboolean gabble_connection_request_aliases (GabbleConnection *obj, const GArray * contacts, gchar *** ret, GError **error); -gboolean gabble_connection_request_channel (GabbleConnection *obj, const gchar * type, guint handle_type, guint handle, gboolean suppress_handler, DBusGMethodInvocation *context); -gboolean gabble_connection_request_handles (GabbleConnection *obj, guint handle_type, const gchar ** names, DBusGMethodInvocation *context); -gboolean gabble_connection_request_presence (GabbleConnection *obj, const GArray * contacts, GError **error); -gboolean gabble_connection_set_aliases (GabbleConnection *obj, GHashTable * aliases, GError **error); -gboolean gabble_connection_set_last_activity_time (GabbleConnection *obj, guint time, GError **error); -gboolean gabble_connection_set_properties (GabbleConnection *obj, const GPtrArray * properties, DBusGMethodInvocation *context); -gboolean gabble_connection_set_status (GabbleConnection *obj, GHashTable * statuses, GError **error); +gboolean +gabble_connection_add_status (GabbleConnection *self, + const gchar *status, + GHashTable *parms, + GError **error); + +gboolean +gabble_connection_clear_status (GabbleConnection *self, + GError **error); + +gboolean +gabble_connection_connect (GabbleConnection *self, + GError **error); + +gboolean +gabble_connection_disconnect (GabbleConnection *self, + GError **error); + +gboolean +gabble_connection_get_alias_flags (GabbleConnection *self, + guint *ret, + GError **error); + +gboolean +gabble_connection_get_interfaces (GabbleConnection *self, + gchar ***ret, + GError **error); + +gboolean +gabble_connection_get_properties (GabbleConnection *self, + const GArray *properties, + GPtrArray **ret, + GError **error); + +gboolean +gabble_connection_get_protocol (GabbleConnection *self, + gchar **ret, + GError **error); + +gboolean +gabble_connection_get_self_handle (GabbleConnection *self, + guint *ret, + GError **error); + +gboolean +gabble_connection_get_status (GabbleConnection *self, + guint *ret, + GError **error); + +gboolean +gabble_connection_get_statuses (GabbleConnection *self, + GHashTable **ret, + GError **error); + +void +gabble_connection_hold_handles (GabbleConnection *self, + guint handle_type, + const GArray *handles, + DBusGMethodInvocation *context); + +void +gabble_connection_inspect_handles (GabbleConnection *self, + guint handle_type, + const GArray *handles, + DBusGMethodInvocation *context); + +gboolean +gabble_connection_list_channels (GabbleConnection *self, + GPtrArray **ret, + GError **error); + +gboolean +gabble_connection_list_properties (GabbleConnection *self, + GPtrArray **ret, + GError **error); + +void +gabble_connection_release_handles (GabbleConnection *self, + guint handle_type, + const GArray *handles, + DBusGMethodInvocation *context); + +gboolean +gabble_connection_remove_status (GabbleConnection *self, + const gchar *status, + GError **error); + +gboolean +gabble_connection_request_aliases (GabbleConnection *self, + const GArray *contacts, + gchar ***ret, + GError **error); + +void +gabble_connection_request_channel (GabbleConnection *self, + const gchar *type, + guint handle_type, + guint handle, + gboolean suppress_handler, + DBusGMethodInvocation *context); + +void +gabble_connection_request_handles (GabbleConnection *self, + guint handle_type, + const gchar **names, + DBusGMethodInvocation *context); + +gboolean +gabble_connection_request_presence (GabbleConnection *self, + const GArray *contacts, + GError **error); + +gboolean +gabble_connection_set_aliases (GabbleConnection *self, + GHashTable *aliases, + GError **error); + +gboolean +gabble_connection_set_last_activity_time (GabbleConnection *self, + guint time, + GError **error); + +void +gabble_connection_set_properties (GabbleConnection *self, + const GPtrArray *properties, + DBusGMethodInvocation *context); + +gboolean +gabble_connection_set_status (GabbleConnection *self, + GHashTable *statuses, + GError **error); + G_END_DECLS diff --git a/generate/src/gabble-im-channel-signals-marshal.list b/generate/src/gabble-im-channel-signals-marshal.list index de34ec1dc..da94b09b2 100644 --- a/generate/src/gabble-im-channel-signals-marshal.list +++ b/generate/src/gabble-im-channel-signals-marshal.list @@ -1,5 +1,3 @@ -VOID:VOID -VOID:VOID -VOID:INT,INT,INT,INT,INT,STRING -VOID:INT,INT,INT,STRING -VOID:INT,INT,STRING +VOID:UINT,UINT,UINT,UINT,UINT,STRING +VOID:UINT,UINT,UINT,STRING +VOID:UINT,UINT,STRING diff --git a/generate/src/gabble-im-channel.c b/generate/src/gabble-im-channel.c index 7008b2adc..132880029 100644 --- a/generate/src/gabble-im-channel.c +++ b/generate/src/gabble-im-channel.c @@ -50,12 +50,16 @@ struct _GabbleIMChannelPrivate gboolean dispose_has_run; }; -#define GABBLE_IM_CHANNEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GABBLE_TYPE_IM_CHANNEL, GabbleIMChannelPrivate)) +#define GABBLE_IM_CHANNEL_GET_PRIVATE(obj) \ + ((GabbleIMChannelPrivate *)obj->priv) static void -gabble_im_channel_init (GabbleIMChannel *obj) +gabble_im_channel_init (GabbleIMChannel *self) { - GabbleIMChannelPrivate *priv = GABBLE_IM_CHANNEL_GET_PRIVATE (obj); + GabbleIMChannelPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GABBLE_TYPE_IM_CHANNEL, GabbleIMChannelPrivate); + + self->priv = priv; /* allocate any data required by the object here */ } @@ -79,7 +83,7 @@ gabble_im_channel_class_init (GabbleIMChannelClass *gabble_im_channel_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_im_channel_marshal_VOID__VOID, + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); signals[LOST_MESSAGE] = @@ -88,7 +92,7 @@ gabble_im_channel_class_init (GabbleIMChannelClass *gabble_im_channel_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_im_channel_marshal_VOID__VOID, + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); signals[RECEIVED] = @@ -97,7 +101,7 @@ gabble_im_channel_class_init (GabbleIMChannelClass *gabble_im_channel_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_im_channel_marshal_VOID__INT_INT_INT_INT_INT_STRING, + gabble_im_channel_marshal_VOID__UINT_UINT_UINT_UINT_UINT_STRING, G_TYPE_NONE, 6, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING); signals[SEND_ERROR] = @@ -106,7 +110,7 @@ gabble_im_channel_class_init (GabbleIMChannelClass *gabble_im_channel_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_im_channel_marshal_VOID__INT_INT_INT_STRING, + gabble_im_channel_marshal_VOID__UINT_UINT_UINT_STRING, G_TYPE_NONE, 4, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING); signals[SENT] = @@ -115,7 +119,7 @@ gabble_im_channel_class_init (GabbleIMChannelClass *gabble_im_channel_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_im_channel_marshal_VOID__INT_INT_STRING, + gabble_im_channel_marshal_VOID__UINT_UINT_STRING, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING); dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (gabble_im_channel_class), &dbus_glib_gabble_im_channel_object_info); @@ -154,16 +158,19 @@ gabble_im_channel_finalize (GObject *object) /** * gabble_im_channel_acknowledge_pending_messages * - * Implements DBus method AcknowledgePendingMessages + * Implements D-Bus method AcknowledgePendingMessages * on interface org.freedesktop.Telepathy.Channel.Type.Text * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_im_channel_acknowledge_pending_messages (GabbleIMChannel *obj, const GArray * ids, GError **error) +gboolean +gabble_im_channel_acknowledge_pending_messages (GabbleIMChannel *self, + const GArray *ids, + GError **error) { return TRUE; } @@ -172,16 +179,18 @@ gboolean gabble_im_channel_acknowledge_pending_messages (GabbleIMChannel *obj, c /** * gabble_im_channel_close * - * Implements DBus method Close + * Implements D-Bus method Close * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_im_channel_close (GabbleIMChannel *obj, GError **error) +gboolean +gabble_im_channel_close (GabbleIMChannel *self, + GError **error) { return TRUE; } @@ -190,16 +199,19 @@ gboolean gabble_im_channel_close (GabbleIMChannel *obj, GError **error) /** * gabble_im_channel_get_channel_type * - * Implements DBus method GetChannelType + * Implements D-Bus method GetChannelType * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_im_channel_get_channel_type (GabbleIMChannel *obj, gchar ** ret, GError **error) +gboolean +gabble_im_channel_get_channel_type (GabbleIMChannel *self, + gchar **ret, + GError **error) { return TRUE; } @@ -208,16 +220,20 @@ gboolean gabble_im_channel_get_channel_type (GabbleIMChannel *obj, gchar ** ret, /** * gabble_im_channel_get_handle * - * Implements DBus method GetHandle + * Implements D-Bus method GetHandle * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_im_channel_get_handle (GabbleIMChannel *obj, guint* ret, guint* ret1, GError **error) +gboolean +gabble_im_channel_get_handle (GabbleIMChannel *self, + guint *ret, + guint *ret1, + GError **error) { return TRUE; } @@ -226,16 +242,19 @@ gboolean gabble_im_channel_get_handle (GabbleIMChannel *obj, guint* ret, guint* /** * gabble_im_channel_get_interfaces * - * Implements DBus method GetInterfaces + * Implements D-Bus method GetInterfaces * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_im_channel_get_interfaces (GabbleIMChannel *obj, gchar *** ret, GError **error) +gboolean +gabble_im_channel_get_interfaces (GabbleIMChannel *self, + gchar ***ret, + GError **error) { return TRUE; } @@ -244,16 +263,19 @@ gboolean gabble_im_channel_get_interfaces (GabbleIMChannel *obj, gchar *** ret, /** * gabble_im_channel_get_message_types * - * Implements DBus method GetMessageTypes + * Implements D-Bus method GetMessageTypes * on interface org.freedesktop.Telepathy.Channel.Type.Text * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_im_channel_get_message_types (GabbleIMChannel *obj, GArray ** ret, GError **error) +gboolean +gabble_im_channel_get_message_types (GabbleIMChannel *self, + GArray **ret, + GError **error) { return TRUE; } @@ -262,16 +284,20 @@ gboolean gabble_im_channel_get_message_types (GabbleIMChannel *obj, GArray ** re /** * gabble_im_channel_list_pending_messages * - * Implements DBus method ListPendingMessages + * Implements D-Bus method ListPendingMessages * on interface org.freedesktop.Telepathy.Channel.Type.Text * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_im_channel_list_pending_messages (GabbleIMChannel *obj, gboolean clear, GPtrArray ** ret, GError **error) +gboolean +gabble_im_channel_list_pending_messages (GabbleIMChannel *self, + gboolean clear, + GPtrArray **ret, + GError **error) { return TRUE; } @@ -280,16 +306,20 @@ gboolean gabble_im_channel_list_pending_messages (GabbleIMChannel *obj, gboolean /** * gabble_im_channel_send * - * Implements DBus method Send + * Implements D-Bus method Send * on interface org.freedesktop.Telepathy.Channel.Type.Text * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_im_channel_send (GabbleIMChannel *obj, guint type, const gchar * text, GError **error) +gboolean +gabble_im_channel_send (GabbleIMChannel *self, + guint type, + const gchar *text, + GError **error) { return TRUE; } diff --git a/generate/src/gabble-im-channel.h b/generate/src/gabble-im-channel.h index 390e92271..91e79cba5 100644 --- a/generate/src/gabble-im-channel.h +++ b/generate/src/gabble-im-channel.h @@ -34,6 +34,8 @@ struct _GabbleIMChannelClass { struct _GabbleIMChannel { GObject parent; + + gpointer priv; }; GType gabble_im_channel_get_type(void); @@ -53,14 +55,48 @@ GType gabble_im_channel_get_type(void); (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_IM_CHANNEL, GabbleIMChannelClass)) -gboolean gabble_im_channel_acknowledge_pending_messages (GabbleIMChannel *obj, const GArray * ids, GError **error); -gboolean gabble_im_channel_close (GabbleIMChannel *obj, GError **error); -gboolean gabble_im_channel_get_channel_type (GabbleIMChannel *obj, gchar ** ret, GError **error); -gboolean gabble_im_channel_get_handle (GabbleIMChannel *obj, guint* ret, guint* ret1, GError **error); -gboolean gabble_im_channel_get_interfaces (GabbleIMChannel *obj, gchar *** ret, GError **error); -gboolean gabble_im_channel_get_message_types (GabbleIMChannel *obj, GArray ** ret, GError **error); -gboolean gabble_im_channel_list_pending_messages (GabbleIMChannel *obj, gboolean clear, GPtrArray ** ret, GError **error); -gboolean gabble_im_channel_send (GabbleIMChannel *obj, guint type, const gchar * text, GError **error); +gboolean +gabble_im_channel_acknowledge_pending_messages (GabbleIMChannel *self, + const GArray *ids, + GError **error); + +gboolean +gabble_im_channel_close (GabbleIMChannel *self, + GError **error); + +gboolean +gabble_im_channel_get_channel_type (GabbleIMChannel *self, + gchar **ret, + GError **error); + +gboolean +gabble_im_channel_get_handle (GabbleIMChannel *self, + guint *ret, + guint *ret1, + GError **error); + +gboolean +gabble_im_channel_get_interfaces (GabbleIMChannel *self, + gchar ***ret, + GError **error); + +gboolean +gabble_im_channel_get_message_types (GabbleIMChannel *self, + GArray **ret, + GError **error); + +gboolean +gabble_im_channel_list_pending_messages (GabbleIMChannel *self, + gboolean clear, + GPtrArray **ret, + GError **error); + +gboolean +gabble_im_channel_send (GabbleIMChannel *self, + guint type, + const gchar *text, + GError **error); + G_END_DECLS diff --git a/generate/src/gabble-media-channel-signals-marshal.list b/generate/src/gabble-media-channel-signals-marshal.list index 4491ccebb..cbcb8a317 100644 --- a/generate/src/gabble-media-channel-signals-marshal.list +++ b/generate/src/gabble-media-channel-signals-marshal.list @@ -1,7 +1,4 @@ -VOID:VOID -VOID:INT,INT -VOID:STRING,BOXED,BOXED,BOXED,BOXED,INT,INT VOID:STRING,STRING -VOID:INT,INT,INT -VOID:INT -VOID:INT,INT +VOID:UINT,UINT +VOID:UINT,UINT,UINT +VOID:STRING,BOXED,BOXED,BOXED,BOXED,UINT,UINT diff --git a/generate/src/gabble-media-channel.c b/generate/src/gabble-media-channel.c index 47406e994..6a0fec4c4 100644 --- a/generate/src/gabble-media-channel.c +++ b/generate/src/gabble-media-channel.c @@ -52,12 +52,16 @@ struct _GabbleMediaChannelPrivate gboolean dispose_has_run; }; -#define GABBLE_MEDIA_CHANNEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GABBLE_TYPE_MEDIA_CHANNEL, GabbleMediaChannelPrivate)) +#define GABBLE_MEDIA_CHANNEL_GET_PRIVATE(obj) \ + ((GabbleMediaChannelPrivate *)obj->priv) static void -gabble_media_channel_init (GabbleMediaChannel *obj) +gabble_media_channel_init (GabbleMediaChannel *self) { - GabbleMediaChannelPrivate *priv = GABBLE_MEDIA_CHANNEL_GET_PRIVATE (obj); + GabbleMediaChannelPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GABBLE_TYPE_MEDIA_CHANNEL, GabbleMediaChannelPrivate); + + self->priv = priv; /* allocate any data required by the object here */ } @@ -81,7 +85,7 @@ gabble_media_channel_class_init (GabbleMediaChannelClass *gabble_media_channel_c G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_media_channel_marshal_VOID__VOID, + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); signals[GROUP_FLAGS_CHANGED] = @@ -90,7 +94,7 @@ gabble_media_channel_class_init (GabbleMediaChannelClass *gabble_media_channel_c G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_media_channel_marshal_VOID__INT_INT, + gabble_media_channel_marshal_VOID__UINT_UINT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); signals[MEMBERS_CHANGED] = @@ -99,7 +103,7 @@ gabble_media_channel_class_init (GabbleMediaChannelClass *gabble_media_channel_c G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_media_channel_marshal_VOID__STRING_BOXED_BOXED_BOXED_BOXED_INT_INT, + gabble_media_channel_marshal_VOID__STRING_BOXED_BOXED_BOXED_BOXED_UINT_UINT, G_TYPE_NONE, 7, G_TYPE_STRING, DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY, G_TYPE_UINT, G_TYPE_UINT); signals[NEW_ICE_SESSION_HANDLER] = @@ -117,7 +121,7 @@ gabble_media_channel_class_init (GabbleMediaChannelClass *gabble_media_channel_c G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_media_channel_marshal_VOID__INT_INT_INT, + gabble_media_channel_marshal_VOID__UINT_UINT_UINT, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT); signals[STREAM_REMOVED] = @@ -126,7 +130,7 @@ gabble_media_channel_class_init (GabbleMediaChannelClass *gabble_media_channel_c G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_media_channel_marshal_VOID__INT, + g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT); signals[STREAM_STATE_CHANGED] = @@ -135,7 +139,7 @@ gabble_media_channel_class_init (GabbleMediaChannelClass *gabble_media_channel_c G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_media_channel_marshal_VOID__INT_INT, + gabble_media_channel_marshal_VOID__UINT_UINT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (gabble_media_channel_class), &dbus_glib_gabble_media_channel_object_info); @@ -174,16 +178,20 @@ gabble_media_channel_finalize (GObject *object) /** * gabble_media_channel_add_members * - * Implements DBus method AddMembers + * Implements D-Bus method AddMembers * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_channel_add_members (GabbleMediaChannel *obj, const GArray * contacts, const gchar * message, GError **error) +gboolean +gabble_media_channel_add_members (GabbleMediaChannel *self, + const GArray *contacts, + const gchar *message, + GError **error) { return TRUE; } @@ -192,16 +200,18 @@ gboolean gabble_media_channel_add_members (GabbleMediaChannel *obj, const GArray /** * gabble_media_channel_close * - * Implements DBus method Close + * Implements D-Bus method Close * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_channel_close (GabbleMediaChannel *obj, GError **error) +gboolean +gabble_media_channel_close (GabbleMediaChannel *self, + GError **error) { return TRUE; } @@ -210,16 +220,21 @@ gboolean gabble_media_channel_close (GabbleMediaChannel *obj, GError **error) /** * gabble_media_channel_get_all_members * - * Implements DBus method GetAllMembers + * Implements D-Bus method GetAllMembers * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_channel_get_all_members (GabbleMediaChannel *obj, GArray ** ret, GArray ** ret1, GArray ** ret2, GError **error) +gboolean +gabble_media_channel_get_all_members (GabbleMediaChannel *self, + GArray **ret, + GArray **ret1, + GArray **ret2, + GError **error) { return TRUE; } @@ -228,16 +243,19 @@ gboolean gabble_media_channel_get_all_members (GabbleMediaChannel *obj, GArray * /** * gabble_media_channel_get_channel_type * - * Implements DBus method GetChannelType + * Implements D-Bus method GetChannelType * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_channel_get_channel_type (GabbleMediaChannel *obj, gchar ** ret, GError **error) +gboolean +gabble_media_channel_get_channel_type (GabbleMediaChannel *self, + gchar **ret, + GError **error) { return TRUE; } @@ -246,16 +264,19 @@ gboolean gabble_media_channel_get_channel_type (GabbleMediaChannel *obj, gchar * /** * gabble_media_channel_get_group_flags * - * Implements DBus method GetGroupFlags + * Implements D-Bus method GetGroupFlags * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_channel_get_group_flags (GabbleMediaChannel *obj, guint* ret, GError **error) +gboolean +gabble_media_channel_get_group_flags (GabbleMediaChannel *self, + guint *ret, + GError **error) { return TRUE; } @@ -264,16 +285,20 @@ gboolean gabble_media_channel_get_group_flags (GabbleMediaChannel *obj, guint* r /** * gabble_media_channel_get_handle * - * Implements DBus method GetHandle + * Implements D-Bus method GetHandle * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_channel_get_handle (GabbleMediaChannel *obj, guint* ret, guint* ret1, GError **error) +gboolean +gabble_media_channel_get_handle (GabbleMediaChannel *self, + guint *ret, + guint *ret1, + GError **error) { return TRUE; } @@ -282,16 +307,20 @@ gboolean gabble_media_channel_get_handle (GabbleMediaChannel *obj, guint* ret, g /** * gabble_media_channel_get_handle_owners * - * Implements DBus method GetHandleOwners + * Implements D-Bus method GetHandleOwners * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_channel_get_handle_owners (GabbleMediaChannel *obj, const GArray * handles, GArray ** ret, GError **error) +gboolean +gabble_media_channel_get_handle_owners (GabbleMediaChannel *self, + const GArray *handles, + GArray **ret, + GError **error) { return TRUE; } @@ -300,16 +329,19 @@ gboolean gabble_media_channel_get_handle_owners (GabbleMediaChannel *obj, const /** * gabble_media_channel_get_interfaces * - * Implements DBus method GetInterfaces + * Implements D-Bus method GetInterfaces * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_channel_get_interfaces (GabbleMediaChannel *obj, gchar *** ret, GError **error) +gboolean +gabble_media_channel_get_interfaces (GabbleMediaChannel *self, + gchar ***ret, + GError **error) { return TRUE; } @@ -318,16 +350,19 @@ gboolean gabble_media_channel_get_interfaces (GabbleMediaChannel *obj, gchar *** /** * gabble_media_channel_get_local_pending_members * - * Implements DBus method GetLocalPendingMembers + * Implements D-Bus method GetLocalPendingMembers * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_channel_get_local_pending_members (GabbleMediaChannel *obj, GArray ** ret, GError **error) +gboolean +gabble_media_channel_get_local_pending_members (GabbleMediaChannel *self, + GArray **ret, + GError **error) { return TRUE; } @@ -336,16 +371,19 @@ gboolean gabble_media_channel_get_local_pending_members (GabbleMediaChannel *obj /** * gabble_media_channel_get_members * - * Implements DBus method GetMembers + * Implements D-Bus method GetMembers * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_channel_get_members (GabbleMediaChannel *obj, GArray ** ret, GError **error) +gboolean +gabble_media_channel_get_members (GabbleMediaChannel *self, + GArray **ret, + GError **error) { return TRUE; } @@ -354,16 +392,19 @@ gboolean gabble_media_channel_get_members (GabbleMediaChannel *obj, GArray ** re /** * gabble_media_channel_get_remote_pending_members * - * Implements DBus method GetRemotePendingMembers + * Implements D-Bus method GetRemotePendingMembers * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_channel_get_remote_pending_members (GabbleMediaChannel *obj, GArray ** ret, GError **error) +gboolean +gabble_media_channel_get_remote_pending_members (GabbleMediaChannel *self, + GArray **ret, + GError **error) { return TRUE; } @@ -372,16 +413,19 @@ gboolean gabble_media_channel_get_remote_pending_members (GabbleMediaChannel *ob /** * gabble_media_channel_get_self_handle * - * Implements DBus method GetSelfHandle + * Implements D-Bus method GetSelfHandle * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_channel_get_self_handle (GabbleMediaChannel *obj, guint* ret, GError **error) +gboolean +gabble_media_channel_get_self_handle (GabbleMediaChannel *self, + guint *ret, + GError **error) { return TRUE; } @@ -390,16 +434,19 @@ gboolean gabble_media_channel_get_self_handle (GabbleMediaChannel *obj, guint* r /** * gabble_media_channel_get_session_handlers * - * Implements DBus method GetSessionHandlers + * Implements D-Bus method GetSessionHandlers * on interface org.freedesktop.Telepathy.Channel.Interface.IceSignalling * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_channel_get_session_handlers (GabbleMediaChannel *obj, GPtrArray ** ret, GError **error) +gboolean +gabble_media_channel_get_session_handlers (GabbleMediaChannel *self, + GPtrArray **ret, + GError **error) { return TRUE; } @@ -408,16 +455,19 @@ gboolean gabble_media_channel_get_session_handlers (GabbleMediaChannel *obj, GPt /** * gabble_media_channel_list_streams * - * Implements DBus method ListStreams + * Implements D-Bus method ListStreams * on interface org.freedesktop.Telepathy.Channel.Type.StreamedMedia * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_channel_list_streams (GabbleMediaChannel *obj, GPtrArray ** ret, GError **error) +gboolean +gabble_media_channel_list_streams (GabbleMediaChannel *self, + GPtrArray **ret, + GError **error) { return TRUE; } @@ -426,16 +476,20 @@ gboolean gabble_media_channel_list_streams (GabbleMediaChannel *obj, GPtrArray * /** * gabble_media_channel_remove_members * - * Implements DBus method RemoveMembers + * Implements D-Bus method RemoveMembers * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_channel_remove_members (GabbleMediaChannel *obj, const GArray * contacts, const gchar * message, GError **error) +gboolean +gabble_media_channel_remove_members (GabbleMediaChannel *self, + const GArray *contacts, + const gchar *message, + GError **error) { return TRUE; } @@ -444,16 +498,21 @@ gboolean gabble_media_channel_remove_members (GabbleMediaChannel *obj, const GAr /** * gabble_media_channel_request_streams * - * Implements DBus method RequestStreams + * Implements D-Bus method RequestStreams * on interface org.freedesktop.Telepathy.Channel.Type.StreamedMedia * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_channel_request_streams (GabbleMediaChannel *obj, guint contact_handle, const GArray * types, GArray ** ret, GError **error) +gboolean +gabble_media_channel_request_streams (GabbleMediaChannel *self, + guint contact_handle, + const GArray *types, + GArray **ret, + GError **error) { return TRUE; } diff --git a/generate/src/gabble-media-channel.h b/generate/src/gabble-media-channel.h index 5c6d5e131..4704dee26 100644 --- a/generate/src/gabble-media-channel.h +++ b/generate/src/gabble-media-channel.h @@ -34,6 +34,8 @@ struct _GabbleMediaChannelClass { struct _GabbleMediaChannel { GObject parent; + + gpointer priv; }; GType gabble_media_channel_get_type(void); @@ -53,22 +55,93 @@ GType gabble_media_channel_get_type(void); (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_MEDIA_CHANNEL, GabbleMediaChannelClass)) -gboolean gabble_media_channel_add_members (GabbleMediaChannel *obj, const GArray * contacts, const gchar * message, GError **error); -gboolean gabble_media_channel_close (GabbleMediaChannel *obj, GError **error); -gboolean gabble_media_channel_get_all_members (GabbleMediaChannel *obj, GArray ** ret, GArray ** ret1, GArray ** ret2, GError **error); -gboolean gabble_media_channel_get_channel_type (GabbleMediaChannel *obj, gchar ** ret, GError **error); -gboolean gabble_media_channel_get_group_flags (GabbleMediaChannel *obj, guint* ret, GError **error); -gboolean gabble_media_channel_get_handle (GabbleMediaChannel *obj, guint* ret, guint* ret1, GError **error); -gboolean gabble_media_channel_get_handle_owners (GabbleMediaChannel *obj, const GArray * handles, GArray ** ret, GError **error); -gboolean gabble_media_channel_get_interfaces (GabbleMediaChannel *obj, gchar *** ret, GError **error); -gboolean gabble_media_channel_get_local_pending_members (GabbleMediaChannel *obj, GArray ** ret, GError **error); -gboolean gabble_media_channel_get_members (GabbleMediaChannel *obj, GArray ** ret, GError **error); -gboolean gabble_media_channel_get_remote_pending_members (GabbleMediaChannel *obj, GArray ** ret, GError **error); -gboolean gabble_media_channel_get_self_handle (GabbleMediaChannel *obj, guint* ret, GError **error); -gboolean gabble_media_channel_get_session_handlers (GabbleMediaChannel *obj, GPtrArray ** ret, GError **error); -gboolean gabble_media_channel_list_streams (GabbleMediaChannel *obj, GPtrArray ** ret, GError **error); -gboolean gabble_media_channel_remove_members (GabbleMediaChannel *obj, const GArray * contacts, const gchar * message, GError **error); -gboolean gabble_media_channel_request_streams (GabbleMediaChannel *obj, guint contact_handle, const GArray * types, GArray ** ret, GError **error); +gboolean +gabble_media_channel_add_members (GabbleMediaChannel *self, + const GArray *contacts, + const gchar *message, + GError **error); + +gboolean +gabble_media_channel_close (GabbleMediaChannel *self, + GError **error); + +gboolean +gabble_media_channel_get_all_members (GabbleMediaChannel *self, + GArray **ret, + GArray **ret1, + GArray **ret2, + GError **error); + +gboolean +gabble_media_channel_get_channel_type (GabbleMediaChannel *self, + gchar **ret, + GError **error); + +gboolean +gabble_media_channel_get_group_flags (GabbleMediaChannel *self, + guint *ret, + GError **error); + +gboolean +gabble_media_channel_get_handle (GabbleMediaChannel *self, + guint *ret, + guint *ret1, + GError **error); + +gboolean +gabble_media_channel_get_handle_owners (GabbleMediaChannel *self, + const GArray *handles, + GArray **ret, + GError **error); + +gboolean +gabble_media_channel_get_interfaces (GabbleMediaChannel *self, + gchar ***ret, + GError **error); + +gboolean +gabble_media_channel_get_local_pending_members (GabbleMediaChannel *self, + GArray **ret, + GError **error); + +gboolean +gabble_media_channel_get_members (GabbleMediaChannel *self, + GArray **ret, + GError **error); + +gboolean +gabble_media_channel_get_remote_pending_members (GabbleMediaChannel *self, + GArray **ret, + GError **error); + +gboolean +gabble_media_channel_get_self_handle (GabbleMediaChannel *self, + guint *ret, + GError **error); + +gboolean +gabble_media_channel_get_session_handlers (GabbleMediaChannel *self, + GPtrArray **ret, + GError **error); + +gboolean +gabble_media_channel_list_streams (GabbleMediaChannel *self, + GPtrArray **ret, + GError **error); + +gboolean +gabble_media_channel_remove_members (GabbleMediaChannel *self, + const GArray *contacts, + const gchar *message, + GError **error); + +gboolean +gabble_media_channel_request_streams (GabbleMediaChannel *self, + guint contact_handle, + const GArray *types, + GArray **ret, + GError **error); + G_END_DECLS diff --git a/generate/src/gabble-media-session-signals-marshal.list b/generate/src/gabble-media-session-signals-marshal.list index 598b9168e..f46d6646b 100644 --- a/generate/src/gabble-media-session-signals-marshal.list +++ b/generate/src/gabble-media-session-signals-marshal.list @@ -1 +1 @@ -VOID:STRING,INT,INT,INT +VOID:STRING,UINT,UINT,UINT diff --git a/generate/src/gabble-media-session.c b/generate/src/gabble-media-session.c index dda683d43..51b6b3100 100644 --- a/generate/src/gabble-media-session.c +++ b/generate/src/gabble-media-session.c @@ -46,12 +46,16 @@ struct _GabbleMediaSessionPrivate gboolean dispose_has_run; }; -#define GABBLE_MEDIA_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GABBLE_TYPE_MEDIA_SESSION, GabbleMediaSessionPrivate)) +#define GABBLE_MEDIA_SESSION_GET_PRIVATE(obj) \ + ((GabbleMediaSessionPrivate *)obj->priv) static void -gabble_media_session_init (GabbleMediaSession *obj) +gabble_media_session_init (GabbleMediaSession *self) { - GabbleMediaSessionPrivate *priv = GABBLE_MEDIA_SESSION_GET_PRIVATE (obj); + GabbleMediaSessionPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GABBLE_TYPE_MEDIA_SESSION, GabbleMediaSessionPrivate); + + self->priv = priv; /* allocate any data required by the object here */ } @@ -75,7 +79,7 @@ gabble_media_session_class_init (GabbleMediaSessionClass *gabble_media_session_c G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_media_session_marshal_VOID__STRING_INT_INT_INT, + gabble_media_session_marshal_VOID__STRING_UINT_UINT_UINT, G_TYPE_NONE, 4, DBUS_TYPE_G_OBJECT_PATH, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT); dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (gabble_media_session_class), &dbus_glib_gabble_media_session_object_info); @@ -114,16 +118,20 @@ gabble_media_session_finalize (GObject *object) /** * gabble_media_session_error * - * Implements DBus method Error + * Implements D-Bus method Error * on interface org.freedesktop.Telepathy.Ice.SessionHandler * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_session_error (GabbleMediaSession *obj, guint errno, const gchar * message, GError **error) +gboolean +gabble_media_session_error (GabbleMediaSession *self, + guint errno, + const gchar *message, + GError **error) { return TRUE; } @@ -132,16 +140,18 @@ gboolean gabble_media_session_error (GabbleMediaSession *obj, guint errno, const /** * gabble_media_session_ready * - * Implements DBus method Ready + * Implements D-Bus method Ready * on interface org.freedesktop.Telepathy.Ice.SessionHandler * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_session_ready (GabbleMediaSession *obj, GError **error) +gboolean +gabble_media_session_ready (GabbleMediaSession *self, + GError **error) { return TRUE; } diff --git a/generate/src/gabble-media-session.h b/generate/src/gabble-media-session.h index 2010a4616..f8cbec03f 100644 --- a/generate/src/gabble-media-session.h +++ b/generate/src/gabble-media-session.h @@ -34,6 +34,8 @@ struct _GabbleMediaSessionClass { struct _GabbleMediaSession { GObject parent; + + gpointer priv; }; GType gabble_media_session_get_type(void); @@ -53,8 +55,16 @@ GType gabble_media_session_get_type(void); (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_MEDIA_SESSION, GabbleMediaSessionClass)) -gboolean gabble_media_session_error (GabbleMediaSession *obj, guint errno, const gchar * message, GError **error); -gboolean gabble_media_session_ready (GabbleMediaSession *obj, GError **error); +gboolean +gabble_media_session_error (GabbleMediaSession *self, + guint errno, + const gchar *message, + GError **error); + +gboolean +gabble_media_session_ready (GabbleMediaSession *self, + GError **error); + G_END_DECLS diff --git a/generate/src/gabble-media-stream-signals-marshal.list b/generate/src/gabble-media-stream-signals-marshal.list index bd5bb77b2..60e5cb9f9 100644 --- a/generate/src/gabble-media-stream-signals-marshal.list +++ b/generate/src/gabble-media-stream-signals-marshal.list @@ -1,6 +1,2 @@ -VOID:STRING,BOXED -VOID:STRING VOID:STRING,STRING -VOID:BOXED -VOID:BOXED -VOID:BOOLEAN +VOID:STRING,BOXED diff --git a/generate/src/gabble-media-stream.c b/generate/src/gabble-media-stream.c index ae7d19f41..34fc1768b 100644 --- a/generate/src/gabble-media-stream.c +++ b/generate/src/gabble-media-stream.c @@ -51,12 +51,16 @@ struct _GabbleMediaStreamPrivate gboolean dispose_has_run; }; -#define GABBLE_MEDIA_STREAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GABBLE_TYPE_MEDIA_STREAM, GabbleMediaStreamPrivate)) +#define GABBLE_MEDIA_STREAM_GET_PRIVATE(obj) \ + ((GabbleMediaStreamPrivate *)obj->priv) static void -gabble_media_stream_init (GabbleMediaStream *obj) +gabble_media_stream_init (GabbleMediaStream *self) { - GabbleMediaStreamPrivate *priv = GABBLE_MEDIA_STREAM_GET_PRIVATE (obj); + GabbleMediaStreamPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GABBLE_TYPE_MEDIA_STREAM, GabbleMediaStreamPrivate); + + self->priv = priv; /* allocate any data required by the object here */ } @@ -89,7 +93,7 @@ gabble_media_stream_class_init (GabbleMediaStreamClass *gabble_media_stream_clas G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_media_stream_marshal_VOID__STRING, + g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); signals[SET_ACTIVE_CANDIDATE_PAIR] = @@ -107,7 +111,7 @@ gabble_media_stream_class_init (GabbleMediaStreamClass *gabble_media_stream_clas G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_media_stream_marshal_VOID__BOXED, + g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, (dbus_g_type_get_collection ("GPtrArray", (dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING, (dbus_g_type_get_collection ("GPtrArray", (dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_DOUBLE, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID)))), G_TYPE_INVALID))))); signals[SET_REMOTE_CODECS] = @@ -116,7 +120,7 @@ gabble_media_stream_class_init (GabbleMediaStreamClass *gabble_media_stream_clas G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_media_stream_marshal_VOID__BOXED, + g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, (dbus_g_type_get_collection ("GPtrArray", (dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, DBUS_TYPE_G_STRING_STRING_HASHTABLE, G_TYPE_INVALID))))); signals[SET_STREAM_PLAYING] = @@ -125,7 +129,7 @@ gabble_media_stream_class_init (GabbleMediaStreamClass *gabble_media_stream_clas G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_media_stream_marshal_VOID__BOOLEAN, + g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (gabble_media_stream_class), &dbus_glib_gabble_media_stream_object_info); @@ -164,16 +168,19 @@ gabble_media_stream_finalize (GObject *object) /** * gabble_media_stream_codec_choice * - * Implements DBus method CodecChoice + * Implements D-Bus method CodecChoice * on interface org.freedesktop.Telepathy.Ice.StreamHandler * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_stream_codec_choice (GabbleMediaStream *obj, guint codec_id, GError **error) +gboolean +gabble_media_stream_codec_choice (GabbleMediaStream *self, + guint codec_id, + GError **error) { return TRUE; } @@ -182,16 +189,20 @@ gboolean gabble_media_stream_codec_choice (GabbleMediaStream *obj, guint codec_i /** * gabble_media_stream_error * - * Implements DBus method Error + * Implements D-Bus method Error * on interface org.freedesktop.Telepathy.Ice.StreamHandler * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_stream_error (GabbleMediaStream *obj, guint errno, const gchar * message, GError **error) +gboolean +gabble_media_stream_error (GabbleMediaStream *self, + guint errno, + const gchar *message, + GError **error) { return TRUE; } @@ -200,16 +211,18 @@ gboolean gabble_media_stream_error (GabbleMediaStream *obj, guint errno, const g /** * gabble_media_stream_native_candidates_prepared * - * Implements DBus method NativeCandidatesPrepared + * Implements D-Bus method NativeCandidatesPrepared * on interface org.freedesktop.Telepathy.Ice.StreamHandler * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_stream_native_candidates_prepared (GabbleMediaStream *obj, GError **error) +gboolean +gabble_media_stream_native_candidates_prepared (GabbleMediaStream *self, + GError **error) { return TRUE; } @@ -218,16 +231,20 @@ gboolean gabble_media_stream_native_candidates_prepared (GabbleMediaStream *obj, /** * gabble_media_stream_new_active_candidate_pair * - * Implements DBus method NewActiveCandidatePair + * Implements D-Bus method NewActiveCandidatePair * on interface org.freedesktop.Telepathy.Ice.StreamHandler * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_stream_new_active_candidate_pair (GabbleMediaStream *obj, const gchar * native_candidate_id, const gchar * remote_candidate_id, GError **error) +gboolean +gabble_media_stream_new_active_candidate_pair (GabbleMediaStream *self, + const gchar *native_candidate_id, + const gchar *remote_candidate_id, + GError **error) { return TRUE; } @@ -236,16 +253,20 @@ gboolean gabble_media_stream_new_active_candidate_pair (GabbleMediaStream *obj, /** * gabble_media_stream_new_native_candidate * - * Implements DBus method NewNativeCandidate + * Implements D-Bus method NewNativeCandidate * on interface org.freedesktop.Telepathy.Ice.StreamHandler * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_stream_new_native_candidate (GabbleMediaStream *obj, const gchar * candidate_id, const GPtrArray * transports, GError **error) +gboolean +gabble_media_stream_new_native_candidate (GabbleMediaStream *self, + const gchar *candidate_id, + const GPtrArray *transports, + GError **error) { return TRUE; } @@ -254,16 +275,19 @@ gboolean gabble_media_stream_new_native_candidate (GabbleMediaStream *obj, const /** * gabble_media_stream_ready * - * Implements DBus method Ready + * Implements D-Bus method Ready * on interface org.freedesktop.Telepathy.Ice.StreamHandler * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_stream_ready (GabbleMediaStream *obj, const GPtrArray * codecs, GError **error) +gboolean +gabble_media_stream_ready (GabbleMediaStream *self, + const GPtrArray *codecs, + GError **error) { return TRUE; } @@ -272,16 +296,19 @@ gboolean gabble_media_stream_ready (GabbleMediaStream *obj, const GPtrArray * co /** * gabble_media_stream_stream_state * - * Implements DBus method StreamState + * Implements D-Bus method StreamState * on interface org.freedesktop.Telepathy.Ice.StreamHandler * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_stream_stream_state (GabbleMediaStream *obj, guint state, GError **error) +gboolean +gabble_media_stream_stream_state (GabbleMediaStream *self, + guint state, + GError **error) { return TRUE; } @@ -290,16 +317,19 @@ gboolean gabble_media_stream_stream_state (GabbleMediaStream *obj, guint state, /** * gabble_media_stream_supported_codecs * - * Implements DBus method SupportedCodecs + * Implements D-Bus method SupportedCodecs * on interface org.freedesktop.Telepathy.Ice.StreamHandler * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_media_stream_supported_codecs (GabbleMediaStream *obj, const GPtrArray * codecs, GError **error) +gboolean +gabble_media_stream_supported_codecs (GabbleMediaStream *self, + const GPtrArray *codecs, + GError **error) { return TRUE; } diff --git a/generate/src/gabble-media-stream.h b/generate/src/gabble-media-stream.h index 51adf853a..2555d0935 100644 --- a/generate/src/gabble-media-stream.h +++ b/generate/src/gabble-media-stream.h @@ -34,6 +34,8 @@ struct _GabbleMediaStreamClass { struct _GabbleMediaStream { GObject parent; + + gpointer priv; }; GType gabble_media_stream_get_type(void); @@ -53,14 +55,48 @@ GType gabble_media_stream_get_type(void); (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_MEDIA_STREAM, GabbleMediaStreamClass)) -gboolean gabble_media_stream_codec_choice (GabbleMediaStream *obj, guint codec_id, GError **error); -gboolean gabble_media_stream_error (GabbleMediaStream *obj, guint errno, const gchar * message, GError **error); -gboolean gabble_media_stream_native_candidates_prepared (GabbleMediaStream *obj, GError **error); -gboolean gabble_media_stream_new_active_candidate_pair (GabbleMediaStream *obj, const gchar * native_candidate_id, const gchar * remote_candidate_id, GError **error); -gboolean gabble_media_stream_new_native_candidate (GabbleMediaStream *obj, const gchar * candidate_id, const GPtrArray * transports, GError **error); -gboolean gabble_media_stream_ready (GabbleMediaStream *obj, const GPtrArray * codecs, GError **error); -gboolean gabble_media_stream_stream_state (GabbleMediaStream *obj, guint state, GError **error); -gboolean gabble_media_stream_supported_codecs (GabbleMediaStream *obj, const GPtrArray * codecs, GError **error); +gboolean +gabble_media_stream_codec_choice (GabbleMediaStream *self, + guint codec_id, + GError **error); + +gboolean +gabble_media_stream_error (GabbleMediaStream *self, + guint errno, + const gchar *message, + GError **error); + +gboolean +gabble_media_stream_native_candidates_prepared (GabbleMediaStream *self, + GError **error); + +gboolean +gabble_media_stream_new_active_candidate_pair (GabbleMediaStream *self, + const gchar *native_candidate_id, + const gchar *remote_candidate_id, + GError **error); + +gboolean +gabble_media_stream_new_native_candidate (GabbleMediaStream *self, + const gchar *candidate_id, + const GPtrArray *transports, + GError **error); + +gboolean +gabble_media_stream_ready (GabbleMediaStream *self, + const GPtrArray *codecs, + GError **error); + +gboolean +gabble_media_stream_stream_state (GabbleMediaStream *self, + guint state, + GError **error); + +gboolean +gabble_media_stream_supported_codecs (GabbleMediaStream *self, + const GPtrArray *codecs, + GError **error); + G_END_DECLS diff --git a/generate/src/gabble-muc-channel-signals-marshal.list b/generate/src/gabble-muc-channel-signals-marshal.list index b3b744722..8fd20bec7 100644 --- a/generate/src/gabble-muc-channel-signals-marshal.list +++ b/generate/src/gabble-muc-channel-signals-marshal.list @@ -1,10 +1,5 @@ -VOID:VOID -VOID:INT,INT -VOID:VOID -VOID:STRING,BOXED,BOXED,BOXED,BOXED,INT,INT -VOID:INT,INT -VOID:BOXED -VOID:BOXED -VOID:INT,INT,INT,INT,INT,STRING -VOID:INT,INT,INT,STRING -VOID:INT,INT,STRING +VOID:UINT,UINT,UINT,UINT,UINT,STRING +VOID:UINT,UINT,UINT,STRING +VOID:UINT,UINT,STRING +VOID:UINT,UINT +VOID:STRING,BOXED,BOXED,BOXED,BOXED,UINT,UINT diff --git a/generate/src/gabble-muc-channel.c b/generate/src/gabble-muc-channel.c index 9e163f9e4..538de9d8b 100644 --- a/generate/src/gabble-muc-channel.c +++ b/generate/src/gabble-muc-channel.c @@ -55,12 +55,16 @@ struct _GabbleMucChannelPrivate gboolean dispose_has_run; }; -#define GABBLE_MUC_CHANNEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GABBLE_TYPE_MUC_CHANNEL, GabbleMucChannelPrivate)) +#define GABBLE_MUC_CHANNEL_GET_PRIVATE(obj) \ + ((GabbleMucChannelPrivate *)obj->priv) static void -gabble_muc_channel_init (GabbleMucChannel *obj) +gabble_muc_channel_init (GabbleMucChannel *self) { - GabbleMucChannelPrivate *priv = GABBLE_MUC_CHANNEL_GET_PRIVATE (obj); + GabbleMucChannelPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GABBLE_TYPE_MUC_CHANNEL, GabbleMucChannelPrivate); + + self->priv = priv; /* allocate any data required by the object here */ } @@ -84,7 +88,7 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_muc_channel_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_muc_channel_marshal_VOID__VOID, + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); signals[GROUP_FLAGS_CHANGED] = @@ -93,7 +97,7 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_muc_channel_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_muc_channel_marshal_VOID__INT_INT, + gabble_muc_channel_marshal_VOID__UINT_UINT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); signals[LOST_MESSAGE] = @@ -102,7 +106,7 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_muc_channel_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_muc_channel_marshal_VOID__VOID, + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); signals[MEMBERS_CHANGED] = @@ -111,7 +115,7 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_muc_channel_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_muc_channel_marshal_VOID__STRING_BOXED_BOXED_BOXED_BOXED_INT_INT, + gabble_muc_channel_marshal_VOID__STRING_BOXED_BOXED_BOXED_BOXED_UINT_UINT, G_TYPE_NONE, 7, G_TYPE_STRING, DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY, G_TYPE_UINT, G_TYPE_UINT); signals[PASSWORD_FLAGS_CHANGED] = @@ -120,7 +124,7 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_muc_channel_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_muc_channel_marshal_VOID__INT_INT, + gabble_muc_channel_marshal_VOID__UINT_UINT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); signals[PROPERTIES_CHANGED] = @@ -129,7 +133,7 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_muc_channel_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_muc_channel_marshal_VOID__BOXED, + g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, (dbus_g_type_get_collection ("GPtrArray", (dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G_TYPE_VALUE, G_TYPE_INVALID))))); signals[PROPERTY_FLAGS_CHANGED] = @@ -138,7 +142,7 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_muc_channel_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_muc_channel_marshal_VOID__BOXED, + g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, (dbus_g_type_get_collection ("GPtrArray", (dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID))))); signals[RECEIVED] = @@ -147,7 +151,7 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_muc_channel_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_muc_channel_marshal_VOID__INT_INT_INT_INT_INT_STRING, + gabble_muc_channel_marshal_VOID__UINT_UINT_UINT_UINT_UINT_STRING, G_TYPE_NONE, 6, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING); signals[SEND_ERROR] = @@ -156,7 +160,7 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_muc_channel_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_muc_channel_marshal_VOID__INT_INT_INT_STRING, + gabble_muc_channel_marshal_VOID__UINT_UINT_UINT_STRING, G_TYPE_NONE, 4, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING); signals[SENT] = @@ -165,7 +169,7 @@ gabble_muc_channel_class_init (GabbleMucChannelClass *gabble_muc_channel_class) G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_muc_channel_marshal_VOID__INT_INT_STRING, + gabble_muc_channel_marshal_VOID__UINT_UINT_STRING, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING); dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (gabble_muc_channel_class), &dbus_glib_gabble_muc_channel_object_info); @@ -204,16 +208,19 @@ gabble_muc_channel_finalize (GObject *object) /** * gabble_muc_channel_acknowledge_pending_messages * - * Implements DBus method AcknowledgePendingMessages + * Implements D-Bus method AcknowledgePendingMessages * on interface org.freedesktop.Telepathy.Channel.Type.Text * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_acknowledge_pending_messages (GabbleMucChannel *obj, const GArray * ids, GError **error) +gboolean +gabble_muc_channel_acknowledge_pending_messages (GabbleMucChannel *self, + const GArray *ids, + GError **error) { return TRUE; } @@ -222,16 +229,20 @@ gboolean gabble_muc_channel_acknowledge_pending_messages (GabbleMucChannel *obj, /** * gabble_muc_channel_add_members * - * Implements DBus method AddMembers + * Implements D-Bus method AddMembers * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_add_members (GabbleMucChannel *obj, const GArray * contacts, const gchar * message, GError **error) +gboolean +gabble_muc_channel_add_members (GabbleMucChannel *self, + const GArray *contacts, + const gchar *message, + GError **error) { return TRUE; } @@ -240,16 +251,18 @@ gboolean gabble_muc_channel_add_members (GabbleMucChannel *obj, const GArray * c /** * gabble_muc_channel_close * - * Implements DBus method Close + * Implements D-Bus method Close * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_close (GabbleMucChannel *obj, GError **error) +gboolean +gabble_muc_channel_close (GabbleMucChannel *self, + GError **error) { return TRUE; } @@ -258,16 +271,21 @@ gboolean gabble_muc_channel_close (GabbleMucChannel *obj, GError **error) /** * gabble_muc_channel_get_all_members * - * Implements DBus method GetAllMembers + * Implements D-Bus method GetAllMembers * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_get_all_members (GabbleMucChannel *obj, GArray ** ret, GArray ** ret1, GArray ** ret2, GError **error) +gboolean +gabble_muc_channel_get_all_members (GabbleMucChannel *self, + GArray **ret, + GArray **ret1, + GArray **ret2, + GError **error) { return TRUE; } @@ -276,16 +294,19 @@ gboolean gabble_muc_channel_get_all_members (GabbleMucChannel *obj, GArray ** re /** * gabble_muc_channel_get_channel_type * - * Implements DBus method GetChannelType + * Implements D-Bus method GetChannelType * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_get_channel_type (GabbleMucChannel *obj, gchar ** ret, GError **error) +gboolean +gabble_muc_channel_get_channel_type (GabbleMucChannel *self, + gchar **ret, + GError **error) { return TRUE; } @@ -294,16 +315,19 @@ gboolean gabble_muc_channel_get_channel_type (GabbleMucChannel *obj, gchar ** re /** * gabble_muc_channel_get_group_flags * - * Implements DBus method GetGroupFlags + * Implements D-Bus method GetGroupFlags * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_get_group_flags (GabbleMucChannel *obj, guint* ret, GError **error) +gboolean +gabble_muc_channel_get_group_flags (GabbleMucChannel *self, + guint *ret, + GError **error) { return TRUE; } @@ -312,16 +336,20 @@ gboolean gabble_muc_channel_get_group_flags (GabbleMucChannel *obj, guint* ret, /** * gabble_muc_channel_get_handle * - * Implements DBus method GetHandle + * Implements D-Bus method GetHandle * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_get_handle (GabbleMucChannel *obj, guint* ret, guint* ret1, GError **error) +gboolean +gabble_muc_channel_get_handle (GabbleMucChannel *self, + guint *ret, + guint *ret1, + GError **error) { return TRUE; } @@ -330,16 +358,20 @@ gboolean gabble_muc_channel_get_handle (GabbleMucChannel *obj, guint* ret, guint /** * gabble_muc_channel_get_handle_owners * - * Implements DBus method GetHandleOwners + * Implements D-Bus method GetHandleOwners * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_get_handle_owners (GabbleMucChannel *obj, const GArray * handles, GArray ** ret, GError **error) +gboolean +gabble_muc_channel_get_handle_owners (GabbleMucChannel *self, + const GArray *handles, + GArray **ret, + GError **error) { return TRUE; } @@ -348,16 +380,19 @@ gboolean gabble_muc_channel_get_handle_owners (GabbleMucChannel *obj, const GArr /** * gabble_muc_channel_get_interfaces * - * Implements DBus method GetInterfaces + * Implements D-Bus method GetInterfaces * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_get_interfaces (GabbleMucChannel *obj, gchar *** ret, GError **error) +gboolean +gabble_muc_channel_get_interfaces (GabbleMucChannel *self, + gchar ***ret, + GError **error) { return TRUE; } @@ -366,16 +401,19 @@ gboolean gabble_muc_channel_get_interfaces (GabbleMucChannel *obj, gchar *** ret /** * gabble_muc_channel_get_local_pending_members * - * Implements DBus method GetLocalPendingMembers + * Implements D-Bus method GetLocalPendingMembers * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_get_local_pending_members (GabbleMucChannel *obj, GArray ** ret, GError **error) +gboolean +gabble_muc_channel_get_local_pending_members (GabbleMucChannel *self, + GArray **ret, + GError **error) { return TRUE; } @@ -384,16 +422,19 @@ gboolean gabble_muc_channel_get_local_pending_members (GabbleMucChannel *obj, GA /** * gabble_muc_channel_get_members * - * Implements DBus method GetMembers + * Implements D-Bus method GetMembers * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_get_members (GabbleMucChannel *obj, GArray ** ret, GError **error) +gboolean +gabble_muc_channel_get_members (GabbleMucChannel *self, + GArray **ret, + GError **error) { return TRUE; } @@ -402,16 +443,19 @@ gboolean gabble_muc_channel_get_members (GabbleMucChannel *obj, GArray ** ret, G /** * gabble_muc_channel_get_message_types * - * Implements DBus method GetMessageTypes + * Implements D-Bus method GetMessageTypes * on interface org.freedesktop.Telepathy.Channel.Type.Text * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_get_message_types (GabbleMucChannel *obj, GArray ** ret, GError **error) +gboolean +gabble_muc_channel_get_message_types (GabbleMucChannel *self, + GArray **ret, + GError **error) { return TRUE; } @@ -420,16 +464,19 @@ gboolean gabble_muc_channel_get_message_types (GabbleMucChannel *obj, GArray ** /** * gabble_muc_channel_get_password_flags * - * Implements DBus method GetPasswordFlags + * Implements D-Bus method GetPasswordFlags * on interface org.freedesktop.Telepathy.Channel.Interface.Password * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_get_password_flags (GabbleMucChannel *obj, guint* ret, GError **error) +gboolean +gabble_muc_channel_get_password_flags (GabbleMucChannel *self, + guint *ret, + GError **error) { return TRUE; } @@ -438,16 +485,20 @@ gboolean gabble_muc_channel_get_password_flags (GabbleMucChannel *obj, guint* re /** * gabble_muc_channel_get_properties * - * Implements DBus method GetProperties + * Implements D-Bus method GetProperties * on interface org.freedesktop.Telepathy.Properties * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_get_properties (GabbleMucChannel *obj, const GArray * properties, GPtrArray ** ret, GError **error) +gboolean +gabble_muc_channel_get_properties (GabbleMucChannel *self, + const GArray *properties, + GPtrArray **ret, + GError **error) { return TRUE; } @@ -456,16 +507,19 @@ gboolean gabble_muc_channel_get_properties (GabbleMucChannel *obj, const GArray /** * gabble_muc_channel_get_remote_pending_members * - * Implements DBus method GetRemotePendingMembers + * Implements D-Bus method GetRemotePendingMembers * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_get_remote_pending_members (GabbleMucChannel *obj, GArray ** ret, GError **error) +gboolean +gabble_muc_channel_get_remote_pending_members (GabbleMucChannel *self, + GArray **ret, + GError **error) { return TRUE; } @@ -474,16 +528,19 @@ gboolean gabble_muc_channel_get_remote_pending_members (GabbleMucChannel *obj, G /** * gabble_muc_channel_get_self_handle * - * Implements DBus method GetSelfHandle + * Implements D-Bus method GetSelfHandle * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_get_self_handle (GabbleMucChannel *obj, guint* ret, GError **error) +gboolean +gabble_muc_channel_get_self_handle (GabbleMucChannel *self, + guint *ret, + GError **error) { return TRUE; } @@ -492,16 +549,20 @@ gboolean gabble_muc_channel_get_self_handle (GabbleMucChannel *obj, guint* ret, /** * gabble_muc_channel_list_pending_messages * - * Implements DBus method ListPendingMessages + * Implements D-Bus method ListPendingMessages * on interface org.freedesktop.Telepathy.Channel.Type.Text * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_list_pending_messages (GabbleMucChannel *obj, gboolean clear, GPtrArray ** ret, GError **error) +gboolean +gabble_muc_channel_list_pending_messages (GabbleMucChannel *self, + gboolean clear, + GPtrArray **ret, + GError **error) { return TRUE; } @@ -510,16 +571,19 @@ gboolean gabble_muc_channel_list_pending_messages (GabbleMucChannel *obj, gboole /** * gabble_muc_channel_list_properties * - * Implements DBus method ListProperties + * Implements D-Bus method ListProperties * on interface org.freedesktop.Telepathy.Properties * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_list_properties (GabbleMucChannel *obj, GPtrArray ** ret, GError **error) +gboolean +gabble_muc_channel_list_properties (GabbleMucChannel *self, + GPtrArray **ret, + GError **error) { return TRUE; } @@ -528,31 +592,38 @@ gboolean gabble_muc_channel_list_properties (GabbleMucChannel *obj, GPtrArray ** /** * gabble_muc_channel_provide_password * - * Implements DBus method ProvidePassword + * Implements D-Bus method ProvidePassword * on interface org.freedesktop.Telepathy.Channel.Interface.Password * - * @context: The DBUS invocation context to use to return values + * @context: The D-Bus invocation context to use to return values * or throw an error. */ -gboolean gabble_muc_channel_provide_password (GabbleMucChannel *obj, const gchar * password, DBusGMethodInvocation *context) +void +gabble_muc_channel_provide_password (GabbleMucChannel *self, + const gchar *password, + DBusGMethodInvocation *context) { - return TRUE; + return; } /** * gabble_muc_channel_remove_members * - * Implements DBus method RemoveMembers + * Implements D-Bus method RemoveMembers * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_remove_members (GabbleMucChannel *obj, const GArray * contacts, const gchar * message, GError **error) +gboolean +gabble_muc_channel_remove_members (GabbleMucChannel *self, + const GArray *contacts, + const gchar *message, + GError **error) { return TRUE; } @@ -561,16 +632,20 @@ gboolean gabble_muc_channel_remove_members (GabbleMucChannel *obj, const GArray /** * gabble_muc_channel_send * - * Implements DBus method Send + * Implements D-Bus method Send * on interface org.freedesktop.Telepathy.Channel.Type.Text * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_muc_channel_send (GabbleMucChannel *obj, guint type, const gchar * text, GError **error) +gboolean +gabble_muc_channel_send (GabbleMucChannel *self, + guint type, + const gchar *text, + GError **error) { return TRUE; } @@ -579,14 +654,17 @@ gboolean gabble_muc_channel_send (GabbleMucChannel *obj, guint type, const gchar /** * gabble_muc_channel_set_properties * - * Implements DBus method SetProperties + * Implements D-Bus method SetProperties * on interface org.freedesktop.Telepathy.Properties * - * @context: The DBUS invocation context to use to return values + * @context: The D-Bus invocation context to use to return values * or throw an error. */ -gboolean gabble_muc_channel_set_properties (GabbleMucChannel *obj, const GPtrArray * properties, DBusGMethodInvocation *context) +void +gabble_muc_channel_set_properties (GabbleMucChannel *self, + const GPtrArray *properties, + DBusGMethodInvocation *context) { - return TRUE; + return; } diff --git a/generate/src/gabble-muc-channel.h b/generate/src/gabble-muc-channel.h index 6d2494b98..95c02466b 100644 --- a/generate/src/gabble-muc-channel.h +++ b/generate/src/gabble-muc-channel.h @@ -34,6 +34,8 @@ struct _GabbleMucChannelClass { struct _GabbleMucChannel { GObject parent; + + gpointer priv; }; GType gabble_muc_channel_get_type(void); @@ -53,28 +55,124 @@ GType gabble_muc_channel_get_type(void); (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_MUC_CHANNEL, GabbleMucChannelClass)) -gboolean gabble_muc_channel_acknowledge_pending_messages (GabbleMucChannel *obj, const GArray * ids, GError **error); -gboolean gabble_muc_channel_add_members (GabbleMucChannel *obj, const GArray * contacts, const gchar * message, GError **error); -gboolean gabble_muc_channel_close (GabbleMucChannel *obj, GError **error); -gboolean gabble_muc_channel_get_all_members (GabbleMucChannel *obj, GArray ** ret, GArray ** ret1, GArray ** ret2, GError **error); -gboolean gabble_muc_channel_get_channel_type (GabbleMucChannel *obj, gchar ** ret, GError **error); -gboolean gabble_muc_channel_get_group_flags (GabbleMucChannel *obj, guint* ret, GError **error); -gboolean gabble_muc_channel_get_handle (GabbleMucChannel *obj, guint* ret, guint* ret1, GError **error); -gboolean gabble_muc_channel_get_handle_owners (GabbleMucChannel *obj, const GArray * handles, GArray ** ret, GError **error); -gboolean gabble_muc_channel_get_interfaces (GabbleMucChannel *obj, gchar *** ret, GError **error); -gboolean gabble_muc_channel_get_local_pending_members (GabbleMucChannel *obj, GArray ** ret, GError **error); -gboolean gabble_muc_channel_get_members (GabbleMucChannel *obj, GArray ** ret, GError **error); -gboolean gabble_muc_channel_get_message_types (GabbleMucChannel *obj, GArray ** ret, GError **error); -gboolean gabble_muc_channel_get_password_flags (GabbleMucChannel *obj, guint* ret, GError **error); -gboolean gabble_muc_channel_get_properties (GabbleMucChannel *obj, const GArray * properties, GPtrArray ** ret, GError **error); -gboolean gabble_muc_channel_get_remote_pending_members (GabbleMucChannel *obj, GArray ** ret, GError **error); -gboolean gabble_muc_channel_get_self_handle (GabbleMucChannel *obj, guint* ret, GError **error); -gboolean gabble_muc_channel_list_pending_messages (GabbleMucChannel *obj, gboolean clear, GPtrArray ** ret, GError **error); -gboolean gabble_muc_channel_list_properties (GabbleMucChannel *obj, GPtrArray ** ret, GError **error); -gboolean gabble_muc_channel_provide_password (GabbleMucChannel *obj, const gchar * password, DBusGMethodInvocation *context); -gboolean gabble_muc_channel_remove_members (GabbleMucChannel *obj, const GArray * contacts, const gchar * message, GError **error); -gboolean gabble_muc_channel_send (GabbleMucChannel *obj, guint type, const gchar * text, GError **error); -gboolean gabble_muc_channel_set_properties (GabbleMucChannel *obj, const GPtrArray * properties, DBusGMethodInvocation *context); +gboolean +gabble_muc_channel_acknowledge_pending_messages (GabbleMucChannel *self, + const GArray *ids, + GError **error); + +gboolean +gabble_muc_channel_add_members (GabbleMucChannel *self, + const GArray *contacts, + const gchar *message, + GError **error); + +gboolean +gabble_muc_channel_close (GabbleMucChannel *self, + GError **error); + +gboolean +gabble_muc_channel_get_all_members (GabbleMucChannel *self, + GArray **ret, + GArray **ret1, + GArray **ret2, + GError **error); + +gboolean +gabble_muc_channel_get_channel_type (GabbleMucChannel *self, + gchar **ret, + GError **error); + +gboolean +gabble_muc_channel_get_group_flags (GabbleMucChannel *self, + guint *ret, + GError **error); + +gboolean +gabble_muc_channel_get_handle (GabbleMucChannel *self, + guint *ret, + guint *ret1, + GError **error); + +gboolean +gabble_muc_channel_get_handle_owners (GabbleMucChannel *self, + const GArray *handles, + GArray **ret, + GError **error); + +gboolean +gabble_muc_channel_get_interfaces (GabbleMucChannel *self, + gchar ***ret, + GError **error); + +gboolean +gabble_muc_channel_get_local_pending_members (GabbleMucChannel *self, + GArray **ret, + GError **error); + +gboolean +gabble_muc_channel_get_members (GabbleMucChannel *self, + GArray **ret, + GError **error); + +gboolean +gabble_muc_channel_get_message_types (GabbleMucChannel *self, + GArray **ret, + GError **error); + +gboolean +gabble_muc_channel_get_password_flags (GabbleMucChannel *self, + guint *ret, + GError **error); + +gboolean +gabble_muc_channel_get_properties (GabbleMucChannel *self, + const GArray *properties, + GPtrArray **ret, + GError **error); + +gboolean +gabble_muc_channel_get_remote_pending_members (GabbleMucChannel *self, + GArray **ret, + GError **error); + +gboolean +gabble_muc_channel_get_self_handle (GabbleMucChannel *self, + guint *ret, + GError **error); + +gboolean +gabble_muc_channel_list_pending_messages (GabbleMucChannel *self, + gboolean clear, + GPtrArray **ret, + GError **error); + +gboolean +gabble_muc_channel_list_properties (GabbleMucChannel *self, + GPtrArray **ret, + GError **error); + +void +gabble_muc_channel_provide_password (GabbleMucChannel *self, + const gchar *password, + DBusGMethodInvocation *context); + +gboolean +gabble_muc_channel_remove_members (GabbleMucChannel *self, + const GArray *contacts, + const gchar *message, + GError **error); + +gboolean +gabble_muc_channel_send (GabbleMucChannel *self, + guint type, + const gchar *text, + GError **error); + +void +gabble_muc_channel_set_properties (GabbleMucChannel *self, + const GPtrArray *properties, + DBusGMethodInvocation *context); + G_END_DECLS diff --git a/generate/src/gabble-roomlist-channel-signals-marshal.list b/generate/src/gabble-roomlist-channel-signals-marshal.list index 2fc9cff3f..e69de29bb 100644 --- a/generate/src/gabble-roomlist-channel-signals-marshal.list +++ b/generate/src/gabble-roomlist-channel-signals-marshal.list @@ -1,3 +0,0 @@ -VOID:VOID -VOID:BOXED -VOID:BOOLEAN diff --git a/generate/src/gabble-roomlist-channel.c b/generate/src/gabble-roomlist-channel.c index 66ee05862..29ada0d71 100644 --- a/generate/src/gabble-roomlist-channel.c +++ b/generate/src/gabble-roomlist-channel.c @@ -48,12 +48,16 @@ struct _GabbleRoomlistChannelPrivate gboolean dispose_has_run; }; -#define GABBLE_ROOMLIST_CHANNEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GABBLE_TYPE_ROOMLIST_CHANNEL, GabbleRoomlistChannelPrivate)) +#define GABBLE_ROOMLIST_CHANNEL_GET_PRIVATE(obj) \ + ((GabbleRoomlistChannelPrivate *)obj->priv) static void -gabble_roomlist_channel_init (GabbleRoomlistChannel *obj) +gabble_roomlist_channel_init (GabbleRoomlistChannel *self) { - GabbleRoomlistChannelPrivate *priv = GABBLE_ROOMLIST_CHANNEL_GET_PRIVATE (obj); + GabbleRoomlistChannelPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GABBLE_TYPE_ROOMLIST_CHANNEL, GabbleRoomlistChannelPrivate); + + self->priv = priv; /* allocate any data required by the object here */ } @@ -77,7 +81,7 @@ gabble_roomlist_channel_class_init (GabbleRoomlistChannelClass *gabble_roomlist_ G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_roomlist_channel_marshal_VOID__VOID, + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); signals[GOT_ROOMS] = @@ -86,7 +90,7 @@ gabble_roomlist_channel_class_init (GabbleRoomlistChannelClass *gabble_roomlist_ G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_roomlist_channel_marshal_VOID__BOXED, + g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, (dbus_g_type_get_collection ("GPtrArray", (dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G_TYPE_STRING, (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE)), G_TYPE_INVALID))))); signals[LISTING_ROOMS] = @@ -95,7 +99,7 @@ gabble_roomlist_channel_class_init (GabbleRoomlistChannelClass *gabble_roomlist_ G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_roomlist_channel_marshal_VOID__BOOLEAN, + g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (gabble_roomlist_channel_class), &dbus_glib_gabble_roomlist_channel_object_info); @@ -134,16 +138,18 @@ gabble_roomlist_channel_finalize (GObject *object) /** * gabble_roomlist_channel_close * - * Implements DBus method Close + * Implements D-Bus method Close * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roomlist_channel_close (GabbleRoomlistChannel *obj, GError **error) +gboolean +gabble_roomlist_channel_close (GabbleRoomlistChannel *self, + GError **error) { return TRUE; } @@ -152,16 +158,19 @@ gboolean gabble_roomlist_channel_close (GabbleRoomlistChannel *obj, GError **err /** * gabble_roomlist_channel_get_channel_type * - * Implements DBus method GetChannelType + * Implements D-Bus method GetChannelType * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roomlist_channel_get_channel_type (GabbleRoomlistChannel *obj, gchar ** ret, GError **error) +gboolean +gabble_roomlist_channel_get_channel_type (GabbleRoomlistChannel *self, + gchar **ret, + GError **error) { return TRUE; } @@ -170,16 +179,20 @@ gboolean gabble_roomlist_channel_get_channel_type (GabbleRoomlistChannel *obj, g /** * gabble_roomlist_channel_get_handle * - * Implements DBus method GetHandle + * Implements D-Bus method GetHandle * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roomlist_channel_get_handle (GabbleRoomlistChannel *obj, guint* ret, guint* ret1, GError **error) +gboolean +gabble_roomlist_channel_get_handle (GabbleRoomlistChannel *self, + guint *ret, + guint *ret1, + GError **error) { return TRUE; } @@ -188,16 +201,19 @@ gboolean gabble_roomlist_channel_get_handle (GabbleRoomlistChannel *obj, guint* /** * gabble_roomlist_channel_get_interfaces * - * Implements DBus method GetInterfaces + * Implements D-Bus method GetInterfaces * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roomlist_channel_get_interfaces (GabbleRoomlistChannel *obj, gchar *** ret, GError **error) +gboolean +gabble_roomlist_channel_get_interfaces (GabbleRoomlistChannel *self, + gchar ***ret, + GError **error) { return TRUE; } @@ -206,16 +222,19 @@ gboolean gabble_roomlist_channel_get_interfaces (GabbleRoomlistChannel *obj, gch /** * gabble_roomlist_channel_get_listing_rooms * - * Implements DBus method GetListingRooms + * Implements D-Bus method GetListingRooms * on interface org.freedesktop.Telepathy.Channel.Type.RoomList * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roomlist_channel_get_listing_rooms (GabbleRoomlistChannel *obj, gboolean* ret, GError **error) +gboolean +gabble_roomlist_channel_get_listing_rooms (GabbleRoomlistChannel *self, + gboolean *ret, + GError **error) { return TRUE; } @@ -224,16 +243,18 @@ gboolean gabble_roomlist_channel_get_listing_rooms (GabbleRoomlistChannel *obj, /** * gabble_roomlist_channel_list_rooms * - * Implements DBus method ListRooms + * Implements D-Bus method ListRooms * on interface org.freedesktop.Telepathy.Channel.Type.RoomList * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roomlist_channel_list_rooms (GabbleRoomlistChannel *obj, GError **error) +gboolean +gabble_roomlist_channel_list_rooms (GabbleRoomlistChannel *self, + GError **error) { return TRUE; } diff --git a/generate/src/gabble-roomlist-channel.h b/generate/src/gabble-roomlist-channel.h index 128c7d8a3..b6617c1d8 100644 --- a/generate/src/gabble-roomlist-channel.h +++ b/generate/src/gabble-roomlist-channel.h @@ -34,6 +34,8 @@ struct _GabbleRoomlistChannelClass { struct _GabbleRoomlistChannel { GObject parent; + + gpointer priv; }; GType gabble_roomlist_channel_get_type(void); @@ -53,12 +55,35 @@ GType gabble_roomlist_channel_get_type(void); (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_ROOMLIST_CHANNEL, GabbleRoomlistChannelClass)) -gboolean gabble_roomlist_channel_close (GabbleRoomlistChannel *obj, GError **error); -gboolean gabble_roomlist_channel_get_channel_type (GabbleRoomlistChannel *obj, gchar ** ret, GError **error); -gboolean gabble_roomlist_channel_get_handle (GabbleRoomlistChannel *obj, guint* ret, guint* ret1, GError **error); -gboolean gabble_roomlist_channel_get_interfaces (GabbleRoomlistChannel *obj, gchar *** ret, GError **error); -gboolean gabble_roomlist_channel_get_listing_rooms (GabbleRoomlistChannel *obj, gboolean* ret, GError **error); -gboolean gabble_roomlist_channel_list_rooms (GabbleRoomlistChannel *obj, GError **error); +gboolean +gabble_roomlist_channel_close (GabbleRoomlistChannel *self, + GError **error); + +gboolean +gabble_roomlist_channel_get_channel_type (GabbleRoomlistChannel *self, + gchar **ret, + GError **error); + +gboolean +gabble_roomlist_channel_get_handle (GabbleRoomlistChannel *self, + guint *ret, + guint *ret1, + GError **error); + +gboolean +gabble_roomlist_channel_get_interfaces (GabbleRoomlistChannel *self, + gchar ***ret, + GError **error); + +gboolean +gabble_roomlist_channel_get_listing_rooms (GabbleRoomlistChannel *self, + gboolean *ret, + GError **error); + +gboolean +gabble_roomlist_channel_list_rooms (GabbleRoomlistChannel *self, + GError **error); + G_END_DECLS diff --git a/generate/src/gabble-roster-channel-signals-marshal.list b/generate/src/gabble-roster-channel-signals-marshal.list index 1ce792026..c1333dfa3 100644 --- a/generate/src/gabble-roster-channel-signals-marshal.list +++ b/generate/src/gabble-roster-channel-signals-marshal.list @@ -1,3 +1,2 @@ -VOID:VOID -VOID:INT,INT -VOID:STRING,BOXED,BOXED,BOXED,BOXED,INT,INT +VOID:UINT,UINT +VOID:STRING,BOXED,BOXED,BOXED,BOXED,UINT,UINT diff --git a/generate/src/gabble-roster-channel.c b/generate/src/gabble-roster-channel.c index aeee81edc..b52031910 100644 --- a/generate/src/gabble-roster-channel.c +++ b/generate/src/gabble-roster-channel.c @@ -48,12 +48,16 @@ struct _GabbleRosterChannelPrivate gboolean dispose_has_run; }; -#define GABBLE_ROSTER_CHANNEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GABBLE_TYPE_ROSTER_CHANNEL, GabbleRosterChannelPrivate)) +#define GABBLE_ROSTER_CHANNEL_GET_PRIVATE(obj) \ + ((GabbleRosterChannelPrivate *)obj->priv) static void -gabble_roster_channel_init (GabbleRosterChannel *obj) +gabble_roster_channel_init (GabbleRosterChannel *self) { - GabbleRosterChannelPrivate *priv = GABBLE_ROSTER_CHANNEL_GET_PRIVATE (obj); + GabbleRosterChannelPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, + GABBLE_TYPE_ROSTER_CHANNEL, GabbleRosterChannelPrivate); + + self->priv = priv; /* allocate any data required by the object here */ } @@ -77,7 +81,7 @@ gabble_roster_channel_class_init (GabbleRosterChannelClass *gabble_roster_channe G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_roster_channel_marshal_VOID__VOID, + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); signals[GROUP_FLAGS_CHANGED] = @@ -86,7 +90,7 @@ gabble_roster_channel_class_init (GabbleRosterChannelClass *gabble_roster_channe G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_roster_channel_marshal_VOID__INT_INT, + gabble_roster_channel_marshal_VOID__UINT_UINT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); signals[MEMBERS_CHANGED] = @@ -95,7 +99,7 @@ gabble_roster_channel_class_init (GabbleRosterChannelClass *gabble_roster_channe G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, NULL, NULL, - gabble_roster_channel_marshal_VOID__STRING_BOXED_BOXED_BOXED_BOXED_INT_INT, + gabble_roster_channel_marshal_VOID__STRING_BOXED_BOXED_BOXED_BOXED_UINT_UINT, G_TYPE_NONE, 7, G_TYPE_STRING, DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY, DBUS_TYPE_G_UINT_ARRAY, G_TYPE_UINT, G_TYPE_UINT); dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (gabble_roster_channel_class), &dbus_glib_gabble_roster_channel_object_info); @@ -134,16 +138,20 @@ gabble_roster_channel_finalize (GObject *object) /** * gabble_roster_channel_add_members * - * Implements DBus method AddMembers + * Implements D-Bus method AddMembers * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roster_channel_add_members (GabbleRosterChannel *obj, const GArray * contacts, const gchar * message, GError **error) +gboolean +gabble_roster_channel_add_members (GabbleRosterChannel *self, + const GArray *contacts, + const gchar *message, + GError **error) { return TRUE; } @@ -152,16 +160,18 @@ gboolean gabble_roster_channel_add_members (GabbleRosterChannel *obj, const GArr /** * gabble_roster_channel_close * - * Implements DBus method Close + * Implements D-Bus method Close * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roster_channel_close (GabbleRosterChannel *obj, GError **error) +gboolean +gabble_roster_channel_close (GabbleRosterChannel *self, + GError **error) { return TRUE; } @@ -170,16 +180,21 @@ gboolean gabble_roster_channel_close (GabbleRosterChannel *obj, GError **error) /** * gabble_roster_channel_get_all_members * - * Implements DBus method GetAllMembers + * Implements D-Bus method GetAllMembers * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roster_channel_get_all_members (GabbleRosterChannel *obj, GArray ** ret, GArray ** ret1, GArray ** ret2, GError **error) +gboolean +gabble_roster_channel_get_all_members (GabbleRosterChannel *self, + GArray **ret, + GArray **ret1, + GArray **ret2, + GError **error) { return TRUE; } @@ -188,16 +203,19 @@ gboolean gabble_roster_channel_get_all_members (GabbleRosterChannel *obj, GArray /** * gabble_roster_channel_get_channel_type * - * Implements DBus method GetChannelType + * Implements D-Bus method GetChannelType * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roster_channel_get_channel_type (GabbleRosterChannel *obj, gchar ** ret, GError **error) +gboolean +gabble_roster_channel_get_channel_type (GabbleRosterChannel *self, + gchar **ret, + GError **error) { return TRUE; } @@ -206,16 +224,19 @@ gboolean gabble_roster_channel_get_channel_type (GabbleRosterChannel *obj, gchar /** * gabble_roster_channel_get_group_flags * - * Implements DBus method GetGroupFlags + * Implements D-Bus method GetGroupFlags * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roster_channel_get_group_flags (GabbleRosterChannel *obj, guint* ret, GError **error) +gboolean +gabble_roster_channel_get_group_flags (GabbleRosterChannel *self, + guint *ret, + GError **error) { return TRUE; } @@ -224,16 +245,20 @@ gboolean gabble_roster_channel_get_group_flags (GabbleRosterChannel *obj, guint* /** * gabble_roster_channel_get_handle * - * Implements DBus method GetHandle + * Implements D-Bus method GetHandle * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roster_channel_get_handle (GabbleRosterChannel *obj, guint* ret, guint* ret1, GError **error) +gboolean +gabble_roster_channel_get_handle (GabbleRosterChannel *self, + guint *ret, + guint *ret1, + GError **error) { return TRUE; } @@ -242,16 +267,20 @@ gboolean gabble_roster_channel_get_handle (GabbleRosterChannel *obj, guint* ret, /** * gabble_roster_channel_get_handle_owners * - * Implements DBus method GetHandleOwners + * Implements D-Bus method GetHandleOwners * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roster_channel_get_handle_owners (GabbleRosterChannel *obj, const GArray * handles, GArray ** ret, GError **error) +gboolean +gabble_roster_channel_get_handle_owners (GabbleRosterChannel *self, + const GArray *handles, + GArray **ret, + GError **error) { return TRUE; } @@ -260,16 +289,19 @@ gboolean gabble_roster_channel_get_handle_owners (GabbleRosterChannel *obj, cons /** * gabble_roster_channel_get_interfaces * - * Implements DBus method GetInterfaces + * Implements D-Bus method GetInterfaces * on interface org.freedesktop.Telepathy.Channel * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roster_channel_get_interfaces (GabbleRosterChannel *obj, gchar *** ret, GError **error) +gboolean +gabble_roster_channel_get_interfaces (GabbleRosterChannel *self, + gchar ***ret, + GError **error) { return TRUE; } @@ -278,16 +310,19 @@ gboolean gabble_roster_channel_get_interfaces (GabbleRosterChannel *obj, gchar * /** * gabble_roster_channel_get_local_pending_members * - * Implements DBus method GetLocalPendingMembers + * Implements D-Bus method GetLocalPendingMembers * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roster_channel_get_local_pending_members (GabbleRosterChannel *obj, GArray ** ret, GError **error) +gboolean +gabble_roster_channel_get_local_pending_members (GabbleRosterChannel *self, + GArray **ret, + GError **error) { return TRUE; } @@ -296,16 +331,19 @@ gboolean gabble_roster_channel_get_local_pending_members (GabbleRosterChannel *o /** * gabble_roster_channel_get_members * - * Implements DBus method GetMembers + * Implements D-Bus method GetMembers * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roster_channel_get_members (GabbleRosterChannel *obj, GArray ** ret, GError **error) +gboolean +gabble_roster_channel_get_members (GabbleRosterChannel *self, + GArray **ret, + GError **error) { return TRUE; } @@ -314,16 +352,19 @@ gboolean gabble_roster_channel_get_members (GabbleRosterChannel *obj, GArray ** /** * gabble_roster_channel_get_remote_pending_members * - * Implements DBus method GetRemotePendingMembers + * Implements D-Bus method GetRemotePendingMembers * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roster_channel_get_remote_pending_members (GabbleRosterChannel *obj, GArray ** ret, GError **error) +gboolean +gabble_roster_channel_get_remote_pending_members (GabbleRosterChannel *self, + GArray **ret, + GError **error) { return TRUE; } @@ -332,16 +373,19 @@ gboolean gabble_roster_channel_get_remote_pending_members (GabbleRosterChannel * /** * gabble_roster_channel_get_self_handle * - * Implements DBus method GetSelfHandle + * Implements D-Bus method GetSelfHandle * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roster_channel_get_self_handle (GabbleRosterChannel *obj, guint* ret, GError **error) +gboolean +gabble_roster_channel_get_self_handle (GabbleRosterChannel *self, + guint *ret, + GError **error) { return TRUE; } @@ -350,16 +394,20 @@ gboolean gabble_roster_channel_get_self_handle (GabbleRosterChannel *obj, guint* /** * gabble_roster_channel_remove_members * - * Implements DBus method RemoveMembers + * Implements D-Bus method RemoveMembers * on interface org.freedesktop.Telepathy.Channel.Interface.Group * * @error: Used to return a pointer to a GError detailing any error - * that occured, DBus will throw the error only if this - * function returns false. + * that occured, D-Bus will throw the error only if this + * function returns FALSE. * * Returns: TRUE if successful, FALSE if an error was thrown. */ -gboolean gabble_roster_channel_remove_members (GabbleRosterChannel *obj, const GArray * contacts, const gchar * message, GError **error) +gboolean +gabble_roster_channel_remove_members (GabbleRosterChannel *self, + const GArray *contacts, + const gchar *message, + GError **error) { return TRUE; } diff --git a/generate/src/gabble-roster-channel.h b/generate/src/gabble-roster-channel.h index dcaa357b0..b9441bd92 100644 --- a/generate/src/gabble-roster-channel.h +++ b/generate/src/gabble-roster-channel.h @@ -34,6 +34,8 @@ struct _GabbleRosterChannelClass { struct _GabbleRosterChannel { GObject parent; + + gpointer priv; }; GType gabble_roster_channel_get_type(void); @@ -53,19 +55,76 @@ GType gabble_roster_channel_get_type(void); (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_ROSTER_CHANNEL, GabbleRosterChannelClass)) -gboolean gabble_roster_channel_add_members (GabbleRosterChannel *obj, const GArray * contacts, const gchar * message, GError **error); -gboolean gabble_roster_channel_close (GabbleRosterChannel *obj, GError **error); -gboolean gabble_roster_channel_get_all_members (GabbleRosterChannel *obj, GArray ** ret, GArray ** ret1, GArray ** ret2, GError **error); -gboolean gabble_roster_channel_get_channel_type (GabbleRosterChannel *obj, gchar ** ret, GError **error); -gboolean gabble_roster_channel_get_group_flags (GabbleRosterChannel *obj, guint* ret, GError **error); -gboolean gabble_roster_channel_get_handle (GabbleRosterChannel *obj, guint* ret, guint* ret1, GError **error); -gboolean gabble_roster_channel_get_handle_owners (GabbleRosterChannel *obj, const GArray * handles, GArray ** ret, GError **error); -gboolean gabble_roster_channel_get_interfaces (GabbleRosterChannel *obj, gchar *** ret, GError **error); -gboolean gabble_roster_channel_get_local_pending_members (GabbleRosterChannel *obj, GArray ** ret, GError **error); -gboolean gabble_roster_channel_get_members (GabbleRosterChannel *obj, GArray ** ret, GError **error); -gboolean gabble_roster_channel_get_remote_pending_members (GabbleRosterChannel *obj, GArray ** ret, GError **error); -gboolean gabble_roster_channel_get_self_handle (GabbleRosterChannel *obj, guint* ret, GError **error); -gboolean gabble_roster_channel_remove_members (GabbleRosterChannel *obj, const GArray * contacts, const gchar * message, GError **error); +gboolean +gabble_roster_channel_add_members (GabbleRosterChannel *self, + const GArray *contacts, + const gchar *message, + GError **error); + +gboolean +gabble_roster_channel_close (GabbleRosterChannel *self, + GError **error); + +gboolean +gabble_roster_channel_get_all_members (GabbleRosterChannel *self, + GArray **ret, + GArray **ret1, + GArray **ret2, + GError **error); + +gboolean +gabble_roster_channel_get_channel_type (GabbleRosterChannel *self, + gchar **ret, + GError **error); + +gboolean +gabble_roster_channel_get_group_flags (GabbleRosterChannel *self, + guint *ret, + GError **error); + +gboolean +gabble_roster_channel_get_handle (GabbleRosterChannel *self, + guint *ret, + guint *ret1, + GError **error); + +gboolean +gabble_roster_channel_get_handle_owners (GabbleRosterChannel *self, + const GArray *handles, + GArray **ret, + GError **error); + +gboolean +gabble_roster_channel_get_interfaces (GabbleRosterChannel *self, + gchar ***ret, + GError **error); + +gboolean +gabble_roster_channel_get_local_pending_members (GabbleRosterChannel *self, + GArray **ret, + GError **error); + +gboolean +gabble_roster_channel_get_members (GabbleRosterChannel *self, + GArray **ret, + GError **error); + +gboolean +gabble_roster_channel_get_remote_pending_members (GabbleRosterChannel *self, + GArray **ret, + GError **error); + +gboolean +gabble_roster_channel_get_self_handle (GabbleRosterChannel *self, + guint *ret, + GError **error); + +gboolean +gabble_roster_channel_remove_members (GabbleRosterChannel *self, + const GArray *contacts, + const gchar *message, + GError **error); + G_END_DECLS |