Mercurial > pidgin
changeset 20585:a37166aa49ca
merge of '9e0721e5a46030c85511ed392b2b09c068e5ed27'
and 'ab014bb16c8cc1dd52eed1d90e131babc2a6e593'
author | Nathan Walp <nwalp@pidgin.im> |
---|---|
date | Fri, 21 Sep 2007 00:32:33 +0000 |
parents | 85aab870a4c4 (current diff) ab3c87375b17 (diff) |
children | 04590d9db8b7 |
files | libpurple/protocols/msn/msn-utils.c libpurple/protocols/msn/msn-utils.h |
diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/buddy.c Thu Sep 20 19:28:55 2007 +0000 +++ b/libpurple/protocols/jabber/buddy.c Fri Sep 21 00:32:33 2007 +0000 @@ -1656,8 +1656,10 @@ if(!strcmp(ns, "jabber:iq:last")) { if(!strcmp(jbr->client.name, "Trillian")) { - if(!strcmp(jbr->client.version, "3.1.0.121")) { - /* verified by nwalp 2007/05/09 */ + /* verified by nwalp 2007/05/09 */ + if(!strcmp(jbr->client.version, "3.1.0.121") || + /* verified by nwalp 2007/09/19 */ + !strcmp(jbr->client.version, "3.1.7.0")) { return TRUE; } }