From kde-commits Sat Dec 31 23:37:58 2005 From: Jakub Stachowski Date: Sat, 31 Dec 2005 23:37:58 +0000 To: kde-commits Subject: KDE/kdenetwork/kopete/kopete Message-Id: <1136072278.479539.15890.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=113607229904347 SVN commit 492997 by qbast: Fix systray animated icon M +8 -4 systemtray.cpp --- trunk/KDE/kdenetwork/kopete/kopete/systemtray.cpp #492996:492997 @@ -101,6 +101,7 @@ // kdDebug(14010) << "[KopeteSystemTray] ~KopeteSystemTray" << endl; // delete mBlinkTimer; Kopete::UI::Global::setSysTrayWId( 0 ); + delete mMovie; } void KopeteSystemTray::mousePressEvent( QMouseEvent *me ) @@ -162,7 +163,8 @@ void KopeteSystemTray::startBlink( QMovie *movie ) { //kdDebug( 14010 ) << k_funcinfo << "starting movie." << endl; - const_cast( movie )->unpause(); + kdDebug( 14010 ) << "Movie is " << movie->loopCount() << " loops, " << movie->frameCount() << " frames " << endl; + movie->unpause(); setMovie( movie ); mIsBlinking = true; } @@ -170,8 +172,10 @@ void KopeteSystemTray::startBlink() { if ( !mMovie ) - mMovie = new QMovie(KGlobal::iconLoader()->loadMovie( QString::fromLatin1( "newmessage" ), KIcon::Panel )); - + mMovie = KGlobal::iconLoader()->loadMovie( QString::fromLatin1( "newmessage" ), KIcon::Panel ); + // KIconLoader already checked isValid() + if ( !mMovie) return; + startBlink( mMovie ); } @@ -182,7 +186,7 @@ else if ( mBlinkTimer->isActive() ) mBlinkTimer->stop(); - if ( !mMovie->isValid() ) + if ( mMovie ) mMovie->pause(); mIsBlinkIcon = false;