pidgin: 8ecad898: Build error/warning fixes. Still not tes..

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 8ecad8981a627be745b45a1cd8e5e545f31d1395
Ancestor: 628a16b401ad0e595dbdceae65331a6176a9d811
Author: darkrain42 at pidgin.im
Date: 2009-04-28T23:03:09
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8ecad8981a627be745b45a1cd8e5e545f31d1395

Modified files:
        libpurple/dnssrv.c libpurple/protocols/jabber/Makefile.mingw

ChangeLog: 

Build error/warning fixes. Still not tested because libxmpp.dll won't load.

-------------- next part --------------
============================================================
--- libpurple/dnssrv.c	23d612c2405b30ec13754349eaf09e0588f1413e
+++ libpurple/dnssrv.c	fdc6740f95cd100e89a18063972137d5aefc609a
@@ -291,13 +291,12 @@ res_main_thread_cb(gpointer data)
 res_main_thread_cb(gpointer data)
 {
 	PurpleSrvResponse *srvres = NULL;
-	PurpleTxtResponse *txtres = NULL;
 	int size = 0;
 	PurpleSrvQueryData *query_data = data;
 	if(query_data->error_message != NULL)
 		purple_debug_error("dnssrv", query_data->error_message);
 	else {
-		if (query_data->type == T_SRV) {
+		if (query_data->type == DNS_TYPE_SRV) {
 			PurpleSrvResponse *srvres_tmp = NULL;
 			GSList *lst = query_data->results;
 
@@ -317,8 +316,7 @@ res_main_thread_cb(gpointer data)
 			purple_debug_info("dnssrv", "found %d SRV entries\n", size);
 			
 			if(query_data->cb.srv) query_data->cb.srv(srvres, size, query_data->extradata);
-		} else if (query_data->type == T_TXT) {
-			PurpleTxtResponse *txtres_tmp = NULL;
+		} else if (query_data->type == DNS_TYPE_TXT) {
 			GSList *lst = query_data->results;
 
 			purple_debug_info("dnssrv", "found %d TXT entries\n", g_slist_length(lst));
@@ -431,8 +429,8 @@ purple_srv_resolve(const char *protocol,
 {
 	char *query;
 	PurpleSrvQueryData *query_data;
-	PurpleSrvInternalQuery internal_query;
 #ifndef _WIN32
+	PurpleSrvInternalQuery internal_query;
 	int in[2], out[2];
 	int pid;
 #else
@@ -536,8 +534,8 @@ PurpleSrvQueryData *purple_txt_resolve(c
 {
 	char *query;
 	PurpleSrvQueryData *query_data;
-	PurpleSrvInternalQuery internal_query;
 #ifndef _WIN32
+	PurpleSrvInternalQuery internal_query;
 	int in[2], out[2];
 	int pid;
 #else
============================================================
--- libpurple/protocols/jabber/Makefile.mingw	4f221f686ab5e0a278538214d536432c8a6e8293
+++ libpurple/protocols/jabber/Makefile.mingw	baa588e2d27b0344f4d1de88513fd9ab8a339bfd
@@ -71,6 +71,7 @@ C_SRC =	\
 			presence.c \
 			roster.c \
 			si.c \
+			useravatar.c \
 			usermood.c \
 			usernick.c \
 			usertune.c \