Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion dev.openwave.sdPlugin/owdeck/ipc.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,10 @@ def _attach(proxy):
def _relay(_proxy, _sender, signal, params):
if signal != "Changed" or _on_changed is None:
return
# org.gtk.Actions.Changed is (as a{sb} a{sv} a{s(bgav)}): removed,
# enabled, state, added. Only the state map matters here.
try:
_removed, _enabled, states = params.unpack()
_removed, _enabled, states, _added = params.unpack()
except (TypeError, ValueError):
return
_on_changed(dict(states or {}))
Expand Down
25 changes: 25 additions & 0 deletions tests/test_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -1082,3 +1082,28 @@ def test_garbage_push_is_ignored(self):
self.plugin._snapshot = {"stale": True}
self.plugin._on_push({"snapshot": "{not json"})
self.assertIn("stale", self.plugin._snapshot)


@unittest.skipUnless(ipc._HAVE_GI, "needs PyGObject")
class TestChangedSignal(unittest.TestCase):
"""The relay must unpack org.gtk.Actions.Changed as the bus sends it."""

def setUp(self):
self.addCleanup(setattr, ipc, "_on_changed", ipc._on_changed)
self.got = []
ipc._on_changed = self.got.append

def _relay(self):
class Proxy:
def connect(inner, _name, handler):
inner.handler = handler
proxy = Proxy()
ipc._attach(proxy)
return proxy.handler

def test_the_real_four_part_signal_reaches_the_subscriber(self):
GLib = ipc.GLib
params = GLib.Variant("(asa{sb}a{sv}a{s(bgav)})", (
[], {}, {"snapshot": GLib.Variant("s", "{}")}, {}))
self._relay()(None, ":1.1", "Changed", params)
self.assertEqual(self.got, [{"snapshot": "{}"}])
Loading