# HG changeset patch # User Marcus Lundblad # Date 1269204897 0 # Node ID d6af24bcf107f48e22d469546b1f13cc0d9ceed1 # Parent 885ceb384678276a583eb29caf2cc950ecc1afcf# Parent 2b52480439ee617d9c3e75c15b9d26b363b270b9 propagate from branch 'im.pidgin.pidgin' (head 60a434545c6f61fc0f20206c0d4eb87a9fb8de11) to branch 'im.pidgin.cpw.malu.ft_thumbnails' (head 2a51bdaacb5ceb722c6bd9d85fc59172ed338072) diff -r 885ceb384678 -r d6af24bcf107 libpurple/protocols/jabber/data.c --- 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 */