Mercurial > pidgin
diff libpurple/conversation.c @ 20473:49baf4a0ae39
explicit merge of '9a7160daa1babd3ca644d25e4314310e3f24077e'
and '691c4b8c8733c44a3a80e96a60b2f6963abf3fa7'
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Sat, 21 Jul 2007 23:56:16 +0000 |
| parents | f4d05584369e |
| children | e1062ac14080 |
line wrap: on
line diff
--- a/libpurple/conversation.c Sat Jul 21 19:39:38 2007 +0000 +++ b/libpurple/conversation.c Sat Jul 21 23:56:16 2007 +0000 @@ -2064,7 +2064,7 @@ * Register signals **********************************************************************/ purple_signal_register(handle, "writing-im-msg", - purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER, + purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_UINT, purple_value_new(PURPLE_TYPE_BOOLEAN), 5, purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_ACCOUNT), @@ -2124,7 +2124,7 @@ purple_value_new(PURPLE_TYPE_UINT)); purple_signal_register(handle, "writing-chat-msg", - purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER, + purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_UINT, purple_value_new(PURPLE_TYPE_BOOLEAN), 5, purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_ACCOUNT),