pidgin.vv: 94430045: Broken merge.

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 9443004596a4fc55992da8548ef5b438de22c8ef
Ancestor: 66434b339e8f91c0da82a155b8571ab91794aee9
Author: sadrul at pidgin.im
Date: 2008-05-27T06:51:21
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/9443004596a4fc55992da8548ef5b438de22c8ef

Modified files:
        libpurple/protocols/irc/irc.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/zephyr/zephyr.c

ChangeLog: 

Broken merge.

-------------- next part --------------
============================================================
--- libpurple/protocols/irc/irc.c	caa001cc37b1b3de73f710ad016a94e946436ee8
+++ libpurple/protocols/irc/irc.c	1b1dc9fb75249d5ee2c6d7ffbbf5fef426a55961
@@ -908,7 +908,7 @@ static PurplePluginProtocolInfo prpl_inf
 	NULL,                   /* send_attention */
 	NULL,                   /* get_attention_types */
 	sizeof(PurplePluginProtocolInfo),    /* struct_size */
-	NULL                     /* get_account_text_table */
+	NULL,                    /* get_account_text_table */
 	NULL,                    /* initiate_media */
 	NULL					 /* can_do_media */
 };
============================================================
--- libpurple/protocols/jabber/buddy.c	47e8c5add1251475fca7ba0ae4319da6a0b38e62
+++ libpurple/protocols/jabber/buddy.c	8e94a0b20a3d76b0e62ba906767bd357ab6f66a4
@@ -960,7 +960,7 @@ static void jabber_buddy_info_show_if_re
 		}
 #endif
 	} else {
-		gboolean multiple_resources = jbi->jb->resources && (g_hash_table_size(jbi->jb->resources) > 1);
+		gboolean multiple_resources = jbi->resources && (g_hash_table_size(jbi->resources) > 1);
 
 		for(resources = jbi->jb->resources; resources; resources = resources->next) {
 			char *purdy = NULL;
============================================================
--- libpurple/protocols/zephyr/zephyr.c	28fa2376cf347c99c5534834f6707b259433b148
+++ libpurple/protocols/zephyr/zephyr.c	2984a2c3065c3e8239eb624f18a96a5c66b26a47
@@ -2915,7 +2915,7 @@ static PurplePluginProtocolInfo prpl_inf
 	NULL,
 	NULL,
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
-        sizeof(PurplePluginProtocolInfo),
+	NULL,					/* get_account_text_table */
 	NULL,					/* initate_media */
 	NULL					/* can_do_media */
 };