From 250e5758ba59b957d42fe0a5d8af16dedce78d2f Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.vuorela@jollamobile.com>
Date: Fri, 9 Mar 2018 15:07:48 +0200
Subject: [PATCH] [sociald] Fix name of old facebook plugin package. Fixes
 JB#41314

Removed google plugin references which got removed already in 2013.
---
 rpm/sociald.spec                                          | 4 +---
 src/google/google-calendars/googlecalendarsyncadaptor.cpp | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rpm/sociald.spec b/rpm/sociald.spec
index f751898..078b0f1 100644
--- a/rpm/sociald.spec
+++ b/rpm/sociald.spec
@@ -22,9 +22,7 @@ BuildRequires:  ssu-devel
 Requires: buteo-syncfw-qt5-msyncd
 Requires: systemd
 Requires(post): systemd
-Obsoletes: buteo-sync-plugins-facebook-notifications
-Obsoletes: buteo-sync-plugins-google-simple <= 0.0.2
-Provides: buteo-sync-plugins-google-simple
+Obsoletes: sociald-facebook-notifications
 
 %description
 A Buteo plugin which provides data synchronization with various social services.
diff --git a/src/google/google-calendars/googlecalendarsyncadaptor.cpp b/src/google/google-calendars/googlecalendarsyncadaptor.cpp
index 00a52ec..26804a8 100644
--- a/src/google/google-calendars/googlecalendarsyncadaptor.cpp
+++ b/src/google/google-calendars/googlecalendarsyncadaptor.cpp
@@ -131,6 +131,7 @@ QString gCalEventId(KCalCore::Incidence::Ptr event)
     }
     return QString();
 }
+
 void setGCalEventId(KCalCore::Incidence::Ptr event, const QString &id)
 {
     // we abuse the comments field to store our gcal-id.
@@ -167,6 +168,7 @@ QString gCalETag(KCalCore::Incidence::Ptr event)
 {
     return event->customProperty("jolla-sociald", "gcal-etag");
 }
+
 void setGCalETag(KCalCore::Incidence::Ptr event, const QString &etag)
 {
     // note: custom properties are purged on incidence deletion.