1 files changed, 33 insertions, 9 deletions

diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 48a9f22..935a1cf 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -52,6 +52,8 @@ $Id$
 #include "syncprefwidget.h"
 
 #include "resourceqtopia.h"
+#include <libkdepim/ksyncprofile.h>
+#include <qpe/quuid.h>
 
 using namespace KABC;
 extern "C"
@@ -197,19 +199,41 @@ bool ResourceQtopia::save( Ticket *ticket )
   bool res;
 
   for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
-    PimContact c;
-    KABC::Addressee addressee = (*it);
-
+        //KABC::Addressee addressee = (*it);
+        if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
+            QUuid uid( (*it).originalExternalUID() );
+            bool ok;
+            PimContact c = mAccess->contactForId( uid, &ok );
     res = mConverter->addresseeToQtopia( *it, c );
-    if (res == true)
-    {
+            if (res == true) {
+                if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_ADDED_EXTERNAL ) {
       mAccess->addContact(c);
-//      if (res == false)
-//        qDebug("Unable to append Contact %s", c.fullName().latin1());
+                    KABC::Addressee addressee;
+                    mConverter->qtopiaToAddressee( c, addressee );
+                    addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
+                    addressBook()->insertAddressee( addressee );
+
+                } else if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE ) {
+                    if (  ok ) 
+                        mAccess->removeContact(c);
+                    else
+                        qDebug("Error revoe contact from qtopia ");
+                } else if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
+                    if (  ok ) {
+                        mAccess->updateContact(c);
+                        KABC::Addressee addressee;
+                        mConverter->qtopiaToAddressee( c, addressee );
+                        addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM );
+                        addressBook()->insertAddressee( addressee );
     }
     else
-    {
-      qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1());
+                        qDebug("Error update contact from qtopia ");
+                        
+                }
+       
+            }  else {
+                qDebug("Unable to convert Addressee %s", (*it).formattedName().latin1());
+            }
     }
   }