pidgin: 461ff5d0: The following were deprecated since they...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 461ff5d0b22ae38e586cce796e74bb9cf56abcfe
Parent:   fba601deaa5884425524acde3e0ed0ba9fbfe191
Author:   andrew.victor at mxit.com
Date:     09/24/11 13:04:09
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/461ff5d0b22ae38e586cce796e74bb9cf56abcfe

Changelog: 

The following were deprecated since they were moved to the internal API:
  purple_connection_new
  purple_connection_new_unregister
  purple_connection_destroy
Remove the public interface.


Changes against parent fba601deaa5884425524acde3e0ed0ba9fbfe191

  patched  ChangeLog.API
  patched  libpurple/connection.c
  patched  libpurple/connection.h
  patched  libpurple/dbus-analyze-functions.py
  patched  libpurple/plugins/perl/common/Connection.xs

-------------- next part --------------
============================================================
--- libpurple/connection.c	c82ad48edd5011deb0c9c0395997078a06adbb2d
+++ libpurple/connection.c	ac517e60b2f8e692cba94c9de2550444386f7f2f
@@ -92,12 +92,6 @@ void
 }
 
 void
-purple_connection_new(PurpleAccount *account, gboolean regist, const char *password)
-{
-	_purple_connection_new(account, regist, password);
-}
-
-void
 _purple_connection_new(PurpleAccount *account, gboolean regist, const char *password)
 {
 	PurpleConnection *gc;
@@ -171,11 +165,6 @@ _purple_connection_new(PurpleAccount *ac
 		prpl_info->login(account);
 	}
 }
-void
-purple_connection_new_unregister(PurpleAccount *account, const char *password, PurpleAccountUnregistrationCb cb, void *user_data)
-{
-	_purple_connection_new_unregister(account, password, cb, user_data);
-}
 
 void
 _purple_connection_new_unregister(PurpleAccount *account, const char *password, PurpleAccountUnregistrationCb cb, void *user_data)
@@ -234,12 +223,6 @@ void
 }
 
 void
-purple_connection_destroy(PurpleConnection *gc)
-{
-	_purple_connection_destroy(gc);
-}
-
-void
 _purple_connection_destroy(PurpleConnection *gc)
 {
 	PurpleAccount *account;
============================================================
--- libpurple/connection.h	bd283d6499a978f990ebc0698ae29cb2727db719
+++ libpurple/connection.h	242c18e89d872e8927facb836351a32d05c99780
@@ -272,64 +272,7 @@ extern "C" {
 /**************************************************************************/
 /*@{*/
 
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_CONNECTION_C_)
 /**
- * This function should only be called by purple_account_connect()
- * in account.c.  If you're trying to sign on an account, use that
- * function instead.
- *
- * Creates a connection to the specified account and either connects
- * or attempts to register a new account.  If you are logging in,
- * the connection uses the current active status for this account.
- * So if you want to sign on as "away," for example, you need to
- * have called purple_account_set_status(account, "away").
- * (And this will call purple_account_connect() automatically).
- *
- * @param account  The account the connection should be connecting to.
- * @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
-
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_CONNECTION_C_)
-/**
- * This function should only be called by purple_account_unregister()
- * in account.c.
- *
- * Tries to unregister the account on the server. If the account is not
- * connected, also creates a new connection.
- *
- * @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
-
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_CONNECTION_C_)
-/**
- * Disconnects and destroys a PurpleConnection.
- *
- * This function should only be called by purple_account_disconnect()
- * in account.c.  If you're trying to sign off an account, use that
- * 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
  * the state #PURPLE_CONNECTED when the account is completely
  * signed on.  What does it mean to be completely signed on?  If
============================================================
--- libpurple/plugins/perl/common/Connection.xs	ca73a65964d2f48d228261112d06a921723a74ee
+++ libpurple/plugins/perl/common/Connection.xs	aa69a56e06a79d2b05c0679c153305ef0907e794
@@ -36,10 +36,6 @@ void
 	const char *text
 
 void
-purple_connection_destroy(gc)
-	Purple::Connection gc
-
-void
 purple_connection_set_state(gc, state)
 	Purple::Connection gc
 	Purple::ConnectionState state
============================================================
--- ChangeLog.API	8952abac2f759f718e1cb16af388dac1e764b54c
+++ ChangeLog.API	da30dfd63ab68fab212f4a0ae03b27e24117ac4c
@@ -118,6 +118,9 @@ version 3.0.0 (??/??/????):
 		* purple_buddy_icons_find_custom_icon
 		* purple_buddy_icons_set_custom_icon
 		* purple_connection_error_reason
+		* purple_connection_new
+		* purple_connection_new_unregister
+		* purple_connection_destroy
 		* purple_contact_set_alias
 		* purple_conv_chat_set_users
 		* purple_core_migrate
============================================================
--- libpurple/dbus-analyze-functions.py	f068dfcc9e6474ea1376b994eb36d5780af2b905
+++ libpurple/dbus-analyze-functions.py	17f2d1b2713dae797c88eea72e1e7aa42c72248e
@@ -29,7 +29,6 @@ excluded = [\
     # Similar to the above:
     "purple_account_set_register_callback",
     "purple_account_unregister",
-    "purple_connection_new_unregister",
 
     # Similar to the above, again
     "purple_menu_action_new",