# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1195254069 0
# Node ID 14e8ad7bc9a4c962ea20ef7d97a581285fce179b
# Parent  b2aab3aa316b562371397a82ca86863201c5bee0# Parent  8d8f06962b65fecec849210364fce8f750ceb41c
merge of '88ea7f54513c734e65a7fc3f4318f393093f6fb6'
     and '9825d58ee82a2b9dc647a626dbb0221665f00a33'

diff -r 8d8f06962b65 -r 14e8ad7bc9a4 libpurple/connection.h
--- 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
diff -r 8d8f06962b65 -r 14e8ad7bc9a4 libpurple/request.h
diff -r 8d8f06962b65 -r 14e8ad7bc9a4 pidgin/gtkrequest.c