diff libpurple/proxy.h @ 32505:d66ce874075a

merge of '4550b9538730036d9023f75e224ffb15f50f020f' and '75ec74edcc85a4e376ccf3c424deb66d64db6ba9'

--- a/libpurple/proxy.h	Thu Sep 01 18:26:08 2011 +0000
+++ b/libpurple/proxy.h	Fri Sep 02 18:57:04 2011 +0000
@@ -47,16 +47,7 @@
 /**
  * Information on proxy settings.
  */
-typedef struct
-{
-	PurpleProxyType type;   /**< The proxy type.  */
-
-	char *host;           /**< The host.        */
-	int   port;           /**< The port number. */
-	char *username;       /**< The username.    */
-	char *password;       /**< The password.    */
-
-} PurpleProxyInfo;
+typedef struct _PurpleProxyInfo PurpleProxyInfo;
 
 typedef struct _PurpleProxyConnectData PurpleProxyConnectData;