| author | zautrix <zautrix> | 2004-11-07 17:35:51 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-11-07 17:35:51 (UTC) |
| commit | d90d17044d7daf6677074b0964d59f94407157d5 (patch) (unidiff) | |
| tree | 82bf4f2001465637572534650769a864c15a6f7c /kaddressbook/kabcore.cpp | |
| parent | b6ef669713ee1d52adcfc9754dd039a4ff6675da (diff) | |
| download | kdepimpi-d90d17044d7daf6677074b0964d59f94407157d5.zip kdepimpi-d90d17044d7daf6677074b0964d59f94407157d5.tar.gz kdepimpi-d90d17044d7daf6677074b0964d59f94407157d5.tar.bz2 | |
some mail fixes and warnings removed
| -rw-r--r-- | kaddressbook/kabcore.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index d651224..c339244 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
| @@ -2742,9 +2742,9 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
| 2742 | //inL.setResource( 0 ); | 2742 | //inL.setResource( 0 ); |
| 2743 | //inR.setResource( 0 ); | 2743 | //inR.setResource( 0 ); |
| 2744 | if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars | 2744 | if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars |
| 2745 | if ( !inL.resource() || inL.resource()->includeInSync() ) { | 2745 | if ( !inL.resource() || inL.resource()->includeInSync() ) { |
| 2746 | if ( take = takeAddressee( &inL, &inR, mode, fullDateRange ) ) { | 2746 | if ( (take = takeAddressee( &inL, &inR, mode, fullDateRange )) ) { |
| 2747 | //qDebug("take %d %s ", take, inL.summary().latin1()); | 2747 | //qDebug("take %d %s ", take, inL.summary().latin1()); |
| 2748 | if ( take == 3 ) | 2748 | if ( take == 3 ) |
| 2749 | return false; | 2749 | return false; |
| 2750 | if ( take == 1 ) {// take local ********************** | 2750 | if ( take == 1 ) {// take local ********************** |