>From 176a110fc57f0c3bc505d80abe329fec4318195c Mon Sep 17 00:00:00 2001 From: Hugh Daschbach Date: Sun, 11 Oct 2020 14:48:19 -0700 Subject: [PATCH] Add interface arg to PropertiesChanged signal. * test/lisp/net/dbus-tests.el (dbus-test06-register-property-emits-signal): Fix test. * lisp/net/dbus.el (dbus-register-property, dbus-property-handler): Fix signal generation. --- lisp/net/dbus.el | 2 ++ test/lisp/net/dbus-tests.el | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 77ba5266dcb..bb2420e1f49 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -1740,6 +1740,7 @@ dbus-register-property (when emits-signal (dbus-send-signal bus service path dbus-interface-properties "PropertiesChanged" + interface ;; changed_properties. (if (eq access :write) '(:array: :signature "{sv}") @@ -1818,6 +1819,7 @@ dbus-property-handler (when (nth 1 object) (dbus-send-signal bus service path dbus-interface-properties "PropertiesChanged" + interface ;; changed_properties. (if (eq :write (car object)) '(:array: :signature "{sv}") diff --git a/test/lisp/net/dbus-tests.el b/test/lisp/net/dbus-tests.el index cd2e166c103..f75f107dfb6 100644 --- a/test/lisp/net/dbus-tests.el +++ b/test/lisp/net/dbus-tests.el @@ -1118,10 +1118,10 @@ dbus-test06-register-property-emits-signal (with-timeout (1 (dbus--test-timeout-handler)) (while (null dbus--test-signal-received) (read-event nil nil 0.1))) - ;; It returns two arguments, "changed_properties" (an array of - ;; dict entries) and "invalidated_properties" (an array of - ;; strings). - (should (equal dbus--test-signal-received `(((,property ("foo"))) ()))) + ;; It returns three arguments, interface (a string), + ;; "changed_properties" (an array of dict entries) and + ;; "invalidated_properties" (an array of strings). + (should (equal dbus--test-signal-received `(,dbus--test-interface ((,property ("foo"))) ()))) (should (equal @@ -1144,7 +1144,8 @@ dbus-test06-register-property-emits-signal (read-event nil nil 0.1))) (should (equal - dbus--test-signal-received `(((,property ((1 2 3)))) ()))) + dbus--test-signal-received + `(,dbus--test-interface ((,property ((1 2 3)))) ()))) (should (equal -- 2.28.0