From 5355b8c6f9ac3cff5b577b76bb2c5ea5193301a1 Mon Sep 17 00:00:00 2001 From: "samuel%sieb.net" Date: Mon, 24 Oct 2005 22:03:02 +0000 Subject: [PATCH] Bug 134814 - Collapsing messages will collapse too much fix previous patch p=gijskruitbosch@gmail.com r=silver@warwickcompsoc.co.uk chatzilla only git-svn-id: svn://10.0.0.236/trunk@182918 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/irc/xul/content/static.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mozilla/extensions/irc/xul/content/static.js b/mozilla/extensions/irc/xul/content/static.js index 52f16d383e1..0ed0b8f7bde 100644 --- a/mozilla/extensions/irc/xul/content/static.js +++ b/mozilla/extensions/irc/xul/content/static.js @@ -3852,7 +3852,9 @@ function addHistory (source, obj, mergeData) // Does the motif collapse everything, regardless of type? // NOTE: the collapseActions pref can override this for actions - needSameType = !("collapsemore" in source.motifSettings); + needSameType = !(("motifSettings" in source) && + source.motifSettings && + ("collapsemore" in source.motifSettings)); } if (sameNick && sameDest && (haveSameType || !needSameType) &&