From 7e5223b444f4e5ae65e80824f51f36df537986bb Mon Sep 17 00:00:00 2001 From: ketmar Date: Sat, 28 Sep 2013 17:29:17 +0300 Subject: [PATCH] don't show popups from hidden contacts if hidden contacts are invisible (except of message popups) --- src/chatform.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/chatform.cpp b/src/chatform.cpp index 25df9c2..06c8e3a 100644 --- a/src/chatform.cpp +++ b/src/chatform.cpp @@ -546,6 +546,7 @@ void ChatForm::showPrivatePopup (const PsycEntity &from, const QString &msg, con PsycEntity place; PsycEntity fr(from); PsycContact *cc = findContact(from); + /*if (cc && cc->isHidden() && !toBoolOpt("/contactlist/showhidden", false)) return;*/ if (cc) fr.setVerbatim(cc->verbatim()); showPopup(place, fr, "private", fr.uni().toLower(), msg, action); } @@ -559,6 +560,7 @@ void ChatForm::showPublicPopup (const PsycEntity &place, const PsycEntity &from, if (!toBoolOpt("/notifications/message", true, place.uni())) return; PsycEntity plc(place); PsycContact *cc = findContact(place); + if (cc && cc->isHidden() && !toBoolOpt("/contactlist/showhidden", false)) return; if (cc) plc.setVerbatim(cc->verbatim()); PsycEntity fr(from); cc = findContact(from); @@ -579,6 +581,7 @@ void ChatForm::showStatusPopup (const PsycEntity &user) { //qDebug() << "showStatus:" << user.uni(); PsycEntity fr(user); PsycContact *cc = findContact(user); + if (cc && cc->isHidden() && !toBoolOpt("/contactlist/showhidden", false)) return; if (cc) fr.setVerbatim(cc->verbatim()); QString type("status"); -- 2.11.4.GIT