ab sync fixes

1 files changed, 28 insertions, 3 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index bfcfab5..18b4d58 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -191,16 +191,17 @@ ulong  Addressee::getCsum4List( const QStringList &  attList)
             for ( k = 0; k < j; ++k ) {
                 int mul = k +1;
                 add = s[k].unicode ();
                 if ( k < 16 )
                     mul = mul * mul;
                 int ii = i+1;
                 add = add * mul *ii*ii*ii;
                 cSum += add;
+                //qDebug("csum: %d %d %d", i,k,cSum); 
             }
         }
             
     }
     //QString dump = attList.join(",");
     //qDebug("csum: %d %s", cSum,dump.latin1()); 
     
     return cSum;
@@ -223,19 +224,42 @@ void Addressee::computeCsum(const QString &dev)
     if ( mData->geo.isValid() ) l.append( mData->geo.asString() );
     if ( !mData->title .isEmpty() ) l.append( mData->title );
     if ( !mData->role.isEmpty() ) l.append( mData->role );
     if ( !mData->organization.isEmpty() ) l.append( mData->organization ); 
     if ( !mData->note.isEmpty() ) l.append( mData->note ); 
     if ( !mData->productId.isEmpty() ) l.append(mData->productId ); 
     if ( !mData->sortString.isEmpty() ) l.append( mData->sortString ); 
     if ( mData->secrecy.isValid() ) l.append( mData->secrecy.asString()); 
-    // if ( !mData->logo.isEmpty() ) l.append(  ); 
-    //if ( !mData->photo.isEmpty() ) l.append(  );
-    //if ( !mData->sound.isEmpty() ) l.append(  );
+    if ( !mData->logo.undefined() ) { 
+        if ( !mData->logo.isIntern() )
+            l.append( mData->logo.url() );
+        else
+            l.append( QString::number(mData->logo.data().width()* mData->logo.data().height()));
+    } else {
+        l.append( "nologo");
+    }
+    if ( !mData->photo.undefined() ) { 
+        if ( !mData->photo.isIntern() )
+            l.append( mData->photo.url() );
+        else
+            l.append( QString::number(mData->photo.data().width()* mData->photo.data().height()));
+    } else {
+        l.append( "nophoto");
+    }
+#if 0
+    if ( !mData->sound.undefined() ) { 
+        if ( !mData->sound.isIntern() )
+            l.append( mData->sound.url() );
+        else
+            l.append( QString(mData->sound.data().with()* mData->sound.data().height()));
+    } else {
+        l.append( "nosound");
+    }
+#endif
     //if ( !mData->agent.isEmpty() ) l.append(  ); 
     if (  mData->url.isValid() )
         if ( ! mData->url.path().isEmpty()) l.append( mData->url.path()  ); 
     KABC::PhoneNumber::List phoneNumbers;
     KABC::PhoneNumber::List::Iterator phoneIter;
 
     QStringList t;
     for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
@@ -273,16 +297,17 @@ void Addressee::computeCsum(const QString &dev)
     }
     uint cs = getCsum4List(l);
 
 #if 0
     for ( iii = 0; iii < l.count(); ++iii)
         qDebug("%d***%s***",iii,l[iii].latin1());
     qDebug("CSUM computed %d %s %s", cs,QString::number (cs ).latin1(), uid().latin1() );
 #endif
+
     
     setCsum( dev, QString::number (cs ));
 }
 
 void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false)
 {
     // merge all standard non-outlook fields. 
     //if isSubSet (e.g. mobile phone sync) merge all fields