summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-28 12:14:23 (UTC)
committer zautrix <zautrix>2004-10-28 12:14:23 (UTC)
commit2a5dfaf6f91534043ab9baa172b077c5ccef63ae (patch) (side-by-side diff)
treead8a5a7dfb9c67707d255d97a063e006958b6796
parentaf21c3d45173ece8492850b8c2c5019e7c25d59c (diff)
downloadkdepimpi-2a5dfaf6f91534043ab9baa172b077c5ccef63ae.zip
kdepimpi-2a5dfaf6f91534043ab9baa172b077c5ccef63ae.tar.gz
kdepimpi-2a5dfaf6f91534043ab9baa172b077c5ccef63ae.tar.bz2
compile fixes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt4
-rw-r--r--kaddressbook/kabcore.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 41b3e45..c61a322 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -31,12 +31,16 @@ Please set "beam receive enabled",
if you want to receive data via IR.
Fixed bug in direct KDE<->KO/Pi sync for KO/Pi running
on Linux desktop.
Made in KA/Pi scrolling possible, if details view is selected.
+(The keyboard focus is set automatically to the search line)
+
+Fixed a bug in DMT sync, that a new entry in DTM was added
+on every sync to Kx/Pi.
********** VERSION 1.9.10 ************
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index c75b4bc..9ef97c9 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2732,13 +2732,13 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
if ( uid.left(19) == QString("last-syncAddressee-") )
skipIncidence = true;
if ( !skipIncidence ) {
inL = local->findByUid( uid );
if ( !inL.resource() || inL.resource()->includeInSync() ) {
inR = remote->findByUid( uid );
- if ( inR.isEmpty() ) { / no conflict ********** add or delete local
+ if ( inR.isEmpty() ) { // no conflict ********** add or delete local
if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) {
// pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
local->removeAddressee( inL );
++deletedAddresseeL;
} else {