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

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdelibs/kdecore/network
From:       Thiago Macieira <thiago () kde ! org>
Date:       2005-04-08 12:01:10
Message-ID: 20050408120110.8A3DA494 () office ! kde ! org
[Download RAW message or body]

CVS commit by thiago: 

Backporting to KDE 3.3.x as well.
BACKPORT:1.34:1.35


  M +3 -10     kresolvermanager.cpp   1.28.2.4


--- kdelibs/kdecore/network/kresolvermanager.cpp  #1.28.2.3:1.28.2.4
@@ -363,11 +363,5 @@ void KResolverManager::releaseData(KReso
   if (data->obj)
     {
-      if (data->nRequests > 0)
-        // PostProcessing means "we're done with our blocking stuff, but we're waiting
-        // for some child request to finish"
         data->obj->status = KResolver::PostProcessing;  
-      else
-        // this may change after post-processing
-        data->obj->status = data->worker->results.isEmpty() ? KResolver::Failed : KResolver::Success;
     }
       
@@ -434,5 +428,5 @@ bool KResolverManager::handleFinishedIte
       // this one has finished
       if (curr->obj)
-        curr->obj->status = KResolver::Success; // this may change after the post-processing
+        curr->obj->status = KResolver::PostProcessing; // post-processing is run in doNotifying()
 
       if (curr->requestor)
@@ -481,6 +475,5 @@ KResolverWorkerBase* KResolverManager::f
           // good, this one says it can process
           if (worker->m_finished)          
-            p->status = !worker->results.isEmpty() ?
-              KResolver::Success : KResolver::Failed;
+            p->status = KResolver::PostProcessing;
           else
             p->status = KResolver::Queued;


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