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

List:       kde-commits
Subject:    KDE/kdepim/akonadi/resources/kabc
From:       Kevin Krammer <kevin.krammer () gmx ! at>
Date:       2008-08-28 9:42:32
Message-ID: 1219916552.324113.31240.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 853784 by krake:

Must not explicitly add resource to manager since AddressBook::addResource() does it \
as well. Fixing wrong if() block nesting


 M  +2 -2      kabcresource.cpp  


--- trunk/KDE/kdepim/akonadi/resources/kabc/kabcresource.cpp #853783:853784
@@ -123,7 +123,6 @@
 
   setResourcePointers( resource );
 
-  manager->add( resource );
   mBaseResource->setAddressBook( mAddressBook );
 
   manager->writeConfig( KGlobal::config().data() );
@@ -423,9 +422,10 @@
                     SIGNAL( signalSubresourceRemoved( KABC::ResourceABC*, const \
                QString&, const QString& ) ),
                     this, SLOT( subResourceRemoved( KABC::ResourceABC*, const \
QString&, const QString& ) ) );  
+    }
+
     if ( mBaseResource->isOpen() )
       mBaseResource->close();
-    }
   }
 }
 


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