Mercurial > pidgin
comparison libpurple/server.h @ 31364:ea2a155b4439
propagate from branch 'im.pidgin.pidgin' (head 7d1d85421a7221e67b586df32625c65c1434f195)
to branch 'im.pidgin.pidgin.next.minor' (head 5806c0bc47c791300ede51ab92336dd817bd149c)
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Sat, 08 Jan 2011 03:10:40 +0000 |
| parents | 44f53d3fc54f |
| children | 91e8402106c1 |
comparison
equal
deleted
inserted
replaced
| 31363:539aa44be788 | 31364:ea2a155b4439 |
|---|---|
| 169 GHashTable *data); | 169 GHashTable *data); |
| 170 | 170 |
| 171 /** | 171 /** |
| 172 * Called by a prpl when an account has joined a chat. | 172 * Called by a prpl when an account has joined a chat. |
| 173 * | 173 * |
| 174 * @param gc The connection on which the chat was joined. | 174 * @param gc The connection on which the chat was joined. |
| 175 * @param id The id of the chat, assigned by the prpl. | 175 * @param id The id of the chat, assigned by the prpl. |
| 176 * @param name The name of the chat. | 176 * @param name The name of the chat. |
| 177 * @return The resulting conversation | 177 * @return The resulting conversation |
| 178 */ | 178 */ |
| 179 PurpleConversation *serv_got_joined_chat(PurpleConnection *gc, | 179 PurpleConversation *serv_got_joined_chat(PurpleConnection *gc, |