2 files changed, 4 insertions, 3 deletions

diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index f17f366..a14ae20 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -1,229 +1,230 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qdir.h>
 #include "resource.h"
 #include <kresources/manager.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstaticdeleter.h>
 #include <kstandarddirs.h>
 
 #include "stdaddressbook.h"
 
 using namespace KABC;
 
 StdAddressBook *StdAddressBook::mSelf = 0;
 bool StdAddressBook::mAutomaticSave = false;
 
 static KStaticDeleter<StdAddressBook> addressBookDeleter;
 
 QString StdAddressBook::fileName()
 {
   return locateLocal( "data", "kabc/std.vcf" );
 }
 
 QString StdAddressBook::directoryName()
 {
   return locateLocal( "data", "kabc/stdvcf" );
 }
 
 void StdAddressBook::handleCrash()
 {
   StdAddressBook::self()->cleanUp();
 }
 
 StdAddressBook *StdAddressBook::self()
 {
 
   if ( !mSelf )
   {
       QString appdir = StdAddressBook::setTempAppDir();
 // US im am not sure why I have to use the other format here??
 #ifdef KAB_EMBEDDED
     mSelf = addressBookDeleter.setObject( new StdAddressBook );
 #else //KAB_EMBEDDED
     addressBookDeleter.setObject( mSelf, new StdAddressBook );
 #endif //KAB_EMBEDDED
     KStandardDirs::setAppDir( appdir );
   }
 
   return mSelf;
 }
 
 QString StdAddressBook::setTempAppDir()
 {
     QString appDIR = KStandardDirs::appDir();
 #ifdef DESKTOP_VERSION
     QString appdir = QDir::homeDirPath();
       if ( appdir.right(1) == "\\" ||   appdir.right(1) == "/" )
           appdir += "kaddressbook/";
       else
           appdir += "/kaddressbook/";
       KStandardDirs::setAppDir( QDir::convertSeparators( appdir ));
 #else
       QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook";
 
       KStandardDirs::setAppDir( appdir );
 #endif
 
     return appDIR;
 }
 StdAddressBook *StdAddressBook::self( bool onlyFastResources )
 {
 
    if ( !mSelf )
   {
       QString appdir =StdAddressBook::setTempAppDir();
 #ifdef KAB_EMBEDDED
     mSelf = addressBookDeleter.setObject( new StdAddressBook( onlyFastResources ) );
 #else //KAB_EMBEDDED
     addressBookDeleter.setObject( mSelf, new StdAddressBook( onlyFastResources ) );
 #endif //KAB_EMBEDDED
     KStandardDirs::setAppDir( appdir );
   }
   return mSelf;
 }
 
 StdAddressBook::StdAddressBook()
   : AddressBook( "kabcrc" )
 {
 
-  init( false );
+    //init( false );
 }
 
 StdAddressBook::StdAddressBook( bool onlyFastResources )
   : AddressBook( "kabcrc" )
 {
 
-  init( onlyFastResources );
+    if ( onlyFastResources )
+        init( onlyFastResources );
 }
 
 StdAddressBook::~StdAddressBook()
 {
   if ( mAutomaticSave )
     save();
 }
 
 void StdAddressBook::init( bool )
 {
   KRES::Manager<Resource> *manager = resourceManager();
   KRES::Manager<Resource>::ActiveIterator it;
 
   for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
     (*it)->setAddressBook( this );
     if ( !(*it)->open() )
       error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) );
   }
 
   Resource *res = standardResource();
   if ( !res ) {
     res = manager->createResource( "file" );
     if ( res )
     {
       addResource( res );
     }
     else
         qDebug(" No resource available!!!");
   }
 
   setStandardResource( res );
   manager->writeConfig();
 
   load();
 }
 
 bool StdAddressBook::save()
 {
   kdDebug(5700) << "StdAddressBook::save()" << endl;
 
   bool ok = true;
   AddressBook *ab = self();
 
   ab->deleteRemovedAddressees();
   Iterator ait;
   for ( ait = ab->begin(); ait != ab->end(); ++ait ) {
       if ( !(*ait).IDStr().isEmpty() ) {
           (*ait).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*ait).IDStr() );
     }
   }
   KRES::Manager<Resource>::ActiveIterator it;
   KRES::Manager<Resource> *manager = ab->resourceManager();
   for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
     if ( !(*it)->readOnly() && (*it)->isOpen() ) {
       Ticket *ticket = ab->requestSaveTicket( *it );
 //        qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() );
       if ( !ticket ) {
         ab->error( i18n( "Unable to save to resource '%1'. It is locked." )
                    .arg( (*it)->resourceName() ) );
         return false;
       }
 
       if ( !ab->save( ticket ) )
         ok = false;
     }
   }
 
   return ok;
 }
 
 void StdAddressBook::close()
 {
 //US destructObject is not defined on my system???. Is setObject(0) the same ???
 //US  addressBookDeleter.destructObject();
   addressBookDeleter.setObject(0);
 
 }
 
 void StdAddressBook::setAutomaticSave( bool enable )
 {
   mAutomaticSave = enable;
 }
 
 bool StdAddressBook::automaticSave()
 {
   return mAutomaticSave;
 }
 
 // should get const for 4.X
 Addressee StdAddressBook::whoAmI()
 {
 //US  KConfig config( "kabcrc" );
   KConfig config( locateLocal("config", "kabcrc") );
   config.setGroup( "General" );
 
   return findByUid( config.readEntry( "WhoAmI" ) );
 }
 
 void StdAddressBook::setWhoAmI( const Addressee &addr )
 {
 //US  KConfig config( "kabcrc" );
   KConfig config( locateLocal("config", "kabcrc") );
   config.setGroup( "General" );
 
   config.writeEntry( "WhoAmI", addr.uid() );
 }
