| -rw-r--r-- | kaddressbook/imagewidget.cpp | 5 | ||||
| -rw-r--r-- | kaddressbook/kabcore.cpp | 7 | ||||
| -rw-r--r-- | kaddressbook/views/kaddressbooktableview.cpp | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index 1e9743c..d0f52ea 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -239,8 +239,9 @@ KABC::Picture ImageWidget::logo() const logo.setData( px->convertToImage().scaleHeight( 140 ) ); else logo.setData( px->convertToImage().scaleWidth( 100 ) ); -#else //KAB_EMBEDDED - logo.setData( px->convertToImage() ); +#else //KAB_EMBEDDED + if (px->isNull() != true ) + logo.setData( px->convertToImage() ); #endif //KAB_EMBEDDED logo.setType( "PNG" ); diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index d970ff1..e88706e 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -1188,6 +1188,10 @@ bool KABCore::modified() const void KABCore::contactModified( const KABC::Addressee &addr ) { addrModified( addr ); +#if 0 // debug only + KABC::Addressee ad = addr; + ad.computeCsum( "123"); +#endif } void KABCore::addrModified( const KABC::Addressee &addr ,bool updateDetails ) @@ -2713,7 +2717,8 @@ 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() ); + if ( remCh ) + qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() ); locCh = ( localMod > mLastAddressbookSync ); //qDebug("cahnged rem %d loc %d",remCh, locCh ); if ( !remCh && ! locCh ) { 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 @@ -157,7 +157,7 @@ void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field ) if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) continue; #if QT_VERSION >= 300 - if (re.search(field->value( *it ).lower()) != -1) + if (re.search(field->value( *it ).lower()) == 0) #else if (re.match(field->value( *it ).lower()) != -1) #endif |