pidgin: 41a1868c: Reapplied changes that were overwritten ...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 41a1868cc2c6fd36a606953c6efa42e902b575d6
Ancestor: 6b89b377381e35b459936fd2f730f45b5558ae69
Author: datallah at pidgin.im
Date: 2008-08-10T18:46:32
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/41a1868cc2c6fd36a606953c6efa42e902b575d6

Modified files:
        libpurple/protocols/qq/Makefile.mingw
        libpurple/protocols/qq/packet_parse.h
        libpurple/protocols/qq/qq.c
        libpurple/protocols/qq/qq_process.c

ChangeLog: 

Reapplied changes that were overwritten by 6b89b377381e35b459936fd2f730f45b5558ae69.

applied changes from efb1c5e4382251975a52808c1719727741faa0b0
             through 6329172d268ccd358600cfb60786c20dc36e60df

applied changes from 2747d5e0324ca6b81e83bbb8b75e1efebcbbad6e
             through 692ff1164b0a492ba7179904281356966cc81ede

applied changes from 692ff1164b0a492ba7179904281356966cc81ede
             through 0a1aca4e9483db7ba81ae564efdd2a81e3a813e8

applied changes from 0a1aca4e9483db7ba81ae564efdd2a81e3a813e8
             through efb1c5e4382251975a52808c1719727741faa0b0

-------------- next part --------------
============================================================
--- libpurple/protocols/qq/Makefile.mingw	b552726dd7a32b1039c146293b39fbba60bda1d1
+++ libpurple/protocols/qq/Makefile.mingw	191eb1afcc761822b86b98cd9ab3f1fb7ded2a34
@@ -57,13 +57,13 @@ C_SRC = \
 	group_search.c \
 	header_info.c \
 	im.c \
-	qq_process.c \
-	qq_base.c \
 	packet_parse.c \
 	qq.c \
+	qq_base.c \
 	qq_network.c \
-	send_file.c \
+	qq_process.c \
 	qq_trans.c \
+	send_file.c \
 	sys_msg.c \
 	utils.c
 
============================================================
--- libpurple/protocols/qq/packet_parse.h	90c1324d256d6a85ad0baf0f7aa577c52dae4234
+++ libpurple/protocols/qq/packet_parse.h	2a60f02107e0c4e04f2c8186e1adf8f0466b36e9
@@ -37,7 +37,11 @@
  */
 #define MAX_PACKET_SIZE 65535
 
+#ifndef _WIN32
 #include <netinet/in.h>
+#else
+#include "win32dep.h"
+#endif
 
 gint qq_get8(guint8 *b, guint8 *buf);
 gint qq_get16(guint16 *w, guint8 *buf);
============================================================
--- libpurple/protocols/qq/qq.c	e34e81013f55c32cb9d3ce1dc596d88c8ef356aa
+++ libpurple/protocols/qq/qq.c	c1ad87252bd96d8470a6d1768d68e67eb034416a
@@ -688,8 +688,8 @@ static gchar *_qq_get_chat_buddy_real_na
 	return chat_name_to_purple_name(who);
 }
 
-PurplePlugin *my_protocol = NULL;
-static PurplePluginProtocolInfo prpl_info	= {
+static PurplePluginProtocolInfo prpl_info =
+{
 	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_USE_POINTSIZE,
 	NULL,							/* user_splits	*/
 	NULL,							/* protocol_options */
@@ -752,11 +752,11 @@ static PurplePluginProtocolInfo prpl_inf
 	NULL,							/* PurpleWhiteboardPrplOps */
 	NULL,							/* send_raw */
 	NULL,							/* roomlist_room_serialize */
+	NULL,							/* unregister_user */
+	NULL,							/* send_attention */
+	NULL,							/* get attention_types */
 
-	/* padding */
-	NULL,
-	NULL,
-	NULL,
+	sizeof(PurplePluginProtocolInfo), /* struct_size */
 	NULL
 };
 
@@ -819,8 +819,6 @@ static void init_plugin(PurplePlugin *pl
 	option = purple_account_option_int_new(_("Update interval(s)"), "update_interval", 300);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
-	my_protocol = plugin;
-
 	purple_prefs_add_none("/plugins/prpl/qq");
 	purple_prefs_add_bool("/plugins/prpl/qq/show_status_by_icon", TRUE);
 	purple_prefs_add_bool("/plugins/prpl/qq/show_fake_video", FALSE);
============================================================
--- libpurple/protocols/qq/qq_process.c	888aabf106970c4e995a155900b5655529807776
+++ libpurple/protocols/qq/qq_process.c	9dfd5fbbb3544fd5b8f71905085661c643d1a563
@@ -366,7 +366,6 @@ void qq_proc_cmd_reply(PurpleConnection 
 	guint8 *data;
 	gint data_len;
 
-	gboolean ret_bool = FALSE;
 	guint8 ret_8 = 0;
 	guint16 ret_16 = 0;
 	guint32 ret_32 = 0;