Mercurial > pidgin.yaz
comparison libpurple/account.h @ 26003:983311560ef9
merge of 'b7c7f0f5daca252711952e60e283dd18a1983d33'
and 'e878814dfc99f1f0a681a2263488c75a068c7c8e'
author | Peter Hjalmarsson <xake@rymdraket.net> |
---|---|
date | Wed, 04 Mar 2009 16:52:47 +0000 |
parents | 4b8c4870b13a |
children | 413b445a6018 |
comparison
equal
deleted
inserted
replaced
25922:d03177395ae0 | 26003:983311560ef9 |
---|---|
258 | 258 |
259 /** | 259 /** |
260 * Notifies the user that a remote user has wants to add the local user | 260 * Notifies the user that a remote user has wants to add the local user |
261 * to his or her buddy list and requires authorization to do so. | 261 * to his or her buddy list and requires authorization to do so. |
262 * | 262 * |
263 * This will present a dialog informing the user of this and ask if the | 263 * This will present a dialog informing the user of this and ask if the |
264 * user authorizes or denies the remote user from adding him. | 264 * user authorizes or denies the remote user from adding him. |
265 * | 265 * |
266 * @param account The account that was added | 266 * @param account The account that was added |
267 * @param remote_user The name of the user that added this account. | 267 * @param remote_user The name of the user that added this account. |
268 * @param id The optional ID of the local account. Rarely used. | 268 * @param id The optional ID of the local account. Rarely used. |