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

List:       kde-commits
Subject:    KDE/kdepim/kresources/slox
From:       Volker Krause <volker.krause () rwth-aachen ! de>
Date:       2005-09-24 9:11:19
Message-ID: 1127553079.076514.25976.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 463478 by vkrause:

Forward port commit 463477:

Fix 'summary view disables [SL]OX resources'.



 M  +2 -2      kabcresourceslox.cpp  
 M  +2 -3      kcalresourceslox.cpp  


--- trunk/KDE/kdepim/kresources/slox/kabcresourceslox.cpp #463477:463478
@@ -173,9 +173,9 @@
   kdDebug() << "KABC::ResourceSlox::asyncLoad()" << endl;
 
   if ( mDownloadJob ) {
-    kdWarning() << "KABC::ResourceSlox::asyncLoad(): Loading still in progress."
+    kdDebug() << "KABC::ResourceSlox::asyncLoad(): Loading still in progress."
                 << endl;
-    return false;
+    return true;
   }
 
   loadCache();
--- trunk/KDE/kdepim/kresources/slox/kcalresourceslox.cpp #463477:463478
@@ -153,10 +153,9 @@
   kdDebug() << "KCalResourceSlox::load() " << long( this ) << endl;
 
   if ( mLoadEventsJob || mLoadTodosJob ) {
-    kdWarning() << "KCalResourceSlox::load(): download still in progress."
+    kdDebug() << "KCalResourceSlox::load(): download still in progress."
                 << endl;
-    loadError( "Download still in progress." );
-    return false;
+    return true;
   }
   if ( mUploadJob ) {
     kdWarning() << "KCalResourceSlox::load(): upload still in progress."
[prev in list] [next in list] [prev in thread] [next in thread]