Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[buteo-sync-plugins-social] Add more Twitter notification types. Cont…
…ributes to MER#1064

This commit improves the Twitter Notifications sync adapter so that
it now syncs multiple different types of notifications from Twitter.

Contributes to MER#1064
  • Loading branch information
Chris Adams committed Jun 5, 2015
1 parent 555dbfc commit 68be913
Show file tree
Hide file tree
Showing 10 changed files with 654 additions and 265 deletions.
4 changes: 3 additions & 1 deletion rpm/sociald.spec
Expand Up @@ -15,7 +15,7 @@ BuildRequires: pkgconfig(mlite5)
BuildRequires: pkgconfig(buteosyncfw5) >= 0.6.36
BuildRequires: pkgconfig(libsignon-qt5)
BuildRequires: pkgconfig(accounts-qt5) >= 1.13
BuildRequires: pkgconfig(socialcache) >= 0.0.31
BuildRequires: pkgconfig(socialcache) >= 0.0.36
BuildRequires: pkgconfig(libsailfishkeyprovider)
BuildRequires: qt5-qttools-linguist
Requires: buteo-syncfw-qt5-msyncd
Expand Down Expand Up @@ -275,6 +275,8 @@ Provides notification synchronisation with Twitter
%config %{_sysconfdir}/buteo/profiles/client/twitter-notifications.xml
%config %{_sysconfdir}/buteo/profiles/sync/twitter.Notifications.xml
%{_datadir}/lipstick/notificationcategories/x-nemo.social.twitter.mention.conf
%{_datadir}/lipstick/notificationcategories/x-nemo.social.twitter.retweet.conf
%{_datadir}/lipstick/notificationcategories/x-nemo.social.twitter.follower.conf
%{_datadir}/translations/lipstick-jolla-home-twitter-notif_eng_en.qm

%pre twitter-notifications
Expand Down
4 changes: 2 additions & 2 deletions src/twitter/twitter-notifications/twitter-notifications.pri
@@ -1,6 +1,6 @@
CONFIG += link_pkgconfig meegotouchevents-qt5
PKGCONFIG += nemonotifications-qt5
SOURCES += $$PWD/twittermentiontimelinesyncadaptor.cpp
HEADERS += $$PWD/twittermentiontimelinesyncadaptor.h
SOURCES += $$PWD/twitternotificationsyncadaptor.cpp
HEADERS += $$PWD/twitternotificationsyncadaptor.h
INCLUDEPATH += $$PWD

5 changes: 4 additions & 1 deletion src/twitter/twitter-notifications/twitter-notifications.pro
Expand Up @@ -12,7 +12,10 @@ twitter_notifications_sync_profile.files = $$PWD/twitter.Notifications.xml
twitter_notifications_client_plugin_xml.path = /etc/buteo/profiles/client
twitter_notifications_client_plugin_xml.files = $$PWD/twitter-notifications.xml
twitter_notifications_notification_xml.path = /usr/share/lipstick/notificationcategories/
twitter_notifications_notification_xml.files = $$PWD/x-nemo.social.twitter.mention.conf
twitter_notifications_notification_xml.files = \
$$PWD/x-nemo.social.twitter.mention.conf \
$$PWD/x-nemo.social.twitter.retweet.conf \
$$PWD/x-nemo.social.twitter.follower.conf

HEADERS += twitternotificationsplugin.h
SOURCES += twitternotificationsplugin.cpp
Expand Down

This file was deleted.

Expand Up @@ -20,7 +20,7 @@
****************************************************************************/

#include "twitternotificationsplugin.h"
#include "twittermentiontimelinesyncadaptor.h"
#include "twitternotificationsyncadaptor.h"
#include "socialnetworksyncadaptor.h"

#include <QTranslator>
Expand Down Expand Up @@ -62,5 +62,5 @@ TwitterNotificationsPlugin::~TwitterNotificationsPlugin()

SocialNetworkSyncAdaptor *TwitterNotificationsPlugin::createSocialNetworkSyncAdaptor()
{
return new TwitterMentionTimelineSyncAdaptor(this);
return new TwitterNotificationSyncAdaptor(this);
}

0 comments on commit 68be913

Please sign in to comment.