| 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 | |
| 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/dir/resourcedir.cpp | 3 | ||||
| -rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 9 | ||||
| -rw-r--r-- | kabc/plugins/opie/resourceopie.cpp | 4 | ||||
| -rw-r--r-- | kabc/plugins/qtopia/resourceqtopia.cpp | 3 | ||||
| -rw-r--r-- | kabc/plugins/sharpdtm/resourcesharpdtm.cpp | 2 |
5 files changed, 16 insertions, 5 deletions
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp index eccd482..fac06a1 100644 --- a/kabc/plugins/dir/resourcedir.cpp +++ b/kabc/plugins/dir/resourcedir.cpp @@ -212,2 +212,4 @@ bool ResourceDir::save( Ticket *ticket ) + mDirWatch.stopScan(); + for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) { @@ -229,2 +231,3 @@ bool ResourceDir::save( Ticket *ticket ) } + mDirWatch.startScan(); 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 @@ -206,3 +206,3 @@ 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()); @@ -227,2 +227,4 @@ bool ResourceFile::save( Ticket *ticket ) //US ToDo: write backupfile + mDirWatch.stopScan(); + QFile info; @@ -243,2 +245,4 @@ bool ResourceFile::save( Ticket *ticket ) + mDirWatch.startScan(); + delete ticket; @@ -247,5 +251,2 @@ bool ResourceFile::save( Ticket *ticket ) return ok; - - qDebug("ResourceFile::save has to be changed"); - return true; } diff --git a/kabc/plugins/opie/resourceopie.cpp b/kabc/plugins/opie/resourceopie.cpp index 4b811e9..22237dc 100644 --- a/kabc/plugins/opie/resourceopie.cpp +++ b/kabc/plugins/opie/resourceopie.cpp @@ -213,3 +213,3 @@ bool ResourceOpie::save( Ticket *ticket ) - + mDirWatch.stopScan(); @@ -237,2 +237,4 @@ bool ResourceOpie::save( Ticket *ticket ) + mDirWatch.startScan(); + delete ticket; diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp index 93a4d33..48a9f22 100644 --- a/kabc/plugins/qtopia/resourceqtopia.cpp +++ b/kabc/plugins/qtopia/resourceqtopia.cpp @@ -193,2 +193,3 @@ bool ResourceQtopia::save( Ticket *ticket ) + mDirWatch.stopScan(); @@ -216,2 +217,4 @@ bool ResourceQtopia::save( Ticket *ticket ) + mDirWatch.startScan(); + delete ticket; diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp index b63df0c..8a795e9 100644 --- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp +++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp @@ -199,2 +199,3 @@ bool ResourceSharpDTM::save( Ticket *ticket ) + mDirWatch.stopScan(); @@ -232,2 +233,3 @@ bool ResourceSharpDTM::save( Ticket *ticket ) + mDirWatch.startScan(); delete ticket; |