2 files changed, 6 insertions, 43 deletions

diff --git a/kabc/plugins/opie/resourceopie.cpp b/kabc/plugins/opie/resourceopie.cpp
index 5559827..9dfd473 100644
--- a/kabc/plugins/opie/resourceopie.cpp
+++ b/kabc/plugins/opie/resourceopie.cpp
@@ -58,64 +58,65 @@ $Id$
 
 using namespace KABC;
 extern "C"
 {
   void *init_microkabc_opie()
   {
     return new KRES::PluginFactory<ResourceOpie,ResourceOpieConfig, SyncPrefWidget>();
   }
 }
 
 ResourceOpie::ResourceOpie( const KConfig *config, bool syncable )
   : Resource( config, syncable ), mAccess(0), mConverter (0)
 {
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
 
   KConfig *cfg = (KConfig *)config;
   if ( cfg ) {
     fileName = cfg->readEntry( "FileName", fileName );
 
   }
 
   init( fileName );
 }
 
 ResourceOpie::ResourceOpie( const QString &fileName, bool syncable  )
   : Resource( 0, syncable )
 {
   init( fileName );
 }
 
 void ResourceOpie::init( const QString &fileName )
 {
+  qDebug("ResourceOpie::init()");
 
   connect( &mDirWatch, SIGNAL( dirty(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( created(const QString&) ), SLOT( fileChanged() ) );
   connect( &mDirWatch, SIGNAL( deleted(const QString&) ), SLOT( fileChanged() ) );
 
   setFileName( fileName );
 }
 
 ResourceOpie::~ResourceOpie()
 {
   if (mConverter != 0)
     delete mConverter;
 
   if(mAccess != 0)
     delete mAccess;
 }
 
 void ResourceOpie::writeConfig( KConfig *config )
 {
   Resource::writeConfig( config );
 
   config->writeEntry( "FileName", fileName() );
 }
 
 Ticket *ResourceOpie::requestSaveTicket()
 {
   kdDebug(5700) << "ResourceOpie::requestSaveTicket()" << endl;
 
   qDebug("ResourceOpie::requestSaveTicket: %s", fileName().latin1());
 
   if ( !addressBook() ) return 0;
 
@@ -225,65 +226,69 @@ bool ResourceOpie::save( Ticket *ticket )
       res = mAccess->add(c);
       if (res == false)
         qDebug("Unable to append Contact %s", c.fullName().latin1());
     }
     else
     {
       qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1());
     }
   }
 
   mAccess->save();
 
   delete ticket;
   unlock( fileName() );
 
   return true;
 
 }
 
 bool ResourceOpie::lock( const QString &lockfileName )
 {
   qDebug("ResourceOpie::lock: %s", fileName().latin1());
 
   kdDebug(5700) << "ResourceOpie::lock()" << endl;
 
   QString fn = lockfileName;
 
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
   kdDebug(5700) << "-- lock name: " << lockName << endl;
 
-  if (QFile::exists( lockName )) return false;
+  if (QFile::exists( lockName ))
+  {
+    qDebug("ResourceOpie::lock: lockfile %s already exists. (Delete it before continuing if nobody else is accessing the resourcefile %s)", lockName.latin1(), fileName().latin1());
+    return false;
+  }
 
   QString lockUniqueName;
   lockUniqueName = fn + KApplication::randomString( 8 );
 
   url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
   QFile file( mLockUniqueName );
   file.open( IO_WriteOnly );
   file.close();
 
   // Create lock file
   int result = 0;
 #ifndef _WIN32_
   result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
 #endif
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
     return true;
   }
 
   // TODO: check stat
 
   return false;
 }
 
 void ResourceOpie::unlock( const QString &fileName )
 {
@@ -311,65 +316,33 @@ void ResourceOpie::setFileName( const QString &newFileName )
 }
 
 
 void ResourceOpie::fileChanged()
 {
   // There is a small theoretical chance that KDirWatch calls us before
   // we are fully constructed
   if (!addressBook())
     return;
 
   QString text( i18n( "Opie resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( fileName() ) );
   if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
     load();
     addressBook()->emitAddressBookChanged();
   }
 
   load();
   addressBook()->emitAddressBookChanged();
 }
 
 void ResourceOpie::removeAddressee( const Addressee &addr )
 {
 }
 
 void ResourceOpie::cleanUp()
 {
 //  qDebug("ResourceOpie::cleanup() %s", mFileName.latin1());
 
   unlock( fileName() );
 }
 
 
-/**
- * This method returns the number of elements that are currently in the resource.
- */
-int ResourceOpie::count() const
-{
-  qDebug("ResourceOpie::count: %x", mAccess);
-
-  if (mAccess != 0)
-  {
-    OContactAccess::List contactList = mAccess->allRecords();
-    return contactList.count();
-  }
-  else
-    return 0;
-}
-
-
-/**
- * This method removes all elements from the resource!! (Not from the addressbook)
- */
-bool ResourceOpie::clear()
-{
-  if (mAccess != 0) {
-    mAccess->clear();
-    return true;
-  }
-  else
-	return false;
-}
-
-
-
 //US #include "resourceopie.moc"
diff --git a/kabc/plugins/opie/resourceopie.h b/kabc/plugins/opie/resourceopie.h
index ca30fee..d5b4ebd 100644
--- a/kabc/plugins/opie/resourceopie.h
+++ b/kabc/plugins/opie/resourceopie.h
@@ -93,64 +93,54 @@ public:
   /**
    * Loads all addressees from file to the address book.
    * Returns true if all addressees could be loaded otherwise false.
    */
   virtual bool load();
 
   /**
    * Saves all addresses from address book to file.
    * Returns true if all addressees could be saved otherwise false.
    *
    * @param ticket  The ticket returned by @ref requestSaveTicket()
    */
   virtual bool save( Ticket *ticket );
 
 
   /**
    * Remove a addressee from its source.
    * This method is mainly called by KABC::AddressBook.
    */
   virtual void removeAddressee( const Addressee& addr );
 
   /**
    * Set name of file to be used for saving.
    */
   virtual void setFileName( const QString & );
 
   /**
    * This method is called by an error handler if the application
    * crashed
    */
   virtual void cleanUp();
 
-  /**
-   * This method returns the number of elements that are currently in the resource.
-   */
-  virtual int count() const;
-
-  /**
-   * This method removes all elements from the resource!! (Not from the addressbook)
-   */
-  virtual bool clear();
-
 
 protected slots:
   void fileChanged();
 
 protected:
   void init( const QString &fileName );
 
   bool lock( const QString &fileName );
   void unlock( const QString &fileName );
 
 private:
   OContactAccess* mAccess;
   OpieConverter* mConverter;
 
   QString mLockUniqueName;
 
   KDirWatch mDirWatch;
 };
 
 }
 
 #endif