summaryrefslogtreecommitdiff
path: root/libpurple/conversations.c
diff options
context:
space:
mode:
authorAnkit Vani <a@nevitus.org>2013-10-07 18:07:59 +0530
committerAnkit Vani <a@nevitus.org>2013-10-07 18:07:59 +0530
commit90d11536922a5e8014be1823cfeec7917378ef57 (patch)
treed1160251da0fc3b798d69342f51678129f62987d /libpurple/conversations.c
parent0a307b2d750501fbdd8b86fd1d3bf79d671d1366 (diff)
downloadpidgin-90d11536922a5e8014be1823cfeec7917378ef57.tar.gz
Used conversation subtypes for conversation signals wherever appropriate
Diffstat (limited to 'libpurple/conversations.c')
-rw-r--r--libpurple/conversations.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/libpurple/conversations.c b/libpurple/conversations.c
index 0a3ded060e..8322162e0d 100644
--- a/libpurple/conversations.c
+++ b/libpurple/conversations.c
@@ -287,12 +287,12 @@ purple_conversations_init(void)
purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_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_TYPE_IM_CONVERSATION, G_TYPE_UINT);
purple_signal_register(handle, "wrote-im-msg",
purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT,
G_TYPE_NONE, 5, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING,
- G_TYPE_STRING, PURPLE_TYPE_CONVERSATION, G_TYPE_UINT);
+ G_TYPE_STRING, PURPLE_TYPE_IM_CONVERSATION, G_TYPE_UINT);
purple_signal_register(handle, "sent-attention",
purple_marshal_VOID__POINTER_POINTER_POINTER_UINT,
@@ -319,13 +319,13 @@ purple_conversations_init(void)
G_TYPE_BOOLEAN, 5, PURPLE_TYPE_ACCOUNT,
G_TYPE_POINTER, /* pointer to a string */
G_TYPE_POINTER, /* pointer to a string */
- PURPLE_TYPE_CONVERSATION,
+ PURPLE_TYPE_IM_CONVERSATION,
G_TYPE_POINTER); /* pointer to a string */
purple_signal_register(handle, "received-im-msg",
purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT,
G_TYPE_NONE, 5, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING,
- G_TYPE_STRING, PURPLE_TYPE_CONVERSATION, G_TYPE_UINT);
+ G_TYPE_STRING, PURPLE_TYPE_IM_CONVERSATION, G_TYPE_UINT);
purple_signal_register(handle, "blocked-im-msg",
purple_marshal_VOID__POINTER_POINTER_POINTER_UINT_UINT,
@@ -336,12 +336,12 @@ purple_conversations_init(void)
purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_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_TYPE_CHAT_CONVERSATION, G_TYPE_UINT);
purple_signal_register(handle, "wrote-chat-msg",
purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT,
G_TYPE_NONE, 5, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING,
- G_TYPE_STRING, PURPLE_TYPE_CONVERSATION, G_TYPE_UINT);
+ G_TYPE_STRING, PURPLE_TYPE_CHAT_CONVERSATION, G_TYPE_UINT);
purple_signal_register(handle, "sending-chat-msg",
purple_marshal_VOID__POINTER_POINTER_UINT, G_TYPE_NONE,
@@ -358,13 +358,13 @@ purple_conversations_init(void)
G_TYPE_BOOLEAN, 5, PURPLE_TYPE_ACCOUNT,
G_TYPE_POINTER, /* pointer to a string */
G_TYPE_POINTER, /* pointer to a string */
- PURPLE_TYPE_CONVERSATION,
+ PURPLE_TYPE_CHAT_CONVERSATION,
G_TYPE_POINTER); /* pointer to an unsigned int */
purple_signal_register(handle, "received-chat-msg",
purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT,
G_TYPE_NONE, 5, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING,
- G_TYPE_STRING, PURPLE_TYPE_CONVERSATION, G_TYPE_UINT);
+ G_TYPE_STRING, PURPLE_TYPE_CHAT_CONVERSATION, G_TYPE_UINT);
purple_signal_register(handle, "conversation-created",
purple_marshal_VOID__POINTER, G_TYPE_NONE, 1,
@@ -392,12 +392,12 @@ purple_conversations_init(void)
purple_signal_register(handle, "chat-user-joining",
purple_marshal_BOOLEAN__POINTER_POINTER_UINT,
- G_TYPE_BOOLEAN, 3, PURPLE_TYPE_CONVERSATION,
+ G_TYPE_BOOLEAN, 3, PURPLE_TYPE_CHAT_CONVERSATION,
G_TYPE_STRING, G_TYPE_UINT);
purple_signal_register(handle, "chat-user-joined",
purple_marshal_VOID__POINTER_POINTER_UINT_UINT,
- G_TYPE_NONE, 4, PURPLE_TYPE_CONVERSATION,
+ G_TYPE_NONE, 4, PURPLE_TYPE_CHAT_CONVERSATION,
G_TYPE_STRING, G_TYPE_UINT, G_TYPE_BOOLEAN);
purple_signal_register(handle, "chat-user-flags",
@@ -406,12 +406,12 @@ purple_conversations_init(void)
purple_signal_register(handle, "chat-user-leaving",
purple_marshal_BOOLEAN__POINTER_POINTER_POINTER,
- G_TYPE_BOOLEAN, 3, PURPLE_TYPE_CONVERSATION,
+ G_TYPE_BOOLEAN, 3, PURPLE_TYPE_CHAT_CONVERSATION,
G_TYPE_STRING, G_TYPE_STRING);
purple_signal_register(handle, "chat-user-left",
purple_marshal_VOID__POINTER_POINTER_POINTER,
- G_TYPE_NONE, 3, PURPLE_TYPE_CONVERSATION,
+ G_TYPE_NONE, 3, PURPLE_TYPE_CHAT_CONVERSATION,
G_TYPE_STRING, G_TYPE_STRING);
purple_signal_register(handle, "deleting-chat-user",
@@ -420,13 +420,13 @@ purple_conversations_init(void)
purple_signal_register(handle, "chat-inviting-user",
purple_marshal_VOID__POINTER_POINTER_POINTER,
- G_TYPE_NONE, 3, PURPLE_TYPE_CONVERSATION,
+ G_TYPE_NONE, 3, PURPLE_TYPE_CHAT_CONVERSATION,
G_TYPE_STRING,
G_TYPE_POINTER); /* pointer to a string */
purple_signal_register(handle, "chat-invited-user",
purple_marshal_VOID__POINTER_POINTER_POINTER,
- G_TYPE_NONE, 3, PURPLE_TYPE_CONVERSATION,
+ G_TYPE_NONE, 3, PURPLE_TYPE_CHAT_CONVERSATION,
G_TYPE_STRING, G_TYPE_STRING);
purple_signal_register(handle, "chat-invited",
@@ -442,7 +442,7 @@ purple_conversations_init(void)
purple_signal_register(handle, "chat-joined",
purple_marshal_VOID__POINTER, G_TYPE_NONE, 1,
- PURPLE_TYPE_CONVERSATION);
+ PURPLE_TYPE_CHAT_CONVERSATION);
purple_signal_register(handle, "chat-join-failed",
purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2,
@@ -450,11 +450,11 @@ purple_conversations_init(void)
purple_signal_register(handle, "chat-left",
purple_marshal_VOID__POINTER, G_TYPE_NONE, 1,
- PURPLE_TYPE_CONVERSATION);
+ PURPLE_TYPE_CHAT_CONVERSATION);
purple_signal_register(handle, "chat-topic-changed",
purple_marshal_VOID__POINTER_POINTER_POINTER,
- G_TYPE_NONE, 3, PURPLE_TYPE_CONVERSATION,
+ G_TYPE_NONE, 3, PURPLE_TYPE_CHAT_CONVERSATION,
G_TYPE_STRING, G_TYPE_STRING);
purple_signal_register(handle, "cleared-message-history",