From 9dac9f7dd6d059c63854ff698dbfb7a5f279df25 Mon Sep 17 00:00:00 2001
From: Aleksandar Kanchev <kanchev@itestra.com>
Date: Wed, 20 Feb 2013 16:22:49 +0100
Subject: [PATCH] properly override CommonAPI::Event events

---
 src/CommonAPI/DBus/DBusProxy.cpp | 4 ++--
 src/CommonAPI/DBus/DBusProxy.h   | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/CommonAPI/DBus/DBusProxy.cpp b/src/CommonAPI/DBus/DBusProxy.cpp
index 8dcd84f..5e9ce40 100644
--- a/src/CommonAPI/DBus/DBusProxy.cpp
+++ b/src/CommonAPI/DBus/DBusProxy.cpp
@@ -21,7 +21,7 @@ DBusProxyStatusEvent::DBusProxyStatusEvent(DBusProxy* dbusProxy) :
                 dbusProxy_(dbusProxy) {
 }
 
-void DBusProxyStatusEvent::onFirstListenerAdded(const Listener& listener) {
+void DBusProxyStatusEvent::onFirstListenerAdded(const CancellableListener& listener) {
     auto serviceStatusListener = std::bind(
                     &DBusProxyStatusEvent::onServiceAvailableSignalHandler,
                     this,
@@ -33,7 +33,7 @@ void DBusProxyStatusEvent::onFirstListenerAdded(const Listener& listener) {
                     serviceStatusListener);
 }
 
-void DBusProxyStatusEvent::onLastListenerRemoved(const Listener& listener) {
+void DBusProxyStatusEvent::onLastListenerRemoved(const CancellableListener& listener) {
     dbusProxy_->getDBusConnection()->getDBusServiceRegistry()->getServiceStatusEvent().unsubscribe(subscription_);
 }
 
diff --git a/src/CommonAPI/DBus/DBusProxy.h b/src/CommonAPI/DBus/DBusProxy.h
index 6569ff2..11b14a7 100644
--- a/src/CommonAPI/DBus/DBusProxy.h
+++ b/src/CommonAPI/DBus/DBusProxy.h
@@ -28,10 +28,8 @@ class DBusProxyStatusEvent: public ProxyStatusEvent {
  public:
     DBusProxyStatusEvent(DBusProxy* dbusProxy);
 
-    void onFirstListenerAdded(const Listener& listener);
-    void onLastListenerRemoved(const Listener& listener);
-
-    Subscription subscribe(Listener listener);
+    void onFirstListenerAdded(const CancellableListener& listener);
+    void onLastListenerRemoved(const CancellableListener& listener);
 
  private:
     SubscriptionStatus onServiceAvailableSignalHandler(const std::string& name, const AvailabilityStatus& availabilityStatus);
-- 
2.7.4