Skip to content

Commit

Permalink
[buteo-sync-plugins-social] Use correct incidence comparison function…
Browse files Browse the repository at this point in the history
…. Contributes to MER#1392

This commit ensures that we use the correct incidence comparison
function when performing local delta detection.  Previously, we used
the one which only detected changes specific to event-types, which
does NOT include those changes which are valid for all incidence types.

Contributes to MER#1392
  • Loading branch information
Chris Adams committed Oct 28, 2015
1 parent e052b68 commit 2b7b4ab
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Expand Up @@ -128,7 +128,7 @@ namespace GoogleCalendarIncidenceComparator {
}

// Checks whether a specific set of properties are equal.
bool copiedPropertiesAreEqual(const KCalCore::Incidence::Ptr &a, const KCalCore::Incidence::Ptr &b, bool printDebug)
bool incidencesEqual(const KCalCore::Incidence::Ptr &a, const KCalCore::Incidence::Ptr &b, bool printDebug)
{
if (!a || !b) {
qWarning() << "Invalid paramters! a:" << a << "b:" << b;
Expand Down
2 changes: 1 addition & 1 deletion src/google/google-calendars/googlecalendarsyncadaptor.cpp
Expand Up @@ -744,7 +744,7 @@ bool localModificationIsReal(const QJsonObject &local, const QJsonObject &remote
KCalCore::Event::Ptr remoteEvent = KCalCore::Event::Ptr(new KCalCore::Event);
jsonToKCal(local, localEvent, defaultReminderStartOffset, icalFormat, &changed);
jsonToKCal(remote, remoteEvent, defaultReminderStartOffset, icalFormat, &changed);
if (GoogleCalendarIncidenceComparator::eventsEqual(localEvent, remoteEvent, true)) {
if (GoogleCalendarIncidenceComparator::incidencesEqual(localEvent, remoteEvent, true)) {
return false; // they're equal, so the local modification is not real.
}
return true;
Expand Down

0 comments on commit 2b7b4ab

Please sign in to comment.