# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1190334753 0
# Node ID a37166aa49cabac76dc628d4672424df09417cfb
# Parent  85aab870a4c4f8defcff7098f563870e9b8fac20# Parent  ab3c87375b17ecd6cd119fd1fad42af7209da115
merge of '9e0721e5a46030c85511ed392b2b09c068e5ed27'
     and 'ab014bb16c8cc1dd52eed1d90e131babc2a6e593'

diff -r 85aab870a4c4 -r a37166aa49ca libpurple/protocols/jabber/buddy.c
--- 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;
 			}
 		}