diff --git a/kabc/stdaddressbook.h b/kabc/stdaddressbook.h
index 9ec53b0..cf130b3 100644
--- a/kabc/stdaddressbook.h
+++ b/kabc/stdaddressbook.h
@@ -1,151 +1,151 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KABC_STDADDRESSBOOK_H
 #define KABC_STDADDRESSBOOK_H
 
 #include "addressbook.h"
 
 namespace KABC {
 
 /**
   Standard KDE address book
  
   This class provides access to the standard KDE address book shared by all
   applications.
  
   It's implemented as a singleton. Use @ref self() to get the address book
   object. On the first self() call the address book also gets loaded.
   
   Example:
  
   <pre>
   KABC::AddressBook *ab = KABC::StdAddressBook::self();
  
   KABC::AddressBook::Iterator it;
   for ( it = ab->begin(); it != ab->end(); ++it ) {
     kdDebug() << "UID=" << (*it).uid() << endl;
  
     // do some other stuff
   }
  
   KABC::StdAddressBook::save();
   </pre>
 */
 class StdAddressBook : public AddressBook
 {
   public:
 
     /**
       Destructor.
      */
     ~StdAddressBook();
 
     /**
       Return the standard addressbook object. It also loads slow resources.
       It is the same as self(false); .
     */
     static StdAddressBook *self();
 
     /**
       This is the same as above, but with specified
       behaviour of resource loading.
 
       @param onlyFastResource Only resources marked as 'fast' should be loaded
     */
     // FIXME for KDE4 return StdAddressBook and merge with the metod above -zecke
     static StdAddressBook *self( bool onlyFastResources );
 
     /**
       Save the standard address book to disk.
     */
     static bool save();
 
     /**
       Call this method in your crash handler to allow the library clean up
       possible locks.
      */
     static void handleCrash();
 
     /**
       Returns the default file name for vcard-based addressbook
     */
     static QString fileName();
 
     /**
       Returns the default directory name for vcard-based addressbook
     */
     static QString directoryName();
     
     /**
       Set the automatic save property of the address book.
       If @p enable is TRUE (default) the address book is saved at
       destruction time otherwise you have to call @ref save() to
       explicitely save it.
      */
     static void setAutomaticSave( bool enable );
 
     /**
       Closes the address book. Depending on @ref automaticSave() it will
       save the address book first.
     */
     static void close();
 
     /**
       Returns whether the address book is saved at destruction time.
       See also @ref setAutomaticSave().
      */
     static bool automaticSave();
 
     /**
       Returns the contact, that is associated with the owner of the
       address book. This contact should be used by other programs
       to access user specific data.
      */
     Addressee whoAmI();
 
     /**
       Sets the users contact. See @ref whoAmI() for more information.
 
       @param uid The uid of the users contact.
      */
     void setWhoAmI( const Addressee &addr );
+    void init( bool onlyFastResources );
 
   protected:
     StdAddressBook();
     StdAddressBook( bool onlyFastResources );
 
-    void init( bool onlyFastResources );
 
   private:
     static  QString setTempAppDir();
     static StdAddressBook *mSelf;
     static bool mAutomaticSave;
 };
 
 }
 #endif