[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/kopete
From:       Aleix Pol Gonzalez <aleixpol () gmail ! com>
Date:       2009-12-02 23:51:01
Message-ID: 1259797861.465729.19777.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1057630 by apol:

Remove redundant information.


 M  +8 -4      systemtray.cpp  
 M  +1 -2      systemtray.h  


--- trunk/KDE/kdenetwork/kopete/kopete/systemtray.cpp #1057629:1057630
@@ -54,7 +54,6 @@
 	setStatus(Active);
 
 	mIsBlinkIcon = false;
-	mIsBlinking = false;
 	mBlinkTimer = new QTimer(this);
 	mBlinkTimer->setObjectName("mBlinkTimer");
 
@@ -129,7 +128,6 @@
 		mBlinkTimer->stop();
 	}
 	mIsBlinkIcon = true;
-	mIsBlinking = true;
 	mBlinkTimer->setSingleShot( false );
 	mBlinkTimer->start( 1000 );
 }
@@ -147,7 +145,6 @@
 		mBlinkTimer->stop();
 
 	mIsBlinkIcon = false;
-	mIsBlinking = false;
 	//setPixmap( mKopeteIcon );
 	slotReevaluateAccountStates();
 }
@@ -194,7 +191,7 @@
 {
 	// If there is a pending message, we don't need to refresh the system tray now.
 	// This function will even be called when the animation will stop.
-	if ( mIsBlinking )
+	if ( mBlinkTimer->isActive() )
 		return;
 
 	Kopete::OnlineStatus highestStatus;
@@ -239,5 +236,12 @@
 	}
 }
 
+
+bool KopeteSystemTray::isBlinking() const
+{
+	return mBlinkTimer->isActive() || (status() == NeedsAttention);
+}
+
+
 #include "systemtray.moc"
 // vim: set noet ts=4 sts=4 sw=4:
--- trunk/KDE/kdenetwork/kopete/kopete/systemtray.h #1057629:1057630
@@ -50,7 +50,7 @@
 	void startBlink();
 
 	void stopBlink();
-	bool isBlinking() const { return mIsBlinking || (status() == NeedsAttention); }
+	bool isBlinking() const;
 
 Q_SIGNALS:
 	void aboutToShowMenu(KMenu *am);
@@ -73,7 +73,6 @@
 	QString mBlinkIcon;
 
 	bool mIsBlinkIcon;
-	bool mIsBlinking;
 
 	static KopeteSystemTray* s_systemTray;
 
[prev in list] [next in list] [prev in thread] [next in thread]