| author | ulf69 <ulf69> | 2004-08-20 19:53:52 (UTC) |
|---|---|---|
| committer | ulf69 <ulf69> | 2004-08-20 19:53:52 (UTC) |
| commit | a3083042bb9c69193cc43105e6c9d045bd79e8b2 (patch) (side-by-side diff) | |
| tree | 6d89eb16d0661b03316117aca6f919339ef5df1d /kabc/plugins/file | |
| parent | b42c4af4200c67802ee0cc57e10e1464903736b7 (diff) | |
| download | kdepimpi-a3083042bb9c69193cc43105e6c9d045bd79e8b2.zip kdepimpi-a3083042bb9c69193cc43105e6c9d045bd79e8b2.tar.gz kdepimpi-a3083042bb9c69193cc43105e6c9d045bd79e8b2.tar.bz2 | |
merged bugfix from KDE Head: Don't KDirWatch for own changes
| -rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index da2e4d7..fa6bc49 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp @@ -203,9 +203,9 @@ bool ResourceFile::load() } bool ResourceFile::save( Ticket *ticket ) { -// qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1()); +// qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1()); // create backup file QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() ); @@ -224,8 +224,10 @@ bool ResourceFile::save( Ticket *ticket ) } */ //US ToDo: write backupfile + mDirWatch.stopScan(); + QFile info; info.setName( mFileName ); bool ok = info.open( IO_WriteOnly ); if ( ok ) { @@ -240,15 +242,14 @@ bool ResourceFile::save( Ticket *ticket ) if ( !ok ) addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) ); + mDirWatch.startScan(); + delete ticket; unlock( mFileName ); return ok; - - qDebug("ResourceFile::save has to be changed"); - return true; } bool ResourceFile::lock( const QString &fileName ) { |