1 files changed, 14 insertions, 2 deletions

diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index fa6bc49..17263ae 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -50,12 +50,13 @@ $Id$
 #include "resourcefileconfig.h"
 #include "stdaddressbook.h"
 
 #include "resourcefile.h"
 #include "syncprefwidget.h"
 
+//#define ALLOW_LOCKING
 
 using namespace KABC;
 
 extern "C"
 #ifdef _WIN32_
 __declspec(dllexport)
@@ -144,17 +145,18 @@ void ResourceFile::writeConfig( KConfig *config )
 Ticket *ResourceFile::requestSaveTicket()
 {
   kdDebug(5700) << "ResourceFile::requestSaveTicket()" << endl;
 
   if ( !addressBook() ) return 0;
 
+#ifdef ALLOW_LOCKING
   if ( !lock( mFileName ) ) {
-    kdDebug(5700) << "ResourceFile::requestSaveTicket(): Unable to lock file '"
-                  << mFileName << "'" << endl;
+      qDebug("unablt to lock file ");
     return 0;
   }
+#endif
   return createTicket( this );
 }
 
 
 bool ResourceFile::doOpen()
 {
@@ -243,19 +245,22 @@ bool ResourceFile::save( Ticket *ticket )
   if ( !ok )
     addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
 
   mDirWatch.startScan();
 
   delete ticket;
+#ifdef ALLOW_LOCKING
   unlock( mFileName );
+#endif
 
   return ok;
 }
 
 bool ResourceFile::lock( const QString &fileName )
 {
+#ifdef ALLOW_LOCKING
 
 
   QString fn = fileName;
 
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp("/"), "_" );
@@ -292,27 +297,34 @@ bool ResourceFile::lock( const QString &fileName )
     return true;
   }
 
   // TODO: check stat
 
   return false;
+#else
+  return true;
+#endif
 }
 
 void ResourceFile::unlock( const QString &fileName )
 {
+#ifdef ALLOW_LOCKING
   QString fn = fileName;
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp( "/" ), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
 //US  QString lockName = fn + ".lock";
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
   QFile::remove( lockName );
   QFile::remove( mLockUniqueName );
   addressBook()->emitAddressBookUnlocked();
+#else
+  return;
+#endif
 }
 
 void ResourceFile::setFileName( const QString &fileName )
 {
   mDirWatch.stopScan();
   mDirWatch.removeFile( mFileName );