diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2010-05-04 15:36:00 +0200 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2010-05-04 15:36:00 +0200 |
| commit | 7046f6bc51db38ee129a46f6de534416e916a80a (patch) | |
| tree | 108346deb3fada13b0b3e95cc104e28fe1a2bbb1 /src | |
| parent | 8a0d2db04a424eb06837ef15a478466dfcc5228b (diff) | |
SyncContext: accept progress events in server mode (MBC #1359)
The latest Synthesis engine also emits progress events in server mode.
Before this patch, the events were ignored because the code was
conservative about not relying on something not supported. Now
client and server mode report and record progress and statistics
the same way.
Diffstat (limited to 'src')
| -rw-r--r-- | src/syncevo/SyncContext.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/src/syncevo/SyncContext.cpp b/src/syncevo/SyncContext.cpp index 28f49748..5637b1a4 100644 --- a/src/syncevo/SyncContext.cpp +++ b/src/syncevo/SyncContext.cpp @@ -3317,24 +3317,23 @@ SyncMLStatus SyncContext::doSync() progressInfo.extra2, progressInfo.extra3); break; - default: - if (!m_serverMode) { - // specific for a certain sync source: - // find it... - SyncSource *source = m_sourceListPtr->lookupBySynthesisID(progressInfo.targetID); - if (source) { - displaySourceProgress(sysync::TProgressEventEnum(progressInfo.eventtype), - *source, - progressInfo.extra1, - progressInfo.extra2, - progressInfo.extra3); - } else { - throwError(std::string("unknown target ") + s); - } - target.reset(); + default: { + // specific for a certain sync source: + // find it... + SyncSource *source = m_sourceListPtr->lookupBySynthesisID(progressInfo.targetID); + if (source) { + displaySourceProgress(sysync::TProgressEventEnum(progressInfo.eventtype), + *source, + progressInfo.extra1, + progressInfo.extra2, + progressInfo.extra3); + } else { + throwError(std::string("unknown target ") + s); } + target.reset(); break; } + } } stepCmd = sysync::STEPCMD_STEP; break; |