# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1233736094 0
# Node ID ebd63c4f94051d63cf8ca47f95edb371ee47c5d8
# Parent  65f2c84f122f1ebb0f9fa6cbd250e17ed1148afe# Parent  a9b078297b692eace7077faaf3caa012cde3997b
merge of 'be2cd9a5fc757e3ed024c6c2df60547fc162587e'
     and 'fa6727399704e6c9acbf974a052a303ae7a453c1'

diff -r 65f2c84f122f -r ebd63c4f9405 libpurple/protocols/jabber/presence.c
--- a/libpurple/protocols/jabber/presence.c	Tue Feb 03 20:13:02 2009 +0000
+++ b/libpurple/protocols/jabber/presence.c	Wed Feb 04 08:28:14 2009 +0000
@@ -597,8 +597,6 @@
 		}
 	}
 
-	purple_debug_info("jabber", "got %d seconds idle from presence\n", idle);
-	
 	if (idle && delayed && stamp) {
 		/* if we have a delayed presence, we need to add the delay to the idle
 		 value */
@@ -608,7 +606,6 @@
 			stamp, offset);
 		idle += offset; 
 	}
-	
 
 	if(jid->node && (chat = jabber_chat_find(js, jid->node, jid->domain))) {
 		static int i = 1;
diff -r 65f2c84f122f -r ebd63c4f9405 libpurple/protocols/msn/soap.c
--- a/libpurple/protocols/msn/soap.c	Tue Feb 03 20:13:02 2009 +0000
+++ b/libpurple/protocols/msn/soap.c	Wed Feb 04 08:28:14 2009 +0000
@@ -342,12 +342,14 @@
 	}
 
 	if (fault || body) {
-		MsnSoapRequest *request = conn->current_request;
-		conn->current_request = NULL;
-		request->cb(request->message, response,
-			request->cb_data);
+		if (conn->current_request) {
+			MsnSoapRequest *request = conn->current_request;
+			conn->current_request = NULL;
+			request->cb(request->message, response,
+				request->cb_data);
+			msn_soap_request_destroy(request, FALSE);
+		}
 		msn_soap_message_destroy(response);
-		msn_soap_request_destroy(request, FALSE);
 	}
 
 	return TRUE;
diff -r 65f2c84f122f -r ebd63c4f9405 libpurple/protocols/oscar/oscar.h
--- a/libpurple/protocols/oscar/oscar.h	Tue Feb 03 20:13:02 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.h	Wed Feb 04 08:28:14 2009 +0000
@@ -286,6 +286,15 @@
 	"us", "en", \
 }
 
+#define CLIENTINFO_ICQBASIC_14_34_3096 { \
+	"ICQBasic", \
+	0x010a, \
+	0x0014, 0x0034, \
+	0x0000, 0x0c18, \
+	0x0000043d, \
+	"us", "en", \
+}
+
 #define CLIENTINFO_NETSCAPE_7_0_1 { \
 	"Netscape 2000 an approved user of AOL Instant Messenger (SM)", \
 	0x1d0d, \
@@ -312,14 +321,14 @@
 #define CLIENTINFO_PURPLE_ICQ { \
 	"Purple/" VERSION, \
 	0x010a, \
-	0x0006, 0x0000, \
-	0x0000, 0x17ab, \
-	0x00007535, \
+	0x0014, 0x0034, \
+	0x0000, 0x0c18, \
+	0x0000043d, \
 	"us", "en", \
 }
 
 #define CLIENTINFO_AIM_KNOWNGOOD CLIENTINFO_AIM_5_1_3036
-#define CLIENTINFO_ICQ_KNOWNGOOD CLIENTINFO_ICQBASIC_14_34_3000
+#define CLIENTINFO_ICQ_KNOWNGOOD CLIENTINFO_ICQBASIC_14_34_3096
 
 typedef enum
 {