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

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdepim/kaddressbook/features
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2004-08-19 9:46:18
Message-ID: 20040819094618.6030B999B () office ! kde ! org
[Download RAW message or body]

CVS commit by tokoe: 

Backport of better resource handling, it also prevents crashes


  M +10 -4     resourceselection.cpp   1.4.2.1


--- kdepim/kaddressbook/features/resourceselection.cpp  #1.4:1.4.2.1
@@ -140,5 +140,5 @@ void ResourceSelection::add()
   if ( dlg.exec() ) {
     core()->addressBook()->addResource( resource );
-    core()->addressBook()->asyncLoad();
+    resource->asyncLoad();
 
     mLastResource = resource->identifier();
@@ -160,5 +160,5 @@ void ResourceSelection::edit()
   if ( dlg.exec() ) {
     mManager->change( item->resource() );
-    core()->addressBook()->asyncLoad();
+    item->resource()->asyncLoad();
 
     mLastResource = item->resource()->identifier();
@@ -183,5 +183,5 @@ void ResourceSelection::remove()
 
   core()->addressBook()->removeResource( item->resource() );
-  core()->addressBook()->asyncLoad();
+  core()->addressBook()->emitAddressBookChanged();
 
   updateView();
@@ -206,5 +206,11 @@ void ResourceSelection::currentChanged( 
 
     mManager->change( resource );
-    core()->addressBook()->asyncLoad();
+
+    if ( resItem->checked() ) {
+      if ( !resource->isOpen() )
+        resource->open();
+
+      resource->asyncLoad();
+    }
 
     mLastResource = resource->identifier();


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