Mercurial > pidgin3 / file diff

--- a/libpurple/dnssrv.c	Thu Feb 06 16:53:42 2014 +0530
+++ b/libpurple/dnssrv.c	Thu Feb 06 20:02:57 2014 +0530
@@ -739,7 +739,7 @@
 		g_return_val_if_reached(NULL);
 	}
 
-	proxy_type = purple_proxy_info_get_type(
+	proxy_type = purple_proxy_info_get_proxy_type(
 		purple_proxy_get_setup(account));
 	if (proxy_type == PURPLE_PROXY_TOR) {
 		purple_debug_info("dnssrv", "Aborting SRV lookup in Tor Proxy mode.\n");
@@ -859,7 +859,7 @@
 	GError* err = NULL;
 #endif
 
-	proxy_type = purple_proxy_info_get_type(
+	proxy_type = purple_proxy_info_get_proxy_type(
 		purple_proxy_get_setup(account));
 	if (proxy_type == PURPLE_PROXY_TOR) {
 		purple_debug_info("dnssrv", "Aborting TXT lookup in Tor Proxy mode.\n");
@@ -1094,7 +1094,7 @@
 
 
 int
-purple_srv_txt_query_get_type(PurpleSrvTxtQueryData *query_data)
+purple_srv_txt_query_get_query_type(PurpleSrvTxtQueryData *query_data)
 {
 	g_return_val_if_fail(query_data != NULL, 0);