-rw-r--r-- | pwmanager/pwmanager/pwmdoc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp index 6c1a9c0..76a45f4 100644 --- a/pwmanager/pwmanager/pwmdoc.cpp +++ b/pwmanager/pwmanager/pwmdoc.cpp | |||
@@ -2960,7 +2960,7 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s | |||
2960 | //USsyncLocal->removeAddressee( inLocal ); | 2960 | //USsyncLocal->removeAddressee( inLocal ); |
2961 | ++deletedPasswordsLocal; | 2961 | ++deletedPasswordsLocal; |
2962 | } else { | 2962 | } else { |
2963 | if ( ! PWMPrefs::instance()->mWriteBackExistingOnly ) { | 2963 | if ( ! manager->mWriteBackExistingOnly ) { |
2964 | ++addedPasswordsRemote; | 2964 | ++addedPasswordsRemote; |
2965 | inLocal->meta.update = modifiedSync; | 2965 | inLocal->meta.update = modifiedSync; |
2966 | //USsyncLocal->insertAddressee( inLocal, false ); | 2966 | //USsyncLocal->insertAddressee( inLocal, false ); |
@@ -2995,7 +2995,7 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s | |||
2995 | syncLocal->addSyncDataEntry( syncItemLocal, false ); | 2995 | syncLocal->addSyncDataEntry( syncItemLocal, false ); |
2996 | QString mes; | 2996 | QString mes; |
2997 | mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedPasswordsLocal, addedPasswordsRemote, changedLocal, changedRemote, deletedPasswordsLocal, deletedPasswordsRemote ); | 2997 | mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedPasswordsLocal, addedPasswordsRemote, changedLocal, changedRemote, deletedPasswordsLocal, deletedPasswordsRemote ); |
2998 | if ( PWMPrefs::instance()->mShowSyncSummary ) { | 2998 | if ( manager->mShowSyncSummary ) { |
2999 | KMessageBox::information(0, mes, i18n("PWM/Pi Synchronization") ); | 2999 | KMessageBox::information(0, mes, i18n("PWM/Pi Synchronization") ); |
3000 | } | 3000 | } |
3001 | qDebug( mes ); | 3001 | qDebug( mes ); |
@@ -3139,7 +3139,7 @@ bool PwMDoc::sync(KSyncManager* manager, QString filename, int mode) | |||
3139 | err = syncronize(manager, this, pSyncTarget, mode ); | 3139 | err = syncronize(manager, this, pSyncTarget, mode ); |
3140 | 3140 | ||
3141 | if (err == e_success) { | 3141 | if (err == e_success) { |
3142 | if ( PWMPrefs::instance()->mWriteBackFile ){ | 3142 | if ( manager->mWriteBackFile ){ |
3143 | qDebug("Saving remote PWManager file"); | 3143 | qDebug("Saving remote PWManager file"); |
3144 | err = pSyncTarget->saveDoc(conf()->confGlobCompression()); | 3144 | err = pSyncTarget->saveDoc(conf()->confGlobCompression()); |
3145 | if (err != e_success) { | 3145 | if (err != e_success) { |