From kde-commits Wed Aug 18 18:38:08 2010 From: Teemu Rytilahti Date: Wed, 18 Aug 2010 18:38:08 +0000 To: kde-commits Subject: branches/KDE/4.5/kdenetwork/kopete/kopete/chatwindow Message-Id: <20100818183808.AF0F5AC857 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=128215655006557 SVN commit 1165283 by rytilahti: backport r1156102: Don't show joins&quits in chatwindow, if user has decided not to show events CCBUG:109822 M +2 -2 chatview.cpp --- branches/KDE/4.5/kdenetwork/kopete/kopete/chatwindow/chatview.cpp #1165282:1165283 @@ -543,7 +543,7 @@ this, SLOT( slotPropertyChanged( Kopete::PropertyContainer *, const QString &, const QVariant &, const QVariant & ) ) ) ; } - if( !suppress && m_manager->members().count() > 1 ) { + if( !suppress && Kopete::BehaviorSettings::self()->showEvents() && m_manager->members().count() > 1 ) { QString contactName = m_messagePart->formatName(contact, Qt::PlainText); sendInternalMessage( i18n("%1 has joined the chat.", contactName) ); } @@ -588,7 +588,7 @@ } } - if ( !suppressNotification ) + if ( !suppressNotification && Kopete::BehaviorSettings::self()->showEvents() ) { QString contactName = m_messagePart->formatName(contact, Qt::PlainText); if ( reason.isEmpty() )