# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1240959837 0
# Node ID 934bc523239f6af631c90e2aa4f8e57a9a9dd18b
# Parent  f1b92f2ea41f3ee34cd0a83131202b0b7f05e5b9# Parent  e5c874075b424f199aa35c092cd7017ad6cdbf4d
merge of '2448add898018349b64e4eb5550adb03644790db'
     and '8ecad8981a627be745b45a1cd8e5e545f31d1395'

diff -r f1b92f2ea41f -r 934bc523239f libpurple/dnssrv.c
--- a/libpurple/dnssrv.c	Tue Apr 28 22:25:49 2009 +0000
+++ b/libpurple/dnssrv.c	Tue Apr 28 23:03:57 2009 +0000
@@ -291,13 +291,12 @@
 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 @@
 			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 @@
 {
 	char *query;
 	PurpleSrvQueryData *query_data;
+#ifndef _WIN32
 	PurpleSrvInternalQuery internal_query;
-#ifndef _WIN32
 	int in[2], out[2];
 	int pid;
 #else
@@ -536,8 +534,8 @@
 {
 	char *query;
 	PurpleSrvQueryData *query_data;
+#ifndef _WIN32
 	PurpleSrvInternalQuery internal_query;
-#ifndef _WIN32
 	int in[2], out[2];
 	int pid;
 #else
diff -r f1b92f2ea41f -r 934bc523239f libpurple/protocols/jabber/Makefile.mingw
--- a/libpurple/protocols/jabber/Makefile.mingw	Tue Apr 28 22:25:49 2009 +0000
+++ b/libpurple/protocols/jabber/Makefile.mingw	Tue Apr 28 23:03:57 2009 +0000
@@ -71,6 +71,7 @@
 			presence.c \
 			roster.c \
 			si.c \
+			useravatar.c \
 			usermood.c \
 			usernick.c \
 			usertune.c \
diff -r f1b92f2ea41f -r 934bc523239f libpurple/protocols/jabber/bosh.c
--- a/libpurple/protocols/jabber/bosh.c	Tue Apr 28 22:25:49 2009 +0000
+++ b/libpurple/protocols/jabber/bosh.c	Tue Apr 28 23:03:57 2009 +0000
@@ -194,7 +194,7 @@
 	 * unlikely we'll send enough packets in one session to overflow the rid.
 	 */
 	conn->rid = ((guint64)g_random_int() << 32) | g_random_int();
-	conn->rid &= 0xFFFFFFFFFFFFF;
+	conn->rid &= 0xFFFFFFFFFFFFFLL;
 
 	conn->pending = purple_circ_buffer_new(0 /* default grow size */);