external/miraclecast
1
0
Fork 0
mirror of https://github.com/albfan/miraclecast.git synced 2025-03-09 23:38:56 +00:00
Code Issues Releases Wiki Activity

dbus: update to systemd API >=213

Browse source 
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>
This commit is contained in:
Andrey Gusakov 2014-06-23 07:48:55 +04:00 • committed by David Herrmann
parent 3dcb89e98b
commit 97323d905c
2 changed files with 9 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/ctl/ctl-wifi.c
View file

@ -982,7 +982,7 @@ static int ctl_wifi_init(struct ctl_wifi *w)
{ {
int r; int r;
r = sd_bus_add_match(w->bus, r = sd_bus_add_match(w->bus, NULL,
"type='signal'," "type='signal',"
"sender='org.freedesktop.miracle.wifi'," "sender='org.freedesktop.miracle.wifi',"
"interface='org.freedesktop.DBus.ObjectManager'", "interface='org.freedesktop.DBus.ObjectManager'",
@ -991,7 +991,7 @@ static int ctl_wifi_init(struct ctl_wifi *w)
if (r < 0) if (r < 0)
return r; return r;
r = sd_bus_add_match(w->bus, r = sd_bus_add_match(w->bus, NULL,
"type='signal'," "type='signal',"
"sender='org.freedesktop.miracle.wifi'," "sender='org.freedesktop.miracle.wifi',"
"interface='org.freedesktop.DBus.Properties'", "interface='org.freedesktop.DBus.Properties'",
@ -1000,7 +1000,7 @@ static int ctl_wifi_init(struct ctl_wifi *w)
if (r < 0) if (r < 0)
return r; return r;
r = sd_bus_add_match(w->bus, r = sd_bus_add_match(w->bus, NULL,
"type='signal'," "type='signal',"
"sender='org.freedesktop.miracle.wifi'," "sender='org.freedesktop.miracle.wifi',"
"interface='org.freedesktop.miracle.wifi.Peer'", "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) 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) int ctl_wifi_new(struct ctl_wifi **out, sd_bus *bus)

32
src/wifi/wifid-dbus.c
View file

@ -817,7 +817,7 @@ int manager_dbus_connect(struct manager *m)
{ {
int r; 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",
"org.freedesktop.miracle.wifi.Manager", "org.freedesktop.miracle.wifi.Manager",
manager_dbus_vtable, manager_dbus_vtable,
@ -825,14 +825,14 @@ int manager_dbus_connect(struct manager *m)
if (r < 0) if (r < 0)
goto error; goto error;
r = sd_bus_add_node_enumerator(m->bus, r = sd_bus_add_node_enumerator(m->bus, NULL,
"/org/freedesktop/miracle/wifi", "/org/freedesktop/miracle/wifi",
manager_dbus_enumerate, manager_dbus_enumerate,
m); m);
if (r < 0) if (r < 0)
goto error; 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",
"org.freedesktop.miracle.wifi.Link", "org.freedesktop.miracle.wifi.Link",
link_dbus_vtable, link_dbus_vtable,
@ -841,7 +841,7 @@ int manager_dbus_connect(struct manager *m)
if (r < 0) if (r < 0)
goto error; 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",
"org.freedesktop.miracle.wifi.Peer", "org.freedesktop.miracle.wifi.Peer",
peer_dbus_vtable, peer_dbus_vtable,
@ -850,7 +850,7 @@ int manager_dbus_connect(struct manager *m)
if (r < 0) if (r < 0)
goto error; 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) if (r < 0)
goto error; goto error;
@ -876,26 +876,4 @@ void manager_dbus_disconnect(struct manager *m)
return; return;
sd_bus_release_name(m->bus, "org.freedesktop.miracle.wifi"); 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);
} }