cpw.malu.xmpp.jingle_ft: e9599be3: don't use depricated socks5 function

malu at pidgin.im malu at pidgin.im
Tue Jun 14 17:55:48 EDT 2011


----------------------------------------------------------------------
Revision: e9599be30d033338d32795491d6db0eac787e404
Parent:   b64abba4bced5e9d580dddab7991f05b4f77f512
Author:   malu at pidgin.im
Date:     06/14/11 17:53:45
Branch:   im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/e9599be30d033338d32795491d6db0eac787e404

Changelog: 

don't use depricated socks5 function

Changes against parent b64abba4bced5e9d580dddab7991f05b4f77f512

  patched  libpurple/protocols/jabber/jingle/s5b.c

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jingle/s5b.c	1dde3c645af5c2dd106a00005acadf1888f26eb5
+++ libpurple/protocols/jabber/jingle/s5b.c	ef17e76d69854289ca2549c947cef767b7346404
@@ -31,6 +31,7 @@
 #include "socks5.h"
 #include "debug.h"
 #include "network.h"
+#include "proxy.h"
 #include "xmlnode.h"
 
 
@@ -930,6 +931,7 @@ jingle_s5b_connect_to_candidate(JingleS5
 	JabberID *dstjid = jabber_id_new(who);
 	gchar *dstaddr = NULL;
 	gchar *hash = NULL;
+	PurpleAccount *account = purple_connection_get_account(js->gc);
 	
 	purple_debug_info("jingle-s5b", 
 		"attempting to connect to streamhost: %s, port: %d\n",
@@ -957,7 +959,7 @@ jingle_s5b_connect_to_candidate(JingleS5
 	purple_debug_info("jingle-s5b", "connecting with hash: %s\n", hash);
 
 	s5b->priv->connect_data =
-		purple_proxy_connect_socks5(NULL, s5b->priv->ppi, hash, 0, 
+		purple_proxy_connect_socks5_account(NULL, account, s5b->priv->ppi, hash, 0, 
 			connect_cb, data);
 	g_free(hash);
 	g_free(dstaddr);


More information about the Commits mailing list