# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1230370628 0
# Node ID 38fbc2e3c646969ada36ec318316852d570f4bce
# Parent  b74fa0d31c74350aac72657601391d71f7d8d548# Parent  955bfda5649208f219b70fc8f67f585314c27fdb
merge of '5043805100d2fa5a371317e802d6a191c89ddaeb'
     and 'ad2c746d767233c843f194ae7d0063503ec50231'

diff -r 955bfda56492 -r 38fbc2e3c646 libpurple/protocols/qq/AUTHORS
--- a/libpurple/protocols/qq/AUTHORS	Sat Dec 27 09:32:38 2008 +0000
+++ b/libpurple/protocols/qq/AUTHORS	Sat Dec 27 09:37:08 2008 +0000
@@ -1,7 +1,7 @@
 Code Contributors
 =========
 puzzlebird	: original author
-gfhuang		: patches for libpurple 2.0.0beta2, maintainer
+gfhuang(poppyer): patches for libpurple 2.0.0beta2, maintainer
 Yuan Qingyun	: patches for libpurple 1.5.0, maintainer
 henryouly	: file transfer, udp sock5 proxy and qq_show, maintainer
 hzhr		: maintainer
diff -r 955bfda56492 -r 38fbc2e3c646 libpurple/protocols/qq/ChangeLog
--- a/libpurple/protocols/qq/ChangeLog	Sat Dec 27 09:32:38 2008 +0000
+++ b/libpurple/protocols/qq/ChangeLog	Sat Dec 27 09:37:08 2008 +0000
@@ -1,3 +1,10 @@
+2008.12.25 - flos <lonicerae(at)gmail.com>
+	* References #7821
+	* Updated authors
+
+2008.12.17 - flos <lonicerae(at)gmail.com>
+	* Minor fixed in buddy_info.c
+
 2008.12.06 - flos <lonicerae(at)gmail.com>
 	* Removed version checking script in Makefiles since our developers all migrated to monotone
 	* Use our development revision as OPENQ_VERSION in qq.c
diff -r 955bfda56492 -r 38fbc2e3c646 libpurple/protocols/qq/buddy_info.c
--- a/libpurple/protocols/qq/buddy_info.c	Sat Dec 27 09:32:38 2008 +0000
+++ b/libpurple/protocols/qq/buddy_info.c	Sat Dec 27 09:37:08 2008 +0000
@@ -790,7 +790,7 @@
 		bytes += qq_get32(&onlineTime, data + bytes);
 		bytes += qq_get16(&level, data + bytes);
 		bytes += qq_get16(&timeRemainder, data + bytes);
-		purple_debug_info("QQ", "level: %d, uid %d, tmOnline: %d, tmRemainder: %d\n",
+		purple_debug_info("QQ", "level: %d, uid %u, tmOnline: %d, tmRemainder: %d\n",
 				level, uid, onlineTime, timeRemainder);
 
 		bd = qq_buddy_data_find(gc, uid);
@@ -825,12 +825,12 @@
 	bytes += qq_get32(&onlineTime, data + bytes);
 	bytes += qq_get16(&level, data + bytes);
 	bytes += qq_get16(&timeRemainder, data + bytes);
-	purple_debug_info("QQ", "level: %d, uid %d, tmOnline: %d, tmRemainder: %d\n",
+	purple_debug_info("QQ", "level: %d, uid %u, tmOnline: %d, tmRemainder: %d\n",
 			level, uid, onlineTime, timeRemainder);
 
 	bd = qq_buddy_data_find(gc, uid);
 	if (bd == NULL) {
-		purple_debug_error("QQ", "Got levels of %d not in my buddy list\n", uid);
+		purple_debug_error("QQ", "Got levels of %u not in my buddy list\n", uid);
 		return;
 	}
 
diff -r 955bfda56492 -r 38fbc2e3c646 libpurple/protocols/qq/qq.c
--- a/libpurple/protocols/qq/qq.c	Sat Dec 27 09:32:38 2008 +0000
+++ b/libpurple/protocols/qq/qq.c	Sat Dec 27 09:37:08 2008 +0000
@@ -626,7 +626,7 @@
 	g_string_append(info, "puzzlebird<br>\n");
 	g_string_append(info, "<br>\n");
 	g_string_append(info, _("<p><b>Code Contributors</b>:<br>\n"));
-	g_string_append(info, "gfhuang : patches for libpurple 2.0.0beta2, maintainer<br>\n");
+	g_string_append(info, "gfhuang(poppyer) : patches for libpurple 2.0.0beta2, maintainer<br>\n");
 	g_string_append(info, "Yuan Qingyun : patches for libpurple 1.5.0, maintainer<br>\n");
 	g_string_append(info, "henryouly : file transfer, udp sock5 proxy and qq_show, maintainer<br>\n");
 	g_string_append(info, "hzhr : maintainer<br>\n");
diff -r 955bfda56492 -r 38fbc2e3c646 libpurple/protocols/qq/qq_network.c
--- a/libpurple/protocols/qq/qq_network.c	Sat Dec 27 09:32:38 2008 +0000
+++ b/libpurple/protocols/qq/qq_network.c	Sat Dec 27 09:37:08 2008 +0000
@@ -468,7 +468,7 @@
 
 static void udp_pending(gpointer data, gint source, PurpleInputCondition cond)
 {
-	PurpleConnection *gc = (PurpleConnection *) data;
+	PurpleConnection *gc = NULL;
 	qq_data *qd;
 	guint8 *buf;
 	gint buf_len;