Mercurial > pidgin.yaz
changeset 25658:903fb6879521
Broken merge.
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Tue, 27 May 2008 06:51:21 +0000 |
| parents | ff29208e03ef |
| children | 7d2e5f57dbca |
| files | libpurple/protocols/irc/irc.c libpurple/protocols/jabber/buddy.c libpurple/protocols/zephyr/zephyr.c |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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 */ };
--- 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;
--- 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 */ };