| -rw-r--r-- | kaddressbook/kabcore.cpp | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index b1a951c..cc8eb52 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -2614,61 +2614,43 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i return 1; break; case SYNC_PREF_REMOTE: if ( lastSync > remote->revision() ) return 1; if ( lastSync > local->revision() ) return 2; return 2; break; case SYNC_PREF_NEWEST: if ( local->revision() > remote->revision() ) return 1; else return 2; break; case SYNC_PREF_ASK: - qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), local->revision().toString().latin1(), remote->revision().toString().latin1() ); + //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), local->revision().toString().latin1(), remote->revision().toString().latin1() ); if ( lastSync > remote->revision() ) return 1; if ( lastSync > local->revision() ) return 2; - //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), local->revision().toString().latin1(), remote->revision().toString().latin1() ); localIsNew = local->revision() >= remote->revision(); -#if 0 - if ( localIsNew ) - getEventViewerDialog()->setColorMode( 1 ); - else - getEventViewerDialog()->setColorMode( 2 ); - getEventViewerDialog()->setIncidence(local); - if ( localIsNew ) - getEventViewerDialog()->setColorMode( 2 ); - else - getEventViewerDialog()->setColorMode( 1 ); - getEventViewerDialog()->addIncidence(remote); - getEventViewerDialog()->setColorMode( 0 ); - //qDebug("local %d remote %d ",local->relatedTo(),remote->relatedTo() ); - getEventViewerDialog()->setCaption( mCurrentSyncDevice +i18n(" : Conflict! Please choose entry!")); - getEventViewerDialog()->showMe(); - result = getEventViewerDialog()->executeS( localIsNew ); -#endif - qDebug("conflict! ************************************** "); + //qDebug("conflict! ************************************** "); { - KPIM::AddresseeChooser acd ( *local,*remote, localIsNew , this ); - result = acd.executeD(localIsNew); - return result; + KPIM::AddresseeChooser acd ( *local,*remote, localIsNew , this ); + result = acd.executeD(localIsNew); + return result; } break; case SYNC_PREF_FORCE_LOCAL: return 1; break; case SYNC_PREF_FORCE_REMOTE: return 2; break; default: // SYNC_PREF_TAKE_BOTH not implemented break; } return 0; } bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode) @@ -2961,33 +2943,32 @@ bool KABCore::syncAB(QString filename, int mode) getEventViewerDialog()->setSyncMode( true ); syncOK = synchronizeCalendar( mCalendar, calendar, mode ); getEventViewerDialog()->setSyncMode( false ); if ( syncOK ) { if ( KOPrefs::instance()->mWriteBackFile ) { storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) ); storage->save(); } } setModified(); } #endif } - void KABCore::confSync() { static KSyncPrefsDialog* sp = 0; if ( ! sp ) { sp = new KSyncPrefsDialog( this, "syncprefs", true ); } sp->usrReadConfig(); #ifndef DESKTOP_VERSION sp->showMaximized(); #else sp->show(); #endif sp->exec(); KABPrefs::instance()->mSyncProfileNames = sp->getSyncProfileNames(); KABPrefs::instance()->mLocalMachineName = sp->getLocalMachineName (); fillSyncMenu(); |