changeset 32674:2571b01e849c

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.
author andrew.victor@mxit.com
date Sat, 24 Sep 2011 17:04:09 +0000
parents 1bcedeb32bb4
children 75d20c9836c1 be14cf8a4c91
files ChangeLog.API libpurple/connection.c libpurple/connection.h libpurple/dbus-analyze-functions.py libpurple/plugins/perl/common/Connection.xs
diffstat 5 files changed, 3 insertions(+), 79 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog.API	Sat Sep 24 16:36:57 2011 +0000
+++ b/ChangeLog.API	Sat Sep 24 17:04:09 2011 +0000
@@ -118,6 +118,9 @@
 		* 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
--- a/libpurple/connection.c	Sat Sep 24 16:36:57 2011 +0000
+++ b/libpurple/connection.c	Sat Sep 24 17:04:09 2011 +0000
@@ -92,12 +92,6 @@
 }
 
 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 @@
 		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
-purple_connection_destroy(PurpleConnection *gc)
-{
-	_purple_connection_destroy(gc);
-}
-
-void
 _purple_connection_destroy(PurpleConnection *gc)
 {
 	PurpleAccount *account;
--- a/libpurple/connection.h	Sat Sep 24 16:36:57 2011 +0000
+++ b/libpurple/connection.h	Sat Sep 24 17:04:09 2011 +0000
@@ -272,63 +272,6 @@
 /**************************************************************************/
 /*@{*/
 
-#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
--- a/libpurple/dbus-analyze-functions.py	Sat Sep 24 16:36:57 2011 +0000
+++ b/libpurple/dbus-analyze-functions.py	Sat Sep 24 17:04:09 2011 +0000
@@ -29,7 +29,6 @@
     # 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",
--- a/libpurple/plugins/perl/common/Connection.xs	Sat Sep 24 16:36:57 2011 +0000
+++ b/libpurple/plugins/perl/common/Connection.xs	Sat Sep 24 17:04:09 2011 +0000
@@ -36,10 +36,6 @@
 	const char *text
 
 void
-purple_connection_destroy(gc)
-	Purple::Connection gc
-
-void
 purple_connection_set_state(gc, state)
 	Purple::Connection gc
 	Purple::ConnectionState state