D-Bus: allow multiple signal handlers for a signal

dbus/object_proxy.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef DBUS_OBJECT_PROXY_H_
 #define DBUS_OBJECT_PROXY_H_
 
 #include <dbus/dbus.h>
 
 #include <map>
 #include <set>
 #include <string>
+#include <vector>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string_piece.h"
 #include "base/time.h"
 #include "dbus/dbus_export.h"
 #include "dbus/object_path.h"
 
 namespace dbus {
 
@@ skipping 192 matching lines @@
                    const std::string& signal_name,
                    bool success);
 
   // Handles the incoming request messages and dispatches to the signal
   // callbacks.
   DBusHandlerResult HandleMessage(DBusConnection* connection,
                                   DBusMessage* raw_message);
 
   // Runs the method. Helper function for HandleMessage().
   void RunMethod(base::TimeTicks start_time,
-                 SignalCallback signal_callback,
+                 std::vector<SignalCallback> signal_callbacks,
                  Signal* signal);
 
   // Redirects the function call to HandleMessage().
   static DBusHandlerResult HandleMessageThunk(DBusConnection* connection,
                                               DBusMessage* raw_message,
                                               void* user_data);
 
   // Helper method for logging response errors appropriately.
   void LogMethodCallFailure(const base::StringPiece& interface_name,
                             const base::StringPiece& method_name,
@@ skipping 25 matching lines @@
   DBusHandlerResult HandleNameOwnerChanged(scoped_ptr<dbus::Signal> signal);
 
   scoped_refptr<Bus> bus_;
   std::string service_name_;
   ObjectPath object_path_;
 
   // True if the message filter was added.
   bool filter_added_;
 
   // The method table where keys are absolute signal names (i.e. interface
-  // name + signal name), and values are the corresponding callbacks.
-  typedef std::map<std::string, SignalCallback> MethodTable;
+  // name + signal name), and values are lists of the corresponding callbacks.
+  typedef std::map<std::string, std::vector<SignalCallback> > MethodTable;
   MethodTable method_table_;
 
   // The callback called when NameOwnerChanged signal is received.
   SignalCallback name_owner_changed_callback_;
 
   std::set<std::string> match_rules_;
 
   const bool ignore_service_unknown_errors_;
 
   // Known name owner of the well-known bus name represnted by |service_name_|.
   std::string service_name_owner_;
 
   DISALLOW_COPY_AND_ASSIGN(ObjectProxy);
 };
 
 }  // namespace dbus
 
 #endif  // DBUS_OBJECT_PROXY_H_