Mercurial > pidgin.yaz
changeset 24914:c07b0aa88a35
Paul noticed that the conditional blocks here were backwards. I'm surprised no
one seems to have noticed this before now.
References #7974
committer: Etan Reisner <pidgin@unreliablesource.net>
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Wed, 07 Jan 2009 04:12:11 +0000 |
| parents | 7bc52fed6fdb |
| children | 1e121a3eceeb |
| files | libpurple/protocols/jabber/buddy.c |
| diffstat | 1 files changed, 19 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/buddy.c Wed Jan 07 03:31:23 2009 +0000 +++ b/libpurple/protocols/jabber/buddy.c Wed Jan 07 04:12:11 2009 +0000 @@ -578,32 +578,30 @@ jabber_pep_publish((JabberStream*)gc->proto_data, publish); g_free(hash); - } else { /* if(img) */ - /* remove the metadata */ - xmlnode *metadata, *item; - xmlnode *publish = xmlnode_new("publish"); - xmlnode_set_attrib(publish,"node",AVATARNAMESPACEMETA); - - item = xmlnode_new_child(publish, "item"); - - metadata = xmlnode_new_child(item, "metadata"); - xmlnode_set_namespace(metadata,AVATARNAMESPACEMETA); - - xmlnode_new_child(metadata, "stop"); - - /* publish the metadata */ - jabber_pep_publish((JabberStream*)gc->proto_data, publish); + } else { + purple_debug_error("jabber", "jabber_set_buddy_icon received non-png data"); } } else { - purple_debug(PURPLE_DEBUG_ERROR, "jabber", - "jabber_set_buddy_icon received non-png data"); + /* remove the metadata */ + xmlnode *metadata, *item; + xmlnode *publish = xmlnode_new("publish"); + xmlnode_set_attrib(publish,"node",AVATARNAMESPACEMETA); + + item = xmlnode_new_child(publish, "item"); + + metadata = xmlnode_new_child(item, "metadata"); + xmlnode_set_namespace(metadata,AVATARNAMESPACEMETA); + + xmlnode_new_child(metadata, "stop"); + + /* publish the metadata */ + jabber_pep_publish((JabberStream*)gc->proto_data, publish); } } - /* even when the image is not png, we can still publish the vCard, since this - one doesn't require a specific image type */ - - /* publish vCard for those poor older clients */ + /* vCard avatars do not have an image type requirement so update our + * vCard avatar regardless of image type for those poor older clients + */ jabber_set_info(gc, purple_account_get_user_info(gc->account)); gpresence = purple_account_get_presence(gc->account);