diff options
| author | Lukas Zeller <luz@synthesis.ch> | 2009-10-07 16:12:01 +0200 |
|---|---|---|
| committer | Lukas Zeller <luz@synthesis.ch> | 2009-10-07 16:12:01 +0200 |
| commit | 8c807878d599f453556518128eba53dcae3a30a3 (patch) | |
| tree | 0cbf2a6c1244898f58963f5aa8e393038cad9fdc /src | |
| parent | 1d89fe2b09aa7833c591940851fbe76afb8a4825 (diff) | |
| parent | 83ef886fa72045ef19b3ef13f3150ff32ad4e385 (diff) | |
Merge branch 'luz' into unilib
Diffstat (limited to 'src')
| -rw-r--r-- | src/sysync/localengineds.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sysync/localengineds.cpp b/src/sysync/localengineds.cpp index f971b24..04e8de8 100644 --- a/src/sysync/localengineds.cpp +++ b/src/sysync/localengineds.cpp @@ -764,7 +764,7 @@ bool TTypeSupportConfig::localStartElement(const char *aElementName, const char } else return fail("bad value for 'preferred'"); - } + } } // now add datatype if (preferred) { @@ -1160,7 +1160,7 @@ void TLocalEngineDS::InternalResetDataStore(void) /// Init type negotiation /// - for sending data fLocalSendToRemoteTypeP = NULL; - fRemoteReceiveFromLocalTypeP = NULL; + fRemoteReceiveFromLocalTypeP = NULL; /// - for receiving data fLocalReceiveFromRemoteTypeP = NULL; fRemoteSendToLocalTypeP = NULL; @@ -2434,7 +2434,7 @@ TAlertCommand *TLocalEngineDS::engProcessSyncAlert( if ( ( ( - (!fLastRemoteAnchor.empty() && + (!fLastRemoteAnchor.empty() && ( (fLastRemoteAnchor==aLastRemoteAnchor) #ifdef SYSYNC_CLIENT || (fSessionP->fLenientMode && IS_CLIENT) @@ -2447,7 +2447,7 @@ TAlertCommand *TLocalEngineDS::engProcessSyncAlert( ) || fSlowSync // if slow sync is requested by the remote anyway, we don't need to be in sync anyway, so just go on ) { - if (fLastRemoteAnchor!=aLastRemoteAnchor && fSessionP->fLenientMode) { + if (!(fLastRemoteAnchor==aLastRemoteAnchor) && fSessionP->fLenientMode) { PDEBUGPRINTFX(DBG_ERROR,("Warning - remote anchor mismatch but tolerated in lenient mode")); } // sync state ok or Slow sync requested anyway: @@ -2735,12 +2735,12 @@ localstatus TLocalEngineDS::engInitForSyncOps( LocalReceiveFromRemoteTypeP = LocalSendToRemoteTypeP; } else { - // no specific "blind" preference, use my own normally preferred types + // no specific "blind" preference, use my own normally preferred types LocalSendToRemoteTypeP = getPreferredTxItemType(); // send in preferred tx type of local datastore LocalReceiveFromRemoteTypeP = getPreferredRxItemType(); // receive in preferred rx type of local datastore } // same type on both end (as only local type exists) - RemoteReceiveFromLocalTypeP = LocalSendToRemoteTypeP; // same on both end + RemoteReceiveFromLocalTypeP = LocalSendToRemoteTypeP; // same on both end RemoteSendToLocalTypeP = LocalReceiveFromRemoteTypeP; // same on both end (as only local type exists) // create "remote" datastore with matching properties to local one PDEBUGPRINTFX(DBG_ERROR,("Warning: No DevInf for remote datastore, running blind sync attempt")); |