changeset 7511:a899742289c2

[gaim-migrate @ 8124] Changed the parameters for the received-chat-msg signal to pass a conversation rather than an ID number. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Fri, 14 Nov 2003 18:09:31 +0000
parents ef3e646152a1
children 72a795d4b143
files ChangeLog src/conversation.c src/server.c
diffstat 3 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Nov 14 13:29:55 2003 +0000
+++ b/ChangeLog	Fri Nov 14 18:09:31 2003 +0000
@@ -13,6 +13,7 @@
 	* The border on the close buttons on inactive tabs are no longer shown,
 	  thanks to a fix used by Galeon.
 	* Compatible with autoconf 2.58.
+	* Changed the parameters for the received-chat-msg signal.
 	* Chinese (Simplified) translation updated (Funda Wang)
 	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Danish translation updated (Morten Brix Pedersen (mbrix))
--- a/src/conversation.c	Fri Nov 14 13:29:55 2003 +0000
+++ b/src/conversation.c	Fri Nov 14 18:09:31 2003 +0000
@@ -2650,13 +2650,14 @@
 						 gaim_value_new(GAIM_TYPE_UINT));
 
 	gaim_signal_register(handle, "received-chat-msg",
-						 gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_UINT,
+						 gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER,
 						 gaim_value_new(GAIM_TYPE_BOOLEAN), 4,
 						 gaim_value_new(GAIM_TYPE_SUBTYPE,
 										GAIM_SUBTYPE_ACCOUNT),
 						 gaim_value_new_outgoing(GAIM_TYPE_STRING),
 						 gaim_value_new_outgoing(GAIM_TYPE_STRING),
-						 gaim_value_new(GAIM_TYPE_UINT));
+						 gaim_value_new(GAIM_TYPE_SUBTYPE,
+										GAIM_SUBTYPE_CONVERSATION));
 
 	gaim_signal_register(handle, "conversation-switching",
 						 gaim_marshal_VOID__POINTER_POINTER, NULL, 2,
--- a/src/server.c	Fri Nov 14 13:29:55 2003 +0000
+++ b/src/server.c	Fri Nov 14 18:09:31 2003 +0000
@@ -1469,8 +1469,7 @@
 	plugin_return = GPOINTER_TO_INT(
 		gaim_signal_emit_return_1(gaim_conversations_get_handle(),
 								  "received-chat-msg", g->account,
-								  &angel, &buffy,
-								  gaim_conv_chat_get_id(GAIM_CONV_CHAT(conv))));
+								  &angel, &buffy, conv));
 
 	if (!buffy || !angel || plugin_return) {
 		if (buffy)