Mercurial > pidgin.yaz
changeset 30241:d6af24bcf107
propagate from branch 'im.pidgin.pidgin' (head 60a434545c6f61fc0f20206c0d4eb87a9fb8de11)
to branch 'im.pidgin.cpw.malu.ft_thumbnails' (head 2a51bdaacb5ceb722c6bd9d85fc59172ed338072)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sun, 21 Mar 2010 20:54:57 +0000 |
parents | 885ceb384678 (current diff) 2b52480439ee (diff) |
children | 93f6a5d48a46 |
files | libpurple/protocols/jabber/data.c |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/data.c Sun Mar 21 19:44:45 2010 +0000 +++ b/libpurple/protocols/jabber/data.c Sun Mar 21 20:54:57 2010 +0000 @@ -209,7 +209,7 @@ JabberData *data = jabber_data_create_from_xml(data_element); if (data) { - if (ephemeral) { + if (!ephemeral) { jabber_data_associate_remote(data); } /* TODO: validate hash */