summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Paulo Rechi Vita <joao.vita@gmail.com>2008-07-24 14:36:01 -0300
committerLennart Poettering <lennart@poettering.net>2008-09-11 01:12:03 +0300
commitfe8bd53e22e5f8cffe44c2d773e1f0f51360fa28 (patch)
tree96b172f070b747b5225ff8b96c281051e308805d
parent1e03c323cac98528a514d7c605a82b8b7a521a29 (diff)
Remove modargs, since module-bt-discover doesn't have any argument
-rw-r--r--src/modules/module-bt-discover.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/modules/module-bt-discover.c b/src/modules/module-bt-discover.c
index b00a9c1f..af3448b6 100644
--- a/src/modules/module-bt-discover.c
+++ b/src/modules/module-bt-discover.c
@@ -468,7 +468,6 @@ void pa__done(pa_module* m) {
}
int pa__init(pa_module* m) {
- pa_modargs *ma = NULL;
DBusError err;
struct adapter *adapter_list_i;
struct device *device_list_i;
@@ -511,15 +510,12 @@ int pa__init(pa_module* m) {
pa_log_error("Failed to add filter function");
goto fail;
}
- dbus_connection_flush(pa_dbus_connection_get(u->conn));
dbus_bus_add_match(pa_dbus_connection_get(u->conn), "type='signal',interface='org.bluez.Manager'", &err);
- dbus_connection_flush(pa_dbus_connection_get(u->conn));
if (dbus_error_is_set(&err)) {
pa_log_error("Unable to subscribe to org.bluez.Manager signals: %s: %s", err.name, err.message);
goto fail;
}
dbus_bus_add_match(pa_dbus_connection_get(u->conn), "type='signal',interface='org.bluez.Adapter'", &err);
- dbus_connection_flush(pa_dbus_connection_get(u->conn));
if (dbus_error_is_set(&err)) {
pa_log_error("Unable to subscribe to org.bluez.Adapter signals: %s: %s", err.name, err.message);
goto fail;
@@ -528,8 +524,6 @@ int pa__init(pa_module* m) {
return 0;
fail:
- if (ma)
- pa_modargs_free(ma);
dbus_error_free(&err);
pa__done(m);
return -1;