# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1200419776 0
# Node ID 8243222c8c1bd4a50dc1a14d4b8a7ddc4c6f4996
# Parent  bdfe6c71c153e69bf534e469c31371b8d61f61b6# Parent  651ab2001da296f383c5994582aee5df767ae2a2
merge of '59861e303c2e7d7bfe9c10a06497b1aaa47d6588'
     and '74122e66cd2ced071a030e5c2b33b64622b2fead'

diff -r bdfe6c71c153 -r 8243222c8c1b libpurple/protocols/oscar/libaim.c
--- a/libpurple/protocols/oscar/libaim.c	Tue Jan 15 17:43:31 2008 +0000
+++ b/libpurple/protocols/oscar/libaim.c	Tue Jan 15 17:56:16 2008 +0000
@@ -92,11 +92,11 @@
 	NULL,					/* whiteboard_prpl_ops */
 	NULL,					/* send_raw */
 	NULL,					/* roomlist_room_serialize */
+	NULL,					/* unregister_user */
+	NULL,					/* send_attention */
+	NULL,					/* get_attention_types */
 
 	/* padding */
-	NULL,
-	NULL,
-	NULL,
 	NULL
 };
 
diff -r bdfe6c71c153 -r 8243222c8c1b libpurple/protocols/oscar/libicq.c
--- a/libpurple/protocols/oscar/libicq.c	Tue Jan 15 17:43:31 2008 +0000
+++ b/libpurple/protocols/oscar/libicq.c	Tue Jan 15 17:56:16 2008 +0000
@@ -92,11 +92,11 @@
 	NULL,					/* whiteboard_prpl_ops */
 	NULL,					/* send_raw */
 	NULL,					/* roomlist_room_serialize */
+	NULL,					/* unregister_user */
+	NULL,					/* send_attention */
+	NULL,					/* get_attention_types */
 
 	/* padding */
-	NULL,
-	NULL,
-	NULL,
 	NULL
 };