[Emacs-diffs] /srv/bzr/emacs/trunk r105898: * dbusbind.c (Fdbus_register_signal): Add match rule to

[Michael Albinus]

------------------------------------------------------------
revno: 105898
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sat 2011-09-24 13:36:53 +0200
message:
  * dbusbind.c (Fdbus_register_signal): Add match rule to
  Vdbus_registered_objects_table.  (Bug#9581)
  (Fdbus_register_method, Vdbus_registered_objects_table): Fix
  docstring.
modified:
  src/ChangeLog
  src/dbusbind.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-09-24 09:22:06 +0000
+++ b/src/ChangeLog     2011-09-24 11:36:53 +0000
@@ -1,3 +1,10 @@
+2011-09-24  Michael Albinus  <address@hidden>
+
+       * dbusbind.c (Fdbus_register_signal): Add match rule to
+       Vdbus_registered_objects_table.  (Bug#9581)
+       (Fdbus_register_method, Vdbus_registered_objects_table): Fix
+       docstring.
+
 2011-09-24  Jim Meyering  <address@hidden>
 
        do not ignore write error for any output size

=== modified file 'src/dbusbind.c'
--- a/src/dbusbind.c    2011-09-09 01:06:52 +0000
+++ b/src/dbusbind.c    2011-09-24 11:36:53 +0000
@@ -2145,7 +2145,7 @@
 
   /* Create a hash table entry.  */
   key = list3 (bus, interface, signal);
-  key1 = list4 (uname, service, path, handler);
+  key1 = list5 (uname, service, path, handler, build_string (rule));
   value = Fgethash (key, Vdbus_registered_objects_table, Qnil);
 
   if (NILP (Fmember (key1, value)))
@@ -2177,7 +2177,7 @@
 registered.  This means that other D-Bus clients have no way of
 noticing the newly registered method.  When interfaces are constructed
 incrementally by adding single methods or properties at a time,
-DONT-REGISTER-SERVICE can be use to prevent other clients from
+DONT-REGISTER-SERVICE can be used to prevent other clients from
 discovering the still incomplete interface.*/)
   (Lisp_Object bus, Lisp_Object service, Lisp_Object path,
    Lisp_Object interface, Lisp_Object method, Lisp_Object handler,
@@ -2319,6 +2319,9 @@
 arrives (methods and signals), or a cons cell containing the value of
 the property.
 
+For signals, there is also a fifth element RULE, which keeps the match
+string the signal is registered with.
+
 In the second case, the key in the hash table is the list (BUS
 SERIAL).  BUS is either a Lisp symbol, `:system' or `:session', or a
 string denoting the bus address.  SERIAL is the serial number of the