Mercurial > pidgin.yaz
changeset 21349:14e8ad7bc9a4
merge of '88ea7f54513c734e65a7fc3f4318f393093f6fb6'
and '9825d58ee82a2b9dc647a626dbb0221665f00a33'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 16 Nov 2007 23:01:09 +0000 |
| parents | b2aab3aa316b (diff) 8d8f06962b65 (current diff) |
| children | 0cb8d5304f4f |
| files | libpurple/request.h pidgin/gtkrequest.c |
| diffstat | 1 files changed, 14 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/connection.h Fri Nov 16 23:00:52 2007 +0000 +++ b/libpurple/connection.h Fri Nov 16 23:01:09 2007 +0000 @@ -150,6 +150,7 @@ /**************************************************************************/ /*@{*/ +#ifndef PURPLE_DISABLE_DEPRECATED /** * This function should only be called by purple_account_connect() * in account.c. If you're trying to sign on an account, use that @@ -166,10 +167,14 @@ * @param regist Whether we are registering a new account or just * trying to do a normal signon. * @param password The password to use. + * + * @deprecated As this is internal, we should make it private in 3.0.0. */ void purple_connection_new(PurpleAccount *account, gboolean regist, const char *password); +#endif +#ifndef PURPLE_DISABLE_DEPRECATED /** * This function should only be called by purple_account_unregister() * in account.c. @@ -179,9 +184,15 @@ * * @param account The account to unregister * @param password The password to use. + * @param cb Optional callback to be called when unregistration is complete + * @param user_data user data to pass to the callback + * + * @deprecated As this is internal, we should make it private in 3.0.0. */ void purple_connection_new_unregister(PurpleAccount *account, const char *password, PurpleAccountUnregistrationCb cb, void *user_data); +#endif +#ifndef PURPLE_DISABLE_DEPRECATED /** * Disconnects and destroys a PurpleConnection. * @@ -190,8 +201,11 @@ * function instead. * * @param gc The purple connection to destroy. + * + * @deprecated As this is internal, we should make it private in 3.0.0. */ void purple_connection_destroy(PurpleConnection *gc); +#endif /** * Sets the connection state. PRPLs should call this and pass in