Fixed bug that prevents proxy connections from being destroyed because

of a circular dependency between DBusConnection and DBusServiceRegistry.
Also removed bug that prevented ServiceRegistry-callbacks from being
deregistered correctly. Extended tests, some formatting issues, fixed
one spelling error.

Change-Id: I6cf2148375f4c086e60f0ad642415056bd808759

1 files changed, 5 insertions, 3 deletions

diff --git a/src/CommonAPI/DBus/DBusConnection.h b/src/CommonAPI/DBus/DBusConnection.h
index b86fd1e..54b94d1 100644
--- a/src/CommonAPI/DBus/DBusConnection.h
+++ b/src/CommonAPI/DBus/DBusConnection.h
@@ -112,14 +112,16 @@ class DBusConnection: public DBusProxyConnection, public std::enable_shared_from
                                                                                DBusSignalHandler* dbusSignalHandler,
                                                                                DBusProxy* callingProxy);
 
-    void unsubsribeFromSelectiveBroadcast(const std::string& eventName,
+    void unsubscribeFromSelectiveBroadcast(const std::string& eventName,
                                           DBusProxyConnection::DBusSignalHandlerToken subscription,
-                                          DBusProxy* callingProxy);
+                                          DBusProxy* callingProxy,
+                                          const DBusSignalHandler* dbusSignalHandler);
 
     void registerObjectPath(const std::string& objectPath);
     void unregisterObjectPath(const std::string& objectPath);
 
-    bool removeSignalMemberHandler(const DBusSignalHandlerToken& dbusSignalHandlerToken);
+    bool removeSignalMemberHandler(const DBusSignalHandlerToken& dbusSignalHandlerToken,
+                                   const DBusSignalHandler* dbusSignalHandler = NULL);
     bool readWriteDispatch(int timeoutMilliseconds = -1);
 
     virtual const std::shared_ptr<DBusServiceRegistry> getDBusServiceRegistry();