changeset
Refactored conversation signal registrations to use GType instead of PurpleValue
Thu, 18 Jul 2013 02:14:50 +0530
- author
- Ankit Vani <a@nevitus.org>
- date
- Thu, 18 Jul 2013 02:14:50 +0530
- branch
- soc.2013.gobjectification
- changeset 34817
- 2846034a2e68
- parent 34816
- bd3dbaa20bae
- child 34818
- a65e961e1e29
Refactored conversation signal registrations to use GType instead of PurpleValue
| libpurple/conversations.c | file | annotate | diff | comparison | revisions |
--- a/libpurple/conversations.c Thu Jul 18 02:03:36 2013 +0530 +++ b/libpurple/conversations.c Thu Jul 18 02:14:50 2013 +0530 @@ -285,296 +285,186 @@ **********************************************************************/ purple_signal_register(handle, "writing-im-msg", purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_UINT, - purple_value_new(PURPLE_TYPE_BOOLEAN), 5, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new_outgoing(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new(PURPLE_TYPE_UINT)); + G_TYPE_BOOLEAN, 5, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, + G_TYPE_POINTER, /* pointer to a string */ + PURPLE_TYPE_CONVERSATION, G_TYPE_UINT); purple_signal_register(handle, "wrote-im-msg", purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT, - NULL, 5, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new(PURPLE_TYPE_UINT)); + G_TYPE_NONE, 5, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, + G_TYPE_STRING, PURPLE_TYPE_CONVERSATION, G_TYPE_UINT); purple_signal_register(handle, "sent-attention", purple_marshal_VOID__POINTER_POINTER_POINTER_UINT, - NULL, 4, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new(PURPLE_TYPE_UINT)); + G_TYPE_NONE, 4, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, + PURPLE_TYPE_CONVERSATION, G_TYPE_UINT); purple_signal_register(handle, "got-attention", purple_marshal_VOID__POINTER_POINTER_POINTER_UINT, - NULL, 4, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new(PURPLE_TYPE_UINT)); + G_TYPE_NONE, 4, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, + PURPLE_TYPE_CONVERSATION, G_TYPE_UINT); purple_signal_register(handle, "sending-im-msg", purple_marshal_VOID__POINTER_POINTER_POINTER, - NULL, 3, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new_outgoing(PURPLE_TYPE_STRING)); + G_TYPE_NONE, 3, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, + G_TYPE_POINTER); /* pointer to a string */ purple_signal_register(handle, "sent-im-msg", purple_marshal_VOID__POINTER_POINTER_POINTER, - NULL, 3, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_STRING)); + G_TYPE_NONE, 3, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, + G_TYPE_STRING); purple_signal_register(handle, "receiving-im-msg", purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER, - purple_value_new(PURPLE_TYPE_BOOLEAN), 5, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new_outgoing(PURPLE_TYPE_STRING), - purple_value_new_outgoing(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new_outgoing(PURPLE_TYPE_UINT)); + G_TYPE_BOOLEAN, 5, PURPLE_TYPE_ACCOUNT, + G_TYPE_POINTER, /* pointer to a string */ + G_TYPE_POINTER, /* pointer to a string */ + PURPLE_TYPE_CONVERSATION, + G_TYPE_POINTER); /* pointer to a string */ purple_signal_register(handle, "received-im-msg", purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT, - NULL, 5, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new(PURPLE_TYPE_UINT)); + G_TYPE_NONE, 5, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, + G_TYPE_STRING, PURPLE_TYPE_CONVERSATION, G_TYPE_UINT); purple_signal_register(handle, "blocked-im-msg", purple_marshal_VOID__POINTER_POINTER_POINTER_UINT_UINT, - NULL, 5, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_UINT), - purple_value_new(PURPLE_TYPE_UINT)); + G_TYPE_NONE, 5, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT); purple_signal_register(handle, "writing-chat-msg", purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_UINT, - purple_value_new(PURPLE_TYPE_BOOLEAN), 5, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new_outgoing(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new(PURPLE_TYPE_UINT)); + G_TYPE_BOOLEAN, 5, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, + G_TYPE_POINTER, /* pointer to a string */ + PURPLE_TYPE_CONVERSATION, G_TYPE_UINT); purple_signal_register(handle, "wrote-chat-msg", purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT, - NULL, 5, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new(PURPLE_TYPE_UINT)); + G_TYPE_NONE, 5, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, + G_TYPE_STRING, PURPLE_TYPE_CONVERSATION, G_TYPE_UINT); purple_signal_register(handle, "sending-chat-msg", - purple_marshal_VOID__POINTER_POINTER_UINT, NULL, 3, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new_outgoing(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_UINT)); + purple_marshal_VOID__POINTER_POINTER_UINT, G_TYPE_NONE, + 3, PURPLE_TYPE_ACCOUNT, + G_TYPE_POINTER, /* pointer to a string */ + G_TYPE_UINT); purple_signal_register(handle, "sent-chat-msg", - purple_marshal_VOID__POINTER_POINTER_UINT, NULL, 3, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_UINT)); + purple_marshal_VOID__POINTER_POINTER_UINT, G_TYPE_NONE, + 3, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, G_TYPE_UINT); purple_signal_register(handle, "receiving-chat-msg", purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER, - purple_value_new(PURPLE_TYPE_BOOLEAN), 5, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new_outgoing(PURPLE_TYPE_STRING), - purple_value_new_outgoing(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new_outgoing(PURPLE_TYPE_UINT)); + G_TYPE_BOOLEAN, 5, PURPLE_TYPE_ACCOUNT, + G_TYPE_POINTER, /* pointer to a string */ + G_TYPE_POINTER, /* pointer to a string */ + PURPLE_TYPE_CONVERSATION, + G_TYPE_POINTER); /* pointer to an unsigned int */ purple_signal_register(handle, "received-chat-msg", purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT, - NULL, 5, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new(PURPLE_TYPE_UINT)); + G_TYPE_NONE, 5, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, + G_TYPE_STRING, PURPLE_TYPE_CONVERSATION, G_TYPE_UINT); purple_signal_register(handle, "conversation-created", - purple_marshal_VOID__POINTER, NULL, 1, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION)); + purple_marshal_VOID__POINTER, G_TYPE_NONE, 1, + PURPLE_TYPE_CONVERSATION); purple_signal_register(handle, "conversation-updated", - purple_marshal_VOID__POINTER_UINT, NULL, 2, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new(PURPLE_TYPE_UINT)); + purple_marshal_VOID__POINTER_UINT, G_TYPE_NONE, 2, + PURPLE_TYPE_CONVERSATION, G_TYPE_UINT); purple_signal_register(handle, "deleting-conversation", - purple_marshal_VOID__POINTER, NULL, 1, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION)); + purple_marshal_VOID__POINTER, G_TYPE_NONE, 1, + PURPLE_TYPE_CONVERSATION); purple_signal_register(handle, "buddy-typing", - purple_marshal_VOID__POINTER_POINTER, NULL, 2, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new(PURPLE_TYPE_STRING)); + purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, + PURPLE_TYPE_ACCOUNT, G_TYPE_STRING); purple_signal_register(handle, "buddy-typed", - purple_marshal_VOID__POINTER_POINTER, NULL, 2, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new(PURPLE_TYPE_STRING)); + purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, + PURPLE_TYPE_ACCOUNT, G_TYPE_STRING); purple_signal_register(handle, "buddy-typing-stopped", - purple_marshal_VOID__POINTER_POINTER, NULL, 2, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new(PURPLE_TYPE_STRING)); + purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, + PURPLE_TYPE_ACCOUNT, G_TYPE_STRING); purple_signal_register(handle, "chat-user-joining", purple_marshal_BOOLEAN__POINTER_POINTER_UINT, - purple_value_new(PURPLE_TYPE_BOOLEAN), 3, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_UINT)); + G_TYPE_BOOLEAN, 3, PURPLE_TYPE_CONVERSATION, + G_TYPE_STRING, G_TYPE_UINT); purple_signal_register(handle, "chat-user-joined", - purple_marshal_VOID__POINTER_POINTER_UINT_UINT, NULL, 4, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_UINT), - purple_value_new(PURPLE_TYPE_BOOLEAN)); + purple_marshal_VOID__POINTER_POINTER_UINT_UINT, + G_TYPE_NONE, 4, PURPLE_TYPE_CONVERSATION, + G_TYPE_STRING, G_TYPE_UINT, G_TYPE_BOOLEAN); purple_signal_register(handle, "chat-user-flags", - purple_marshal_VOID__POINTER_UINT_UINT, NULL, 3, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CHATUSER), - purple_value_new(PURPLE_TYPE_UINT), - purple_value_new(PURPLE_TYPE_UINT)); + purple_marshal_VOID__POINTER_UINT_UINT, G_TYPE_NONE, 3, + PURPLE_TYPE_CHAT_USER, G_TYPE_UINT, G_TYPE_UINT); purple_signal_register(handle, "chat-user-leaving", purple_marshal_BOOLEAN__POINTER_POINTER_POINTER, - purple_value_new(PURPLE_TYPE_BOOLEAN), 3, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_STRING)); + G_TYPE_BOOLEAN, 3, PURPLE_TYPE_CONVERSATION, + G_TYPE_STRING, G_TYPE_STRING); purple_signal_register(handle, "chat-user-left", - purple_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_STRING)); + purple_marshal_VOID__POINTER_POINTER_POINTER, + G_TYPE_NONE, 3, PURPLE_TYPE_CONVERSATION, + G_TYPE_STRING, G_TYPE_STRING); purple_signal_register(handle, "deleting-chat-user", - purple_marshal_VOID__POINTER, NULL, 1, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CHATUSER)); + purple_marshal_VOID__POINTER, G_TYPE_NONE, 1, + PURPLE_TYPE_CHAT_USER); purple_signal_register(handle, "chat-inviting-user", - purple_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new_outgoing(PURPLE_TYPE_STRING)); + purple_marshal_VOID__POINTER_POINTER_POINTER, + G_TYPE_NONE, 3, PURPLE_TYPE_CONVERSATION, + G_TYPE_STRING, + G_TYPE_POINTER); /* pointer to a string */ purple_signal_register(handle, "chat-invited-user", - purple_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_STRING)); + purple_marshal_VOID__POINTER_POINTER_POINTER, + G_TYPE_NONE, 3, PURPLE_TYPE_CONVERSATION, + G_TYPE_STRING, G_TYPE_STRING); purple_signal_register(handle, "chat-invited", purple_marshal_INT__POINTER_POINTER_POINTER_POINTER_POINTER, - purple_value_new(PURPLE_TYPE_INT), 5, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_POINTER)); + G_TYPE_INT, 5, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER); purple_signal_register(handle, "chat-invite-blocked", purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_POINTER, - NULL, 5, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_ACCOUNT), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_BOXED, "GHashTable *")); + G_TYPE_NONE, 5, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_STRING, + G_TYPE_POINTER); /* (GHashTable *) */ purple_signal_register(handle, "chat-joined", - purple_marshal_VOID__POINTER, NULL, 1, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION)); + purple_marshal_VOID__POINTER, G_TYPE_NONE, 1, + PURPLE_TYPE_CONVERSATION); purple_signal_register(handle, "chat-join-failed", - purple_marshal_VOID__POINTER_POINTER, NULL, 2, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONNECTION), - purple_value_new(PURPLE_TYPE_POINTER)); + purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, + PURPLE_TYPE_CONNECTION, G_TYPE_POINTER); purple_signal_register(handle, "chat-left", - purple_marshal_VOID__POINTER, NULL, 1, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION)); + purple_marshal_VOID__POINTER, G_TYPE_NONE, 1, + PURPLE_TYPE_CONVERSATION); purple_signal_register(handle, "chat-topic-changed", - purple_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new(PURPLE_TYPE_STRING), - purple_value_new(PURPLE_TYPE_STRING)); + purple_marshal_VOID__POINTER_POINTER_POINTER, + G_TYPE_NONE, 3, PURPLE_TYPE_CONVERSATION, + G_TYPE_STRING, G_TYPE_STRING); purple_signal_register(handle, "cleared-message-history", - purple_marshal_VOID__POINTER, NULL, 1, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION)); + purple_marshal_VOID__POINTER, G_TYPE_NONE, 1, + PURPLE_TYPE_CONVERSATION); purple_signal_register(handle, "conversation-extended-menu", - purple_marshal_VOID__POINTER_POINTER, NULL, 2, - purple_value_new(PURPLE_TYPE_SUBTYPE, - PURPLE_SUBTYPE_CONVERSATION), - purple_value_new(PURPLE_TYPE_BOXED, "GList **")); + purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, + PURPLE_TYPE_CONVERSATION, + G_TYPE_POINTER); /* (GList **) */ } void
