diff options
| author | Andrey Gusakov <adnrey.gusakov@cogentembedded.com> | 2014-06-23 07:48:55 +0400 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@gmail.com> | 2014-08-05 11:57:56 +0200 |
| commit | 97323d905c0b05cbadbf0ba574feb14127fc1182 (patch) | |
| tree | 40ae86d874b3ef67746a28a37e5230ac3d60b915 | |
| parent | 3dcb89e98bfc43d89a9dc34d1d012a4e6756b83c (diff) | |
dbus: update to systemd API >=213
The libsystemd-bus API changed recently. Update our calls to use the new
API so it compiles with newer systemd versions.
Signed-off-by: Andrey Gusakov <adnrey.gusakov@cogentembedded.com>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
| -rw-r--r-- | src/ctl/ctl-wifi.c | 25 | ||||
| -rw-r--r-- | src/wifi/wifid-dbus.c | 32 |
2 files changed, 9 insertions, 48 deletions
diff --git a/src/ctl/ctl-wifi.c b/src/ctl/ctl-wifi.c index a0caef3..216c6e4 100644 --- a/src/ctl/ctl-wifi.c +++ b/src/ctl/ctl-wifi.c @@ -982,7 +982,7 @@ static int ctl_wifi_init(struct ctl_wifi *w) { int r; - r = sd_bus_add_match(w->bus, + r = sd_bus_add_match(w->bus, NULL, "type='signal'," "sender='org.freedesktop.miracle.wifi'," "interface='org.freedesktop.DBus.ObjectManager'", @@ -991,7 +991,7 @@ static int ctl_wifi_init(struct ctl_wifi *w) if (r < 0) return r; - r = sd_bus_add_match(w->bus, + r = sd_bus_add_match(w->bus, NULL, "type='signal'," "sender='org.freedesktop.miracle.wifi'," "interface='org.freedesktop.DBus.Properties'", @@ -1000,7 +1000,7 @@ static int ctl_wifi_init(struct ctl_wifi *w) if (r < 0) return r; - r = sd_bus_add_match(w->bus, + r = sd_bus_add_match(w->bus, NULL, "type='signal'," "sender='org.freedesktop.miracle.wifi'," "interface='org.freedesktop.miracle.wifi.Peer'", @@ -1014,24 +1014,7 @@ static int ctl_wifi_init(struct ctl_wifi *w) static void ctl_wifi_destroy(struct ctl_wifi *w) { - sd_bus_remove_match(w->bus, - "type='signal'," - "sender='org.freedesktop.miracle.wifi'," - "interface='org.freedesktop.miracle.wifi.Peer'", - ctl_wifi_peer_fn, - w); - sd_bus_remove_match(w->bus, - "type='signal'," - "sender='org.freedesktop.miracle.wifi'," - "interface='org.freedesktop.DBus.Properties'", - ctl_wifi_properties_fn, - w); - sd_bus_remove_match(w->bus, - "type='signal'," - "sender='org.freedesktop.miracle.wifi'," - "interface='org.freedesktop.DBus.ObjectManager'", - ctl_wifi_object_fn, - w); + } int ctl_wifi_new(struct ctl_wifi **out, sd_bus *bus) diff --git a/src/wifi/wifid-dbus.c b/src/wifi/wifid-dbus.c index a338474..5547fc1 100644 --- a/src/wifi/wifid-dbus.c +++ b/src/wifi/wifid-dbus.c @@ -817,7 +817,7 @@ int manager_dbus_connect(struct manager *m) { int r; - r = sd_bus_add_object_vtable(m->bus, + r = sd_bus_add_object_vtable(m->bus, NULL, "/org/freedesktop/miracle/wifi", "org.freedesktop.miracle.wifi.Manager", manager_dbus_vtable, @@ -825,14 +825,14 @@ int manager_dbus_connect(struct manager *m) if (r < 0) goto error; - r = sd_bus_add_node_enumerator(m->bus, + r = sd_bus_add_node_enumerator(m->bus, NULL, "/org/freedesktop/miracle/wifi", manager_dbus_enumerate, m); if (r < 0) goto error; - r = sd_bus_add_fallback_vtable(m->bus, + r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/miracle/wifi/link", "org.freedesktop.miracle.wifi.Link", link_dbus_vtable, @@ -841,7 +841,7 @@ int manager_dbus_connect(struct manager *m) if (r < 0) goto error; - r = sd_bus_add_fallback_vtable(m->bus, + r = sd_bus_add_fallback_vtable(m->bus, NULL, "/org/freedesktop/miracle/wifi/peer", "org.freedesktop.miracle.wifi.Peer", peer_dbus_vtable, @@ -850,7 +850,7 @@ int manager_dbus_connect(struct manager *m) if (r < 0) goto error; - r = sd_bus_add_object_manager(m->bus, "/org/freedesktop/miracle/wifi"); + r = sd_bus_add_object_manager(m->bus, NULL, "/org/freedesktop/miracle/wifi"); if (r < 0) goto error; @@ -876,26 +876,4 @@ void manager_dbus_disconnect(struct manager *m) return; sd_bus_release_name(m->bus, "org.freedesktop.miracle.wifi"); - sd_bus_remove_object_manager(m->bus, "/org/freedesktop/miracle/wifi"); - sd_bus_remove_fallback_vtable(m->bus, - "/org/freedesktop/miracle/wifi/peer", - "org.freedesktop.miracle.wifi.Peer", - peer_dbus_vtable, - peer_dbus_find, - m); - sd_bus_remove_fallback_vtable(m->bus, - "/org/freedesktop/miracle/wifi/link", - "org.freedesktop.miracle.wifi.Link", - link_dbus_vtable, - link_dbus_find, - m); - sd_bus_remove_node_enumerator(m->bus, - "/org/freedesktop/miracle/wifi", - manager_dbus_enumerate, - m); - sd_bus_remove_object_vtable(m->bus, - "/org/freedesktop/miracle/wifi", - "org.freedesktop.miracle.wifi.Manager", - manager_dbus_vtable, - m); } |