Mercurial > pidgin.yaz

diff libpurple/conversation.c @ 22891:43233dc1d40b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
applied changes from 4c5110037671f84e3e775214c32692b5b23c11e1 through ae37fe6b64c30704715a369df88bd76674a39b1a applied changes from 4c5110037671f84e3e775214c32692b5b23c11e1 through ae37fe6b64c30704715a369df88bd76674a39b1a applied changes from b28057d6ade7c221b0616c3b02e86659e2d8b10b through 52c0efb045580dac7b6f5e40c91002e917e0cae3 Plucked changes for the chat-join-failed signal and associated server.c function from im.pidgin.pidgin, as these necessitate a minor version bump.
author Evan Schoenberg <evan.s@dreskin.net>
date Tue, 29 Apr 2008 03:59:28 +0000
parents 1517d3c763fc
children 591ef3693345
line wrap: on
line diff
--- a/libpurple/conversation.c	Tue Apr 29 03:47:38 2008 +0000
+++ b/libpurple/conversation.c	Tue Apr 29 03:59:28 2008 +0000
@@ -2368,6 +2368,12 @@
 						 purple_value_new(PURPLE_TYPE_SUBTYPE,
 										PURPLE_SUBTYPE_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_STRING));
+
 	purple_signal_register(handle, "chat-left",
 						 purple_marshal_VOID__POINTER, NULL, 1,
 						 purple_value_new(PURPLE_TYPE_SUBTYPE,