pidgin: 14e162f6: purple_proxy_connect_socks5() was deprec...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 14e162f6f36739152c4d5594bd144d7d0c8553e8
Parent:   49b991d4faffe24e4129fbf56a68babc4542f0e5
Author:   andrew.victor at mxit.com
Date:     09/05/11 16:37:04
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/14e162f6f36739152c4d5594bd144d7d0c8553e8

Changelog: 

purple_proxy_connect_socks5() was deprecated in 2.8.0, and can be removed for 3.0.0.


Changes against parent 49b991d4faffe24e4129fbf56a68babc4542f0e5

  patched  ChangeLog.API
  patched  libpurple/proxy.c
  patched  libpurple/proxy.h

-------------- next part --------------
============================================================
--- libpurple/proxy.c	b87967dc11ce6059bec1c76d9a21ddd21f0bd347
+++ libpurple/proxy.c	956d3df8655b85878d11815d07377ba72b8cfd3c
@@ -2408,17 +2408,6 @@ purple_proxy_connect_udp(void *handle, P
 	return connect_data;
 }
 
-PurpleProxyConnectData *
-purple_proxy_connect_socks5(void *handle, PurpleProxyInfo *gpi,
-						  const char *host, int port,
-						  PurpleProxyConnectFunction connect_cb,
-						  gpointer data)
-{
-	return purple_proxy_connect_socks5_account(NULL, handle, gpi,
-						  host, port, connect_cb, data);
-}
-
-
 /* This is called when we connect to the SOCKS5 proxy server (through any
  * relevant account proxy)
  */
============================================================
--- libpurple/proxy.h	88d5b13c9270bb747ea386c95fc31fef60bf2d1d
+++ libpurple/proxy.h	225d58e9ed990d6f8a29f2e297898a800cc83fb3
@@ -307,36 +307,7 @@ PurpleProxyConnectData *purple_proxy_con
 			const char *host, int port,
 			PurpleProxyConnectFunction connect_cb, gpointer data);
 
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_PROXY_C_)
 /**
- * Makes a connection through a SOCKS5 proxy.
- *
- * @param handle     A handle that should be associated with this
- *                   connection attempt.  The handle can be used
- *                   to cancel the connection attempt using the
- *                   purple_proxy_connect_cancel_with_handle()
- *                   function.
- * @param gpi        The PurpleProxyInfo specifying the proxy settings
- * @param host       The destination host.
- * @param port       The destination port.
- * @param connect_cb The function to call when the connection is
- *                   established.  If the connection failed then
- *                   fd will be -1 and error message will be set
- *                   to something descriptive (hopefully).
- * @param data       User-defined data.
- *
- * @return NULL if there was an error, or a reference to an
- *         opaque data structure that can be used to cancel
- *         the pending connection, if needed.
- * @deprecated Use purple_proxy_connect_socks5_account instead
- */
-PurpleProxyConnectData *purple_proxy_connect_socks5(void *handle,
-			PurpleProxyInfo *gpi,
-			const char *host, int port,
-			PurpleProxyConnectFunction connect_cb, gpointer data);
-#endif
-
-/**
  * Cancel an in-progress connection attempt.  This should be called
  * by the PRPL if the user disables an account while it is still
  * performing the initial sign on.  Or when establishing a file
============================================================
--- ChangeLog.API	6c7be88ba4d6f51f57d4ee94733e7ac7e0b0da2c
+++ ChangeLog.API	47e1a880ab1c499813d371e53cc6c473c4873219
@@ -129,6 +129,7 @@ version 3.0.0 (??/??/????):
 		* purple_plugins_unregister_unload_notify_cb
 		* purple_presence_add_status
 		* purple_presence_add_list
+		* purple_proxy_connect_socks5
 		* purple_srv_cancel
 		* purple_srv_resolve_account
 		* purple_status_set_attr_boolean