summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-08-20 19:53:52 (UTC)
committer ulf69 <ulf69>2004-08-20 19:53:52 (UTC)
commita3083042bb9c69193cc43105e6c9d045bd79e8b2 (patch) (unidiff)
tree6d89eb16d0661b03316117aca6f919339ef5df1d
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 (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/plugins/dir/resourcedir.cpp3
-rw-r--r--kabc/plugins/file/resourcefile.cpp9
-rw-r--r--kabc/plugins/opie/resourceopie.cpp4
-rw-r--r--kabc/plugins/qtopia/resourceqtopia.cpp3
-rw-r--r--kabc/plugins/sharpdtm/resourcesharpdtm.cpp2
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 )
212 212
213 mDirWatch.stopScan();
214
213 for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) { 215 for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
@@ -229,2 +231,3 @@ bool ResourceDir::save( Ticket *ticket )
229 } 231 }
232 mDirWatch.startScan();
230 233
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 )
206{ 206{
207// qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1()); 207// qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
208 208
@@ -227,2 +227,4 @@ bool ResourceFile::save( Ticket *ticket )
227//US ToDo: write backupfile 227//US ToDo: write backupfile
228 mDirWatch.stopScan();
229
228 QFile info; 230 QFile info;
@@ -243,2 +245,4 @@ bool ResourceFile::save( Ticket *ticket )
243 245
246 mDirWatch.startScan();
247
244 delete ticket; 248 delete ticket;
@@ -247,5 +251,2 @@ bool ResourceFile::save( Ticket *ticket )
247 return ok; 251 return ok;
248
249 qDebug("ResourceFile::save has to be changed");
250 return true;
251} 252}
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 )
213 213
214 214 mDirWatch.stopScan();
215 215
@@ -237,2 +237,4 @@ bool ResourceOpie::save( Ticket *ticket )
237 237
238 mDirWatch.startScan();
239
238 delete ticket; 240 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 )
193 193
194 mDirWatch.stopScan();
194 195
@@ -216,2 +217,4 @@ bool ResourceQtopia::save( Ticket *ticket )
216 217
218 mDirWatch.startScan();
219
217 delete ticket; 220 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 )
199 199
200 mDirWatch.stopScan();
200 201
@@ -232,2 +233,3 @@ bool ResourceSharpDTM::save( Ticket *ticket )
232 233
234 mDirWatch.startScan();
233 delete ticket; 235 delete ticket;