3 files changed, 27 insertions, 4 deletions

diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index a14ae20..43d9fde 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -56,6 +56,23 @@ void StdAddressBook::handleCrash()
 {
   StdAddressBook::self()->cleanUp();
 }
+StdAddressBook *StdAddressBook::selfNoLoad()
+{
+
+  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 ( QString() ) );
+#else //KAB_EMBEDDED
+    addressBookDeleter.setObject( mSelf, new StdAddressBook( QString() ) );
+#endif //KAB_EMBEDDED
+    KStandardDirs::setAppDir( appdir );
+  }
+
+  return mSelf;
+}
 
 StdAddressBook *StdAddressBook::self()
 {
@@ -108,20 +125,24 @@ StdAddressBook *StdAddressBook::self( bool onlyFastResources )
   }
   return mSelf;
 }
+StdAddressBook::StdAddressBook( QString )
+  : AddressBook( "kabcrc" )
+{
+
+}
 
 StdAddressBook::StdAddressBook()
   : AddressBook( "kabcrc" )
 {
 
-    //init( false );
+    init( false );
 }
 
 StdAddressBook::StdAddressBook( bool onlyFastResources )
   : AddressBook( "kabcrc" )
 {
 
-    if ( onlyFastResources )
-        init( onlyFastResources );
+    init( onlyFastResources );
 }
 
 StdAddressBook::~StdAddressBook()
diff --git a/kabc/stdaddressbook.h b/kabc/stdaddressbook.h
index cf130b3..3cd6363 100644
--- a/kabc/stdaddressbook.h
+++ b/kabc/stdaddressbook.h
@@ -70,6 +70,7 @@ class StdAddressBook : public AddressBook
       It is the same as self(false); .
     */
     static StdAddressBook *self();
+    static StdAddressBook *selfNoLoad();
 
     /**
       This is the same as above, but with specified
@@ -138,6 +139,7 @@ class StdAddressBook : public AddressBook
 
   protected:
     StdAddressBook();
+    StdAddressBook( QString );
     StdAddressBook( bool onlyFastResources );
 
 
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index c670b1f..77321aa 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -303,7 +303,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
     mMiniSplitter = 0;
   mExtensionBarSplitter = 0;
   mIsPart = !parent->inherits( "KAddressBookMain" );
-  mAddressBook = KABC::StdAddressBook::self();
+  mAddressBook = KABC::StdAddressBook::selfNoLoad();
   KABC::StdAddressBook::setAutomaticSave( false );
 
 #ifndef KAB_EMBEDDED