Fix ServerCallbacks

* add missing include
* remove unused member m_popupper

Change-Id: I64f095349ecc7fdd4c09c43e729287d11a23072c

diff --git a/src/notification-daemon/Logic.cpp b/src/notification-daemon/Logic.cpp
index 2544c59f6112ba4384049e6392e59f6f168eb46e..f22dc1075c3b70d61f67f11b66411528f53a7927 100644 (file)
--- a/src/notification-daemon/Logic.cpp
+++ b/src/notification-daemon/Logic.cpp
@@ -235,7 +235,7 @@ Eina_Bool Logic::signalHandler(void *data, Ecore_Fd_Handler *) {
 }
 
 void Logic::prepareChannel() {
-    AskUser::Protocol::ServerCallbacksPtr callbacks(new AskUser::Protocol::ServerCallbacks(this, &m_popupper));
+    AskUser::Protocol::ServerCallbacksPtr callbacks(new AskUser::Protocol::ServerCallbacks(this));
     std::unique_ptr<AskUser::Protocol::ServerChannel> channel(new AskUser::Protocol::ServerChannel(std::move(callbacks)));
 
     m_serverChannel = std::move(channel);

diff --git a/src/notification-daemon/ServerCallbacks.h b/src/notification-daemon/ServerCallbacks.h
index e615e1a7bb16323e079e5f37bda4f7e3cf911c49..d22d2b0b2ec591cf7edb3019f49868e5b1ec494f 100644 (file)
--- a/src/notification-daemon/ServerCallbacks.h
+++ b/src/notification-daemon/ServerCallbacks.h
@@ -22,7 +22,7 @@
 
 #include <memory>
 
-#include <channel.h>
+#include <server-channel.h>
 
 #include "Logic.h"
 #include "ui/Popupper.h"
@@ -32,8 +32,8 @@ namespace Protocol {
 
 class ServerCallbacks : public IServerCallbacks {
 public:
-    ServerCallbacks(AskUser::Notification::Logic *logic, AskUser::Notification::Popupper *popupper)
-        : m_service(logic), m_popupper(popupper)
+    ServerCallbacks(AskUser::Notification::Logic *logic)
+        : m_service(logic)
     {}
     virtual void newConnection(ConnectionFd fd, const Credentials &creds);
     virtual void updateConnection(ConnectionFd fd, int mask);
@@ -42,7 +42,6 @@ public:
     virtual ~ServerCallbacks() {}
 private:
     AskUser::Notification::Logic *m_service;
-    AskUser::Notification::Popupper *m_popupper;
 };
 
 } /* namespace Notification */