Merge branch 'notifications' of github.com:smurfy/pebble into smurfy-notifications

Conflicts:
	daemon/daemon.pro
	daemon/manager.cpp
	daemon/manager.h

1 files changed, 6 insertions, 8 deletions

diff --git a/daemon/manager.h b/daemon/manager.h
index ba482bb..ea24f9e 100644
--- a/daemon/manager.h
+++ b/daemon/manager.h
@@ -4,6 +4,7 @@
 #include "watchconnector.h"
 #include "dbusconnector.h"
 #include "voicecallmanager.h"
+#include "notificationmanager.h"
 #include "watchcommands.h"
 
 #include <QObject>
@@ -11,12 +12,10 @@
 #include <QDBusContext>
 #include <QtContacts/QContactManager>
 #include <QtContacts/QContactDetailFilter>
-#include <CommHistory/GroupModel>
 #include <MNotification>
 #include "Logger"
 
 using namespace QtContacts;
-using namespace CommHistory;
 
 class Manager :
         public QObject,
@@ -32,6 +31,7 @@ class Manager :
     watch::WatchConnector *watch;
     DBusConnector *dbus;
     VoiceCallManager *voice;
+    NotificationManager *notifications;
 
     WatchCommands *commands;
 
@@ -39,15 +39,13 @@ class Manager :
 
     QContactManager *contacts;
     QContactDetailFilter numberFilter;
-    GroupManager *conversations;
 
     QString lastSeenMpris;
 
 public:
-    explicit Manager(watch::WatchConnector *watch, DBusConnector *dbus, VoiceCallManager *voice);
+    explicit Manager(watch::WatchConnector *watch, DBusConnector *dbus, VoiceCallManager *voice, NotificationManager *notifications);
 
     Q_INVOKABLE QString findPersonByNumber(QString number);
-    Q_INVOKABLE void processUnreadMessages(GroupObject *group);
     Q_INVOKABLE QString mpris();
     QVariantMap mprisMetadata;
 
@@ -63,12 +61,12 @@ protected slots:
     void onActiveVoiceCallChanged();
     void onVoiceError(const QString &message);
     void onActiveVoiceCallStatusChanged();
-    void onConversationGroupAdded(GroupObject *group);
-    void onUnreadMessagesChanged();
+    void onNotifyError(const QString &message);
+    void onSmsNotify(const QString &sender, const QString &data);
+    void onEmailNotify(const QString &sender, const QString &data,const QString &subject);
     void onMprisPropertiesChanged(QString,QMap<QString,QVariant>,QStringList);
     void setMprisMetadata(QDBusArgument metadata);
     void setMprisMetadata(QVariantMap metadata);
-
 };
 
 class PebbledProxy : public QObject