Mercurial > pidgin.yaz

diff libpurple/protocols/simple/simple.c @ 32477:efe38e6319f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up SRV/TXT query functions. * Rename _account functions to their regular form. * Remove the unnecessary _cancel functions.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 02 Sep 2011 03:18:15 +0000
parents f22bc8b5b9dc
children cd1d9e04c587
line wrap: on
line diff
--- a/libpurple/protocols/simple/simple.c	Fri Sep 02 02:42:39 2011 +0000
+++ b/libpurple/protocols/simple/simple.c	Fri Sep 02 03:18:15 2011 +0000
@@ -1970,7 +1970,7 @@
 		hosttoconnect = purple_account_get_string(account, "proxy", sip->servername);
 	}
 
-	sip->srv_query_data = purple_srv_resolve_account(account, "sip",
+	sip->srv_query_data = purple_srv_resolve(account, "sip",
 			sip->udp ? "udp" : "tcp", hosttoconnect, srvresolved, sip);
 }
 
@@ -2007,7 +2007,7 @@
 		purple_dnsquery_destroy(sip->query_data);
 
 	if (sip->srv_query_data != NULL)
-		purple_srv_cancel(sip->srv_query_data);
+		purple_srv_txt_query_destroy(sip->srv_query_data);
 
 	if (sip->listen_data != NULL)
 		purple_network_listen_cancel(sip->listen_data);