[sociald] Fix name of old facebook plugin package. Fixes JB#41314

Removed google plugin references which got removed already in 2013.
sailfishos · Mar 9, 2018 · 250e575 · 250e575
1 parent ada1395
commit 250e575
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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.