diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-03-19 12:56:41 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-03-19 12:56:41 +0100 |
commit | 97445955717468507ba70bf40dc944b1f117382e (patch) | |
tree | e5127bce7b4d4d4d6c63c345ee243fcf1005606c /src/modules | |
parent | 4ebdee5b294e23ba03d7da15a9aa51c704d38490 (diff) | |
parent | 2d903bae9a2e57f997a3d3f335379c3880f95c77 (diff) |
Merge commit '2d903bae9a2e57f997a3d3f335379c3880f95c77'
Diffstat (limited to 'src/modules')
-rw-r--r-- | src/modules/bluetooth/bluetooth-util.c | 8 | ||||
-rw-r--r-- | src/modules/bluetooth/module-bluetooth-device.c | 3 | ||||
-rw-r--r-- | src/modules/bluetooth/module-bluetooth-proximity.c | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c index dfd3a306..9e30f89a 100644 --- a/src/modules/bluetooth/bluetooth-util.c +++ b/src/modules/bluetooth/bluetooth-util.c @@ -604,7 +604,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us pa_bluetooth_device_free(d); } - return DBUS_HANDLER_RESULT_HANDLED; + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } else if (dbus_message_is_signal(m, "org.bluez.Adapter", "DeviceCreated")) { const char *path; @@ -617,7 +617,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us pa_log_debug("Device %s created", path); found_device(y, path); - return DBUS_HANDLER_RESULT_HANDLED; + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } else if (dbus_message_is_signal(m, "org.bluez.Manager", "AdapterAdded")) { const char *path; @@ -630,7 +630,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us pa_log_debug("Adapter %s created", path); found_adapter(y, path); - return DBUS_HANDLER_RESULT_HANDLED; + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } else if (dbus_message_is_signal(m, "org.bluez.Headset", "PropertyChanged") || dbus_message_is_signal(m, "org.bluez.AudioSink", "PropertyChanged") || @@ -663,7 +663,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us run_callback(y, d, TRUE); } - return DBUS_HANDLER_RESULT_HANDLED; + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } fail: diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c index 495bc82f..7d601e73 100644 --- a/src/modules/bluetooth/module-bluetooth-device.c +++ b/src/modules/bluetooth/module-bluetooth-device.c @@ -700,6 +700,9 @@ static int start_stream_fd(struct userdata *u) { pollfd->fd = u->stream_fd; pollfd->events = pollfd->revents = 0; + u->read_index = 0; + u->write_index = 0; + return 0; } diff --git a/src/modules/bluetooth/module-bluetooth-proximity.c b/src/modules/bluetooth/module-bluetooth-proximity.c index a3b525ee..c8d7b4d9 100644 --- a/src/modules/bluetooth/module-bluetooth-proximity.c +++ b/src/modules/bluetooth/module-bluetooth-proximity.c @@ -302,7 +302,7 @@ static DBusHandlerResult filter_func(DBusConnection *connection, DBusMessage *m, bonding_new(u, a); - return DBUS_HANDLER_RESULT_HANDLED; + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } else if (dbus_message_is_signal(m, "org.bluez.Adapter", "BondingRemoved")) { @@ -315,7 +315,7 @@ static DBusHandlerResult filter_func(DBusConnection *connection, DBusMessage *m, bonding_remove(u, a); - return DBUS_HANDLER_RESULT_HANDLED; + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } finish: |