# HG changeset patch
# User Andreas Monitzer <pidgin@monitzer.com>
# Date 1188284988 0
# Node ID ebe2d2e71223d2740ab585e9deea6d63ca9e6474
# Parent  c9de28101e6df285cf765e0b31841774ca16e04e
Fixed merge errors stemming from the fact that the main branch and my branch both added something to the prpl struct

diff -r c9de28101e6d -r ebe2d2e71223 libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c	Tue Aug 28 07:03:28 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Tue Aug 28 07:09:48 2007 +0000
@@ -2138,6 +2138,7 @@
 	NULL,					/* whiteboard_prpl_ops */
 	NULL,					/* send_raw */
 	NULL,					/* roomlist_room_serialize */
+	NULL,					/* unregister_user */
 
 #ifdef MSN_USE_ATTENTION_API
 	msn_send_attention,                     /* send_attention */
@@ -2147,7 +2148,6 @@
 	NULL,
 	NULL,
 #endif
-	NULL,
 	NULL
 };
 
diff -r c9de28101e6d -r ebe2d2e71223 libpurple/protocols/yahoo/yahoo.c
--- a/libpurple/protocols/yahoo/yahoo.c	Tue Aug 28 07:03:28 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Tue Aug 28 07:09:48 2007 +0000
@@ -4328,6 +4328,7 @@
 	&yahoo_whiteboard_prpl_ops,
 	NULL, /* send_raw */
 	NULL, /* roomlist_room_serialize */
+	NULL, /* unregister_user */
 
 #ifdef YAHOO_USE_ATTENTION_API
 	yahoo_send_attention,
@@ -4338,7 +4339,6 @@
 #endif
 
 	/* padding */
-	NULL,
 	NULL
 };
 
diff -r c9de28101e6d -r ebe2d2e71223 libpurple/prpl.h
--- a/libpurple/prpl.h	Tue Aug 28 07:03:28 2007 +0000
+++ b/libpurple/prpl.h	Tue Aug 28 07:09:48 2007 +0000
@@ -357,7 +357,7 @@
 	gboolean (*send_attention)(PurpleConnection *gc, const char *username, guint type);
 	GList *(*attention_types)(PurpleAccount *acct);
 
-	void (*_purple_reserved3)(void);
+	void (*_purple_reserved1)(void);
 };
 
 #define PURPLE_IS_PROTOCOL_PLUGIN(plugin) \