From 576a35fdd4143e66f7afcc64ef3f4da0e9e3c47a 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 --- extensions/irc/xul/content/static.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extensions/irc/xul/content/static.js b/extensions/irc/xul/content/static.js index 52f16d383e17..0ed0b8f7bdec 100644 --- a/extensions/irc/xul/content/static.js +++ b/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) &&