i3-companion: make more properties of DBusSignal optional

This commit is contained in:
Vincent Bernat 2021-07-16 01:18:19 +02:00
parent c974b59082
commit fc3563777a

View file

@ -91,8 +91,8 @@ logger = logging.getLogger("i3-companion")
# Events for @on decorator # Events for @on decorator
DBusSignal = collections.namedtuple( DBusSignal = collections.namedtuple(
"DBusSignal", "DBusSignal",
["system", "path", "interface", "member", "signature", "onlyif"], ["interface", "member", "signature", "system", "path", "onlyif"],
defaults=(None,), defaults=(True, "/", None),
) )
StartEvent = object() StartEvent = object()
I3Event = i3ipc.Event I3Event = i3ipc.Event
@ -581,7 +581,6 @@ async def output_update(i3, event):
@on( @on(
DBusSignal( DBusSignal(
system=True,
path="/org/bluez", path="/org/bluez",
interface="org.freedesktop.DBus.Properties", interface="org.freedesktop.DBus.Properties",
member="PropertiesChanged", member="PropertiesChanged",
@ -612,7 +611,6 @@ async def bluetooth_notifications(
@on( @on(
StartEvent, StartEvent,
DBusSignal( DBusSignal(
system=True,
path="/org/bluez", path="/org/bluez",
interface="org.freedesktop.DBus.Properties", interface="org.freedesktop.DBus.Properties",
member="PropertiesChanged", member="PropertiesChanged",
@ -744,8 +742,6 @@ async def dunst_status_check(i3, event):
@on( @on(
DBusSignal( DBusSignal(
system=True,
path="/",
interface="org.freedesktop.NetworkManager.Connection.Active", interface="org.freedesktop.NetworkManager.Connection.Active",
member="StateChanged", member="StateChanged",
signature="uu", signature="uu",
@ -790,15 +786,11 @@ async def network_manager_notifications(i3, event, path, state, reason):
@on( @on(
StartEvent, StartEvent,
DBusSignal( DBusSignal(
system=True,
path="/",
interface="org.freedesktop.NetworkManager.Connection.Active", interface="org.freedesktop.NetworkManager.Connection.Active",
member="StateChanged", member="StateChanged",
signature="uu", signature="uu",
), ),
DBusSignal( DBusSignal(
system=True,
path="/",
interface="org.freedesktop.NetworkManager.AccessPoint", interface="org.freedesktop.NetworkManager.AccessPoint",
member="PropertiesChanged", member="PropertiesChanged",
signature="a{sv}", signature="a{sv}",