1 files changed, 7 insertions, 2 deletions

diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 4854197..7475685 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -1,138 +1,139 @@
 /*
     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 <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 //US #include <qtimer.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
+#include <kmessagebox.h>
 
 #include <qpe/pim/addressbookaccess.h>
 
 
 #include "resourceqtopiaconfig.h"
 #include "stdaddressbook.h"
 
 #include "qtopiaconverter.h"
 
 #include "resourceqtopia.h"
 
 using namespace KABC;
 extern "C"
 {
   void *init_microkabc_qtopia()
   {
     return new KRES::PluginFactory<ResourceQtopia,ResourceQtopiaConfig>();
   }
 }
 
 ResourceQtopia::ResourceQtopia( const KConfig *config )
   : Resource( config ), mConverter (0)
 {
   // we can not choose the filename. Therefore use the default to display
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
   
   init( fileName );
 }
 
 ResourceQtopia::ResourceQtopia( const QString &fileName )
   : Resource( 0 )
 {
 //  qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
   init( fileName );
 }
 
 void ResourceQtopia::init( const QString &fileName )
 {
 
   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 );
 }
 
 ResourceQtopia::~ResourceQtopia()
 {
   if (mConverter != 0)
     delete mConverter;
 
 }
 
 void ResourceQtopia::writeConfig( KConfig *config )
 {
   Resource::writeConfig( config );
 }
 
 Ticket *ResourceQtopia::requestSaveTicket()
 {
   kdDebug(5700) << "ResourceQtopia::requestSaveTicket()" << endl;
 
   if ( !addressBook() ) return 0;
 
   if ( !lock( mFileName ) ) {
     kdDebug(5700) << "ResourceQtopia::requestSaveTicket(): Unable to lock file '"
                   << mFileName << "'" << endl;
     return 0;
   }
   return createTicket( this );
 }
 
 
 bool ResourceQtopia::doOpen()
 {
 /*US
   QFile file( mFileName );
 
   if ( !file.exists() ) {
     // try to create the file
     bool ok = file.open( IO_WriteOnly );
     if ( ok )
       file.close();
 
     return ok;
   } else {
     if ( !file.open( IO_ReadWrite ) )
       return false;
 
     if ( file.size() == 0 ) {
       file.close();
       return true;
     }
 
 //US    bool ok = mFormat->checkFormat( &file );
     bool ok = true;
@@ -242,110 +243,114 @@ bool ResourceQtopia::save( Ticket *ticket )
     addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
   
   delete ticket;
   unlock( mFileName );
   
   return ok;
 
   qDebug("ResourceQtopia::save has to be changed");
 */  
   return true;
 }
 
 bool ResourceQtopia::lock( const QString &fileName )
 {
   kdDebug(5700) << "ResourceQtopia::lock()" << endl;
 
   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" );
   
   KURL url(fn);  
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
   
   kdDebug(5700) << "-- lock name: " << lockName << endl;
 
   if (QFile::exists( lockName )) 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 = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
 
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
     return true;
   }
 
   // TODO: check stat
 
   return false;
 }
 
 void ResourceQtopia::unlock( const QString &fileName )
 {
   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();
 }
 
 void ResourceQtopia::setFileName( const QString &fileName )
 {
   mDirWatch.stopScan();
   mDirWatch.removeFile( mFileName );
   
   mFileName = fileName;
 
   mDirWatch.addFile( mFileName );
   mDirWatch.startScan();
 
 //US simulate KDirWatch event  
 //US  fileChanged();
 }
 
 QString ResourceQtopia::fileName() const
 {
   return mFileName;
 }
 
 void ResourceQtopia::fileChanged()
 {
   // There is a small theoretical chance that KDirWatch calls us before
   // we are fully constructed
   if (!addressBook())
     return;
-  load();
-  addressBook()->emitAddressBookChanged();
+  
+  QString text( i18n( "Qtopia resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mFileName ) );
+  if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
+    load();
+    addressBook()->emitAddressBookChanged();
+  }
 }
 
 void ResourceQtopia::removeAddressee( const Addressee &addr )
 {
 }
 
 void ResourceQtopia::cleanUp()
 {
   unlock( mFileName );
 }
 
 //US #include "resourceqtopia.moc"