Commit b886d1b9 authored by pvuorela's avatar pvuorela

Merge branch 'fix_obsoletes' into 'master'

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

See merge request !27
parents ada1395b 250e5758
...@@ -22,9 +22,7 @@ BuildRequires: ssu-devel ...@@ -22,9 +22,7 @@ BuildRequires: ssu-devel
Requires: buteo-syncfw-qt5-msyncd Requires: buteo-syncfw-qt5-msyncd
Requires: systemd Requires: systemd
Requires(post): systemd Requires(post): systemd
Obsoletes: buteo-sync-plugins-facebook-notifications Obsoletes: sociald-facebook-notifications
Obsoletes: buteo-sync-plugins-google-simple <= 0.0.2
Provides: buteo-sync-plugins-google-simple
%description %description
A Buteo plugin which provides data synchronization with various social services. A Buteo plugin which provides data synchronization with various social services.
......
...@@ -131,6 +131,7 @@ QString gCalEventId(KCalCore::Incidence::Ptr event) ...@@ -131,6 +131,7 @@ QString gCalEventId(KCalCore::Incidence::Ptr event)
} }
return QString(); return QString();
} }
void setGCalEventId(KCalCore::Incidence::Ptr event, const QString &id) void setGCalEventId(KCalCore::Incidence::Ptr event, const QString &id)
{ {
// we abuse the comments field to store our gcal-id. // we abuse the comments field to store our gcal-id.
...@@ -167,6 +168,7 @@ QString gCalETag(KCalCore::Incidence::Ptr event) ...@@ -167,6 +168,7 @@ QString gCalETag(KCalCore::Incidence::Ptr event)
{ {
return event->customProperty("jolla-sociald", "gcal-etag"); return event->customProperty("jolla-sociald", "gcal-etag");
} }
void setGCalETag(KCalCore::Incidence::Ptr event, const QString &etag) void setGCalETag(KCalCore::Incidence::Ptr event, const QString &etag)
{ {
// note: custom properties are purged on incidence deletion. // note: custom properties are purged on incidence deletion.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment