summaryrefslogtreecommitdiffabout
path: root/kabc/plugins/file
authorulf69 <ulf69>2004-08-20 19:53:52 (UTC)
committer ulf69 <ulf69>2004-08-20 19:53:52 (UTC)
commita3083042bb9c69193cc43105e6c9d045bd79e8b2 (patch) (side-by-side diff)
tree6d89eb16d0661b03316117aca6f919339ef5df1d /kabc/plugins/file
parentb42c4af4200c67802ee0cc57e10e1464903736b7 (diff)
downloadkdepimpi-a3083042bb9c69193cc43105e6c9d045bd79e8b2.zip
kdepimpi-a3083042bb9c69193cc43105e6c9d045bd79e8b2.tar.gz
kdepimpi-a3083042bb9c69193cc43105e6c9d045bd79e8b2.tar.bz2
merged bugfix from KDE Head: Don't KDirWatch for own changes
Diffstat (limited to 'kabc/plugins/file') (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/plugins/file/resourcefile.cpp9
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
@@ -205,5 +205,5 @@ 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());
@@ -226,4 +226,6 @@ bool ResourceFile::save( Ticket *ticket )
//US ToDo: write backupfile
+ mDirWatch.stopScan();
+
QFile info;
info.setName( mFileName );
@@ -242,11 +244,10 @@ bool ResourceFile::save( Ticket *ticket )
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;
}