# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1211871081 0
# Node ID 903fb6879521a18fcc2bc619b7faff990d753dbb
# Parent  ff29208e03efe944b0b012e7cc4cf67184a6abfb
Broken merge.

diff -r ff29208e03ef -r 903fb6879521 libpurple/protocols/irc/irc.c
--- a/libpurple/protocols/irc/irc.c	Tue May 27 06:27:46 2008 +0000
+++ b/libpurple/protocols/irc/irc.c	Tue May 27 06:51:21 2008 +0000
@@ -908,7 +908,7 @@
 	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 */
 };
diff -r ff29208e03ef -r 903fb6879521 libpurple/protocols/jabber/buddy.c
--- a/libpurple/protocols/jabber/buddy.c	Tue May 27 06:27:46 2008 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Tue May 27 06:51:21 2008 +0000
@@ -960,7 +960,7 @@
 		}
 #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;
diff -r ff29208e03ef -r 903fb6879521 libpurple/protocols/zephyr/zephyr.c
--- a/libpurple/protocols/zephyr/zephyr.c	Tue May 27 06:27:46 2008 +0000
+++ b/libpurple/protocols/zephyr/zephyr.c	Tue May 27 06:51:21 2008 +0000
@@ -2915,7 +2915,7 @@
 	NULL,
 	NULL,
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
-        sizeof(PurplePluginProtocolInfo),
+	NULL,					/* get_account_text_table */
 	NULL,					/* initate_media */
 	NULL					/* can_do_media */
 };