changeset 19712:eabc8a32b1e4

Fix up an apparently bad merge with the reserved fields here.
author Richard Laager <rlaager@wiktel.com>
date Mon, 10 Sep 2007 20:29:29 +0000
parents 437c320c8d29
children 43a8cd1f708c
files libpurple/protocols/myspace/myspace.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/myspace/myspace.c	Mon Sep 10 20:26:44 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Mon Sep 10 20:29:29 2007 +0000
@@ -2924,14 +2924,14 @@
 	NULL,              /* whiteboard_prpl_ops */
 	msim_send_really_raw,  /* send_raw */
 	NULL,                  /* roomlist_room_serialize */
+	NULL,                  /* unregister_user */
 #ifdef MSIM_USE_ATTENTION_API
 	msim_send_attention,   /* send_attention */
 	msim_attention_types,  /* attention_types */
 #else
-	NULL,               /* _purple_reserved1 */
 	NULL,               /* _purple_reserved2 */
+	NULL,               /* _purple_reserved3 */
 #endif
-	NULL,               /* _purple_reserved3 */
 	NULL                /* _purple_reserved4 */
 };