changeset 23696:e16982ad923f

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
author Daniel Atallah <daniel.atallah@gmail.com>
date Sun, 10 Aug 2008 18:46:32 +0000
parents 5f454b975a99
children 80ce5ca985c2
files libpurple/protocols/qq/Makefile.mingw libpurple/protocols/qq/packet_parse.h libpurple/protocols/qq/qq.c libpurple/protocols/qq/qq_process.c
diffstat 4 files changed, 13 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/qq/Makefile.mingw	Sun Aug 10 04:32:14 2008 +0000
+++ b/libpurple/protocols/qq/Makefile.mingw	Sun Aug 10 18:46:32 2008 +0000
@@ -57,13 +57,13 @@
 	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 \
+	qq_process.c \
+	qq_trans.c \
 	send_file.c \
-	qq_trans.c \
 	sys_msg.c \
 	utils.c
 
--- a/libpurple/protocols/qq/packet_parse.h	Sun Aug 10 04:32:14 2008 +0000
+++ b/libpurple/protocols/qq/packet_parse.h	Sun Aug 10 18:46:32 2008 +0000
@@ -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);
--- a/libpurple/protocols/qq/qq.c	Sun Aug 10 04:32:14 2008 +0000
+++ b/libpurple/protocols/qq/qq.c	Sun Aug 10 18:46:32 2008 +0000
@@ -688,8 +688,8 @@
 	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 @@
 	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 @@
 	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);
--- a/libpurple/protocols/qq/qq_process.c	Sun Aug 10 04:32:14 2008 +0000
+++ b/libpurple/protocols/qq/qq_process.c	Sun Aug 10 18:46:32 2008 +0000
@@ -366,7 +366,6 @@
 	guint8 *data;
 	gint data_len;
 
-	gboolean ret_bool = FALSE;
 	guint8 ret_8 = 0;
 	guint16 ret_16 = 0;
 	guint32 ret_32 = 0;