/pidgin/main: 247d94c903c3: Switch sent-chat-msg to PurpleMessage

[Tomasz Wasilczyk]

Changeset: 247d94c903c3022510bc9a5337205fa4d9a9d961
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-05-22 16:57 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/247d94c903c3

Description:

Switch sent-chat-msg to PurpleMessage

diffstat:

 finch/gntsound.c                 |  4 ++--
 libpurple/conversation.c         |  5 ++---
 libpurple/conversations.c        |  4 ++--
 libpurple/plugins/signals-test.c |  5 +++--
 libpurple/protocols/irc/cmds.c   |  2 +-
 pidgin/gtksound.c                |  4 ++--
 pidgin/plugins/notify.c          |  2 +-
 pidgin/plugins/unity.c           |  2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diffs (110 lines):

diff --git a/finch/gntsound.c b/finch/gntsound.c
--- a/finch/gntsound.c
+++ b/finch/gntsound.c
@@ -230,8 +230,8 @@ chat_user_left_cb(PurpleChatConversation
 }
 
 static void
-chat_msg_sent_cb(PurpleAccount *account, const char *message,
-				 int id, PurpleSoundEventID event)
+chat_msg_sent_cb(PurpleAccount *account, PurpleMessage *msg, int id,
+	PurpleSoundEventID event)
 {
 	PurpleConnection *conn = purple_account_get_connection(account);
 	PurpleChatConversation *chat = NULL;
diff --git a/libpurple/conversation.c b/libpurple/conversation.c
--- a/libpurple/conversation.c
+++ b/libpurple/conversation.c
@@ -162,9 +162,8 @@ common_send(PurpleConversation *conv, co
 		if (!purple_message_is_empty(msg)) {
 			err = purple_serv_chat_send(gc, id, msg);
 
-			/* TODO: use msg! */
-			purple_signal_emit(purple_conversations_get_handle(), "sent-chat-msg",
-							 account, sent, id);
+			purple_signal_emit(purple_conversations_get_handle(),
+				"sent-chat-msg", account, msg, id);
 		}
 	}
 
diff --git a/libpurple/conversations.c b/libpurple/conversations.c
--- a/libpurple/conversations.c
+++ b/libpurple/conversations.c
@@ -346,8 +346,8 @@ purple_conversations_init(void)
 		3, PURPLE_TYPE_ACCOUNT, PURPLE_TYPE_MESSAGE, G_TYPE_UINT);
 
 	purple_signal_register(handle, "sent-chat-msg",
-						 purple_marshal_VOID__POINTER_POINTER_UINT, G_TYPE_NONE,
-						 3, PURPLE_TYPE_ACCOUNT, G_TYPE_STRING, G_TYPE_UINT);
+		purple_marshal_VOID__POINTER_POINTER_UINT, G_TYPE_NONE,
+		3, PURPLE_TYPE_ACCOUNT, PURPLE_TYPE_MESSAGE, G_TYPE_UINT);
 
 	purple_signal_register(handle, "receiving-chat-msg",
 						 purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER,
diff --git a/libpurple/plugins/signals-test.c b/libpurple/plugins/signals-test.c
--- a/libpurple/plugins/signals-test.c
+++ b/libpurple/plugins/signals-test.c
@@ -368,10 +368,11 @@ sending_chat_msg_cb(PurpleAccount *accou
 }
 
 static void
-sent_chat_msg_cb(PurpleAccount *account, const char *buffer, int id, void *data)
+sent_chat_msg_cb(PurpleAccount *account, PurpleMessage *msg, int id, void *data)
 {
 	purple_debug_misc("signals test", "sent-chat-msg (%s, %s, %d)\n",
-					purple_account_get_username(account), buffer, id);
+		purple_account_get_username(account),
+		purple_message_get_contents(msg), id);
 }
 
 static gboolean
diff --git a/libpurple/protocols/irc/cmds.c b/libpurple/protocols/irc/cmds.c
--- a/libpurple/protocols/irc/cmds.c
+++ b/libpurple/protocols/irc/cmds.c
@@ -172,7 +172,7 @@ int irc_cmd_ctcp_action(struct irc_conn 
 			"sent-im-msg", irc->account, pmsg);
 	} else {
 		purple_signal_emit(purple_conversations_get_handle(),
-			"sent-chat-msg", irc->account, msg,
+			"sent-chat-msg", irc->account, pmsg,
 			purple_chat_conversation_get_id(PURPLE_CHAT_CONVERSATION(convo)));
 	}
 
diff --git a/pidgin/gtksound.c b/pidgin/gtksound.c
--- a/pidgin/gtksound.c
+++ b/pidgin/gtksound.c
@@ -177,8 +177,8 @@ chat_user_left_cb(PurpleChatConversation
 }
 
 static void
-chat_msg_sent_cb(PurpleAccount *account, const char *message,
-				 int id, PurpleSoundEventID event)
+chat_msg_sent_cb(PurpleAccount *account, PurpleMessage *msg, int id,
+	PurpleSoundEventID event)
 {
 	PurpleConnection *conn = purple_account_get_connection(account);
 	PurpleConversation *conv = NULL;
diff --git a/pidgin/plugins/notify.c b/pidgin/plugins/notify.c
--- a/pidgin/plugins/notify.c
+++ b/pidgin/plugins/notify.c
@@ -285,7 +285,7 @@ im_sent_im(PurpleAccount *account, Purpl
 }
 
 static void
-chat_sent_im(PurpleAccount *account, const char *message, int id)
+chat_sent_im(PurpleAccount *account, PurpleMessage *msg, int id)
 {
 	PurpleChatConversation *chat = NULL;
 
diff --git a/pidgin/plugins/unity.c b/pidgin/plugins/unity.c
--- a/pidgin/plugins/unity.c
+++ b/pidgin/plugins/unity.c
@@ -206,7 +206,7 @@ im_sent_im(PurpleAccount *account, Purpl
 }
 
 static void
-chat_sent_im(PurpleAccount *account, const char *message, int id)
+chat_sent_im(PurpleAccount *account, PurpleMessage *msg, int id)
 {
 	PurpleChatConversation *chat = NULL;
 	chat = purple_conversations_find_chat(purple_account_get_connection(account), id);