Mercurial > pidgin
comparison libpurple/conversation.c @ 22819:42dfa1139b5c
merge of '21d37789f674809d615fc7676a092f1da438b0f5'
and 'aafbbc317ab5f69e31e0bb6cabc264bb70745ef2'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Fri, 02 May 2008 22:51:14 +0000 |
| parents | 1517d3c763fc |
| children | 43233dc1d40b f67edee0224e |
comparison
equal
deleted
inserted
replaced
| 22767:d5b3afea8764 | 22819:42dfa1139b5c |
|---|---|
| 2366 purple_signal_register(handle, "chat-joined", | 2366 purple_signal_register(handle, "chat-joined", |
| 2367 purple_marshal_VOID__POINTER, NULL, 1, | 2367 purple_marshal_VOID__POINTER, NULL, 1, |
| 2368 purple_value_new(PURPLE_TYPE_SUBTYPE, | 2368 purple_value_new(PURPLE_TYPE_SUBTYPE, |
| 2369 PURPLE_SUBTYPE_CONVERSATION)); | 2369 PURPLE_SUBTYPE_CONVERSATION)); |
| 2370 | 2370 |
| 2371 purple_signal_register(handle, "chat-join-failed", | |
| 2372 purple_marshal_VOID__POINTER_POINTER, NULL, 2, | |
| 2373 purple_value_new(PURPLE_TYPE_SUBTYPE, | |
| 2374 PURPLE_SUBTYPE_CONNECTION), | |
| 2375 purple_value_new(PURPLE_TYPE_STRING)); | |
| 2376 | |
| 2377 purple_signal_register(handle, "chat-left", | 2371 purple_signal_register(handle, "chat-left", |
| 2378 purple_marshal_VOID__POINTER, NULL, 1, | 2372 purple_marshal_VOID__POINTER, NULL, 1, |
| 2379 purple_value_new(PURPLE_TYPE_SUBTYPE, | 2373 purple_value_new(PURPLE_TYPE_SUBTYPE, |
| 2380 PURPLE_SUBTYPE_CONVERSATION)); | 2374 PURPLE_SUBTYPE_CONVERSATION)); |
| 2381 | 2375 |