ab sync fixes

4 files changed, 36 insertions, 5 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index bfcfab5..18b4d58 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -198,2 +198,3 @@ ulong  Addressee::getCsum4List( const QStringList &  attList)
                 cSum += add;
+                //qDebug("csum: %d %d %d", i,k,cSum); 
             }
@@ -230,5 +231,28 @@ void Addressee::computeCsum(const QString &dev)
     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(  ); 
@@ -281,2 +305,3 @@ void Addressee::computeCsum(const QString &dev)
     
+    
     setCsum( dev, QString::number (cs ));
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index 1e9743c..d0f52ea 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -242,2 +242,3 @@ KABC::Picture ImageWidget::logo() const
 #else //KAB_EMBEDDED  
+      if (px->isNull() != true ) 
       logo.setData( px->convertToImage() );
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index d970ff1..e88706e 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1190,2 +1190,6 @@ void KABCore::contactModified( const KABC::Addressee &addr  )
     addrModified( addr );
+#if 0 // debug only
+    KABC::Addressee ad = addr;
+    ad.computeCsum( "123");
+#endif
 }
@@ -2715,3 +2719,4 @@ int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, i
         remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) );
-        //qDebug("loc %s  rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
+        if ( remCh )
+            qDebug("loc %s  rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
         locCh = ( localMod > mLastAddressbookSync );
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index ecd6f05..7022dcb 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -159,3 +159,3 @@ void KAddressBookTableView::doSearch( const QString&  s, KABC::Field *field  )
 #if QT_VERSION >= 300
-            if (re.search(field->value( *it ).lower()) != -1)
+            if (re.search(field->value( *it ).lower()) == 0)
 #else