# HG changeset patch
# User SHiNE CsyFeK <csyfek@gmail.com>
# Date 1230296457 0
# Node ID b74fa0d31c74350aac72657601391d71f7d8d548
# Parent  0d7c21b5f1d7d2ef749ff5818824031d3c51ec64
2008.12.25 - flos <lonicerae(at)gmail.com>
	* References #7821
	* Updated authors

diff -r 0d7c21b5f1d7 -r b74fa0d31c74 libpurple/protocols/qq/AUTHORS
--- a/libpurple/protocols/qq/AUTHORS	Thu Dec 25 14:06:10 2008 +0000
+++ b/libpurple/protocols/qq/AUTHORS	Fri Dec 26 13:00:57 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 0d7c21b5f1d7 -r b74fa0d31c74 libpurple/protocols/qq/ChangeLog
--- a/libpurple/protocols/qq/ChangeLog	Thu Dec 25 14:06:10 2008 +0000
+++ b/libpurple/protocols/qq/ChangeLog	Fri Dec 26 13:00:57 2008 +0000
@@ -1,3 +1,7 @@
+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
 
diff -r 0d7c21b5f1d7 -r b74fa0d31c74 libpurple/protocols/qq/qq.c
--- a/libpurple/protocols/qq/qq.c	Thu Dec 25 14:06:10 2008 +0000
+++ b/libpurple/protocols/qq/qq.c	Fri Dec 26 13:00:57 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 0d7c21b5f1d7 -r b74fa0d31c74 libpurple/protocols/qq/qq_network.c
--- a/libpurple/protocols/qq/qq_network.c	Thu Dec 25 14:06:10 2008 +0000
+++ b/libpurple/protocols/qq/qq_network.c	Fri Dec 26 13:00:57 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;