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

List:       kde-commits
Subject:    kdenetwork/kopete/kopete/contactlist
From:       Richard Smith <kde () metafoo ! co ! uk>
Date:       2004-06-14 1:53:12
Message-ID: 20040614015312.B873812660 () office ! kde ! org
[Download RAW message or body]

CVS commit by lilachaze: 

Hopefully this should make the shared timers reliable, and fix the hidden
contacts problem people have been having.


  M +8 -15     kopetelistviewitem.cpp   1.7


--- kdenetwork/kopete/kopete/contactlist/kopetelistviewitem.cpp  #1.6:1.7
@@ -577,21 +577,14 @@ public:
         {
                 connect( this, SIGNAL(timeout()), target, slot );
-        }
-        void detach( QObject *target, const char *slot )
-        {
-                disconnect( this, SIGNAL(timeout()), target, slot );
-        }
-protected:
-        void connectNotify( const char *signal )
-        {
-                if( signal == SIGNAL(timeout()) )
                         if( users++ == 0 )
                                 start( period );
+                //kdDebug(14000) << "SharedTimer::attach: users is now " << users << "\n";
         }
-        void disconnectNotify( const char *signal )
+        void detach( QObject *target, const char *slot )
         {
-                if( signal == SIGNAL(timeout()) )
+                disconnect( this, SIGNAL(timeout()), target, slot );
                         if( --users == 0 )
                                 stop();
+                //kdDebug(14000) << "SharedTimer::detach: users is now " << users << "\n";
         }
 };
@@ -745,10 +738,10 @@ void Item::slotLayoutItems()
         }
 
-        if ( Private::animateChanges && d->animateLayout )
+        if ( Private::animateChanges && d->animateLayout && !d->visibilityTimer.isActive() )
         {
                 d->layoutAnimateTimer.start();
                 //if ( !d->layoutAnimateTimer.isActive() )
                 //      d->layoutAnimateTimer.start( 10 );
-                d->layoutAnimateSteps = -1;
+                d->layoutAnimateSteps = 0;
         }
         else


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