pidgin, im.pidgin.pidgin.openq: 50438051: 2008.12.25 - flos <lonicerae(at)gmail.co...

[csyfek at gmail.com]

-----------------------------------------------------------------
Revision: 5043805100d2fa5a371317e802d6a191c89ddaeb
Ancestor: 9d5beddd055b1bcb9ca8b1abba49528d48d5fde5
Author: csyfek at gmail.com
Date: 2008-12-26T13:00:57
Branch: im.pidgin.pidgin
Branch: im.pidgin.pidgin.openq
URL: http://d.pidgin.im/viewmtn/revision/info/5043805100d2fa5a371317e802d6a191c89ddaeb

Modified files:
        libpurple/protocols/qq/AUTHORS
        libpurple/protocols/qq/ChangeLog libpurple/protocols/qq/qq.c
        libpurple/protocols/qq/qq_network.c

ChangeLog: 

2008.12.25 - flos <lonicerae(at)gmail.com>
	* References #7821
	* Updated authors

-------------- next part --------------
============================================================
--- libpurple/protocols/qq/AUTHORS	6a3222a92b8698e76280969bc637bb36c73b0c0e
+++ libpurple/protocols/qq/AUTHORS	1c0fbf253bcc1a0adfe2c135b1b7d47d63d85b7f
@@ -1,7 +1,7 @@ puzzlebird	: original author
 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
============================================================
--- libpurple/protocols/qq/ChangeLog	a12aa24bfa17cae6a858b4c1fdb5027ebbe244a9
+++ libpurple/protocols/qq/ChangeLog	3dc460c9b93da32aeb0382388599876b2c5572a8
@@ -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
 
============================================================
--- libpurple/protocols/qq/qq.c	d0fc3aed883e2dc261fc8daaa67c5eed86f21a6f
+++ libpurple/protocols/qq/qq.c	ea9c72516a5d6e8f7ce6e70319ac1fbfc72d05e0
@@ -626,7 +626,7 @@ static void action_about_openq(PurplePlu
 	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");
============================================================
--- libpurple/protocols/qq/qq_network.c	239a1120df4db5c71119f0f12fef5aa49b34c611
+++ libpurple/protocols/qq/qq_network.c	8257f51bfa1d6db8e0878b23bd9f25122b2e9c32
@@ -468,7 +468,7 @@ static void udp_pending(gpointer data, g
 
 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;