pidgin: 5bee1fe9: Hide PurpleProxyInfo struct.

qulogic at pidgin.im qulogic at pidgin.im
Fri Sep 2 00:37:44 EDT 2011


----------------------------------------------------------------------
Revision: 5bee1fe926f6fb7ca6e12680dc4c95634865b6c0
Parent:   6125ac0bb42bb0981d9d4f548b6b0feef2aa744a
Author:   qulogic at pidgin.im
Date:     09/01/11 22:42:39
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5bee1fe926f6fb7ca6e12680dc4c95634865b6c0

Changelog: 

Hide PurpleProxyInfo struct.

Changes against parent 6125ac0bb42bb0981d9d4f548b6b0feef2aa744a

  patched  ChangeLog.API
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/proxy.c
  patched  libpurple/proxy.h

-------------- next part --------------
============================================================
--- libpurple/proxy.c	f95df02b593e58a8f11510fb767dfc2c9ca6c6a5
+++ libpurple/proxy.c	b87967dc11ce6059bec1c76d9a21ddd21f0bd347
@@ -41,6 +41,16 @@
 #include "proxy.h"
 #include "util.h"
 
+struct _PurpleProxyInfo
+{
+	PurpleProxyType type;   /**< The proxy type.  */
+
+	char *host;           /**< The host.        */
+	int   port;           /**< The port number. */
+	char *username;       /**< The username.    */
+	char *password;       /**< The password.    */
+};
+
 struct _PurpleProxyConnectData {
 	void *handle;
 	PurpleProxyConnectFunction connect_cb;
============================================================
--- libpurple/proxy.h	6b4cdb7abdc305b7925e20b9eaef81d0217b8ceb
+++ libpurple/proxy.h	88d5b13c9270bb747ea386c95fc31fef60bf2d1d
@@ -47,17 +47,8 @@ typedef enum
 /**
  * Information on proxy settings.
  */
-typedef struct
-{
-	PurpleProxyType type;   /**< The proxy type.  */
+typedef struct _PurpleProxyInfo PurpleProxyInfo;
 
-	char *host;           /**< The host.        */
-	int   port;           /**< The port number. */
-	char *username;       /**< The username.    */
-	char *password;       /**< The password.    */
-
-} PurpleProxyInfo;
-
 typedef struct _PurpleProxyConnectData PurpleProxyConnectData;
 
 typedef void (*PurpleProxyConnectFunction)(gpointer data, gint source, const gchar *error_message);
============================================================
--- libpurple/protocols/yahoo/libymsg.c	ddc4e121826f5e9b8cf199ff182d545e053d3d5a
+++ libpurple/protocols/yahoo/libymsg.c	b43a391005beac3c8d9ab34315a8aad39d72adc1
@@ -4476,7 +4476,7 @@ static void yahoo_get_sms_carrier(Purple
 		YAHOO_CLIENT_VERSION, yd->cookie_t, yd->cookie_y, strlen(validate_request_str), validate_request_str);
 
 	/* use whole URL if using HTTP Proxy */
-	if ((gc->account->proxy_info) && (gc->account->proxy_info->type == PURPLE_PROXY_HTTP))
+	if ((gc->account->proxy_info) && (purple_proxy_info_get_type(gc->account->proxy_info) == PURPLE_PROXY_HTTP))
 	    use_whole_url = TRUE;
 
 	url_data = purple_util_fetch_url_request_len(
============================================================
--- ChangeLog.API	729d38f06133b98cc5757435e05c0a5db73f6380
+++ ChangeLog.API	c977b930fd6cb2becd44267131437e20d06056ee
@@ -114,6 +114,7 @@ version 3.0.0 (??/??/????):
 		* struct _GtkIMHtmlFontDetail
 		* struct _PurpleMenuAction
 		* struct _PurplePounce
+		* struct _PurpleProxyInfo
 		* struct _PurpleRequestField
 		* struct _PurpleRoomlist
 		* struct _PurpleRoomlistField


More information about the Commits mailing list