1 files changed, 6 insertions, 24 deletions

diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
index 14f272d..70c3718 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
@@ -228,49 +228,54 @@ bool ResourceSharpDTM::save( Ticket *ticket )
 
   }
 
 //US  mAccess->save();
 
   delete ticket;
   unlock( fileName() );
 
   return true;
 }
 
 bool ResourceSharpDTM::lock( const QString &lockfileName )
 {
   qDebug("ResourceSharpDTM::lock: %s", fileName().latin1());
 
   kdDebug(5700) << "ResourceSharpDTM::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("ResourceSharpDTM::lock: lockfile %s already exists. (Delete it before continuing if nobody else is accessing the resourcefile %s)", lockName.latin1(), fileName());
+    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;
   }
@@ -307,49 +312,26 @@ void ResourceSharpDTM::setFileName( const QString &newFileName )
 
 void ResourceSharpDTM::fileChanged()
 {
   // There is a small theoretical chance that KDirWatch calls us before
   // we are fully constructed
   if (!addressBook())
     return;
 
   QString text( i18n( "Sharp DTM 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();
   }
 }
 
 void ResourceSharpDTM::removeAddressee( const Addressee &addr )
 {
 }
 
 void ResourceSharpDTM::cleanUp()
 {
   unlock( fileName() );
 }
 
-/**
- * This method returns the number of elements that are currently in the resource.
- */
-int ResourceSharpDTM::count() const
-{
-  if (mAccess != 0)
-	return mAccess->count();
-  else
-    return 0;
-}
-
-
-/**
- * This method removes all elements from the resource!! (Not from the addressbook)
- */
-bool ResourceSharpDTM::clear()
-{
-  if (mAccess != 0)
-    return mAccess->deleteCard(0, SlZDataBase::AllCard );
-  else
-	return false;
-}
-