Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'skashin/jb43029' into 'master'
[sociald] Organizer of the event shouldn't be in the attendees list. Fixes JB#43029

See merge request mer-core/buteo-sync-plugins-social!29
  • Loading branch information
pvuorela committed Oct 1, 2018
2 parents f4891f9 + 98196a9 commit 9db57f3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion rpm/sociald.spec
@@ -1,6 +1,6 @@
Name: sociald
Summary: Syncs device data from social services
Version: 0.1.67
Version: 0.1.68
Release: 1
Group: System/Libraries
License: LGPLv2.1
Expand Down
3 changes: 2 additions & 1 deletion src/google/google-calendars/googlecalendarsyncadaptor.cpp
Expand Up @@ -405,8 +405,9 @@ QJsonObject kCalToJson(KCalCore::Event::Ptr event, KCalCore::ICalFormat &icalFor
QJsonArray attendees;
const KCalCore::Attendee::List attendeesList = event->attendees();
if (!attendeesList.isEmpty()) {
const QString &organizerEmail = event->organizer()->email();
Q_FOREACH (auto att, attendeesList) {
if (att->email().isEmpty()) {
if (att->email().isEmpty() || att->email() == organizerEmail) {
continue;
}
QJsonObject attendee;
Expand Down

0 comments on commit 9db57f3

Please sign in to comment.