Remove modargs, since module-bt-discover doesn't have any argument

This commit is contained in:
João Paulo Rechi Vita 2008-07-24 14:36:01 -03:00 committed by Lennart Poettering
parent 1e03c323ca
commit fe8bd53e22

View file

@ -468,7 +468,6 @@ void pa__done(pa_module* m) {
} }
int pa__init(pa_module* m) { int pa__init(pa_module* m) {
pa_modargs *ma = NULL;
DBusError err; DBusError err;
struct adapter *adapter_list_i; struct adapter *adapter_list_i;
struct device *device_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"); pa_log_error("Failed to add filter function");
goto fail; 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_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)) { if (dbus_error_is_set(&err)) {
pa_log_error("Unable to subscribe to org.bluez.Manager signals: %s: %s", err.name, err.message); pa_log_error("Unable to subscribe to org.bluez.Manager signals: %s: %s", err.name, err.message);
goto fail; goto fail;
} }
dbus_bus_add_match(pa_dbus_connection_get(u->conn), "type='signal',interface='org.bluez.Adapter'", &err); 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)) { if (dbus_error_is_set(&err)) {
pa_log_error("Unable to subscribe to org.bluez.Adapter signals: %s: %s", err.name, err.message); pa_log_error("Unable to subscribe to org.bluez.Adapter signals: %s: %s", err.name, err.message);
goto fail; goto fail;
@ -528,8 +524,6 @@ int pa__init(pa_module* m) {
return 0; return 0;
fail: fail:
if (ma)
pa_modargs_free(ma);
dbus_error_free(&err); dbus_error_free(&err);
pa__done(m); pa__done(m);
return -1; return -1;