From 6500d6ebb080f1de58fe676aa0a730d47fcf64f5 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Fri, 29 Oct 2004 09:03:54 +0000
Subject: sync fixes

---
(limited to 'kaddressbook')

diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 012780b..3397e06 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -1060,7 +1060,9 @@ void AddresseeEditorWidget::save()
     if ( !dirty() ) {
             return;
     }
-
+ 
+    mAddressee.setRevision( QDateTime::currentDateTime() ); 
+ 
   mAddressee.setRole( mRoleEdit->text() );
   mAddressee.setOrganization( mOrgEdit->text() );
   mAddressee.setUrl( KURL( mURLEdit->text() ) );
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 273d435..6e482b5 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2406,25 +2406,26 @@ int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, i
     if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
         bool remCh, locCh;
         remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) );
-       
-        //qDebug("loc %s  rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
+        qDebug("loc %s  rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
         locCh = ( localMod > mLastAddressbookSync );
         if ( !remCh && ! locCh ) {
-            //qDebug("both not changed ");
+            qDebug("both not changed ");
             lastSync = localMod.addDays(1);
             if ( mode <= SYNC_PREF_ASK )
                 return 0;
         } else {
             if ( locCh ) {
-                //qDebug("loc changed %s %s",  localMod.toString().latin1(), mLastAddressbookSync.toString().latin1());
+                qDebug("loc changed %s %s",  localMod.toString().latin1(), mLastAddressbookSync.toString().latin1());
                 lastSync = localMod.addDays( -1 );
                 if ( !remCh )
                     remoteMod =( lastSync.addDays( -1 ) );
             } else {
-                //qDebug(" not loc changed ");
+                qDebug(" not loc changed ");
                 lastSync = localMod.addDays( 1 );
-                if ( remCh )
+                if ( remCh ) {
+                    qDebug("rem changed ");
                     remoteMod =( lastSync.addDays( 1 ) );
+                }
                 
             }
         }
@@ -2436,15 +2437,13 @@ int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, i
                 return 0;
         
     }
-    // qDebug(" %d %d conflict on %s %s ", mode, full, local->summary().latin1(), remote->summary().latin1() );
-
-    //qDebug("%s %d  %s %d", local->lastModified().toString().latin1() , localMod, remote->lastModified().toString().latin1(), remoteMod);  
-    //qDebug("%d %d %d %d ", local->lastModified().time().second(), local->lastModified().time().msec(),  remote->lastModified().time().second(), remote->lastModified().time().msec() );
+    qDebug("%s %s --- %d %d", localMod.toString().latin1() , remoteMod.toString().latin1(), localMod.time().msec(), remoteMod.time().msec());  
+    qDebug("lastsync %s ", lastSync.toString().latin1()    );
     //full = true; //debug only
     if ( full ) {
         bool equ = ( (*local) == (*remote) );
         if ( equ ) {
-            //qDebug("equal ");
+            qDebug("equal ");
             if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                 local->setCsum( mCurrentSyncDevice, remote->getCsum(mCurrentSyncDevice) );
             }
@@ -2643,8 +2642,9 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                             if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                                 inR.setOriginalExternalUID( OidS );
                                 inR.setExternalUID( idS );
-                                if ( syncManager->syncWithDesktop() )
+                                if ( syncManager->syncWithDesktop() ) {
                                     inR.setIDStr("changed" );
+                                }
                                     //inR.insertCustom( "KADDRESSBOOK", "X-KDESYNC","changed" );
                             } else {
                                 inR.setIDStr( idS );
@@ -2746,6 +2746,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                         }
                     } else {
                         if ( inL.revision() < mLastAddressbookSync && mode != 4 ) {
+                            //qDebug("data %s ", inL.revision().toString().latin1());
                             // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
                             local->removeAddressee( inL );
                             ++deletedAddresseeL; 
--
cgit v0.9.0.2