korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-26 05:34:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: Remove DisconnectRequested signal

Browse Source 
This signal is not needed anymore thanks to the RequestDisconnect
callback of the Profile interface.
This commit is contained in:
Johan Hedberg 2012-12-18 12:28:09 +02:00
parent 2beb4eeda3
commit 1da5a89a6f
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/device-api.txt
View File

@ -38,12 +38,6 @@ Methods void Connect()
this method should be restricted to administrator
use.
A DisconnectRequested signal will be sent and the
actual disconnection will only happen 2 seconds later.
This enables upper-level applications to terminate
their connections gracefully before the ACL connection
is terminated.
Possible errors: org.bluez.Error.NotConnected
void ConnectProfile(string uuid)
@ -95,12 +89,6 @@ Methods void Connect()
This method can be used to cancel a pairing
operation initiated by the Pair method.
Signals DisconnectRequested()
This signal will be sent when a low level
disconnection to a remote device has been requested.
The actual disconnection will happen 2 seconds later.
Properties string Address [readonly]
The Bluetooth device address of the remote device.

12
src/device.c
View File

@ -1072,11 +1072,6 @@ void device_request_disconnect(struct btd_device *device, DBusMessage *msg)
device->disconn_timer = g_timeout_add_seconds(DISCONNECT_TIMER,
do_disconnect, device);
g_dbus_emit_signal(btd_get_dbus_connection(),
device->path,
DEVICE_INTERFACE, "DisconnectRequested",
DBUS_TYPE_INVALID);
}
static DBusMessage *disconnect(DBusConnection *conn, DBusMessage *msg,
@ -1516,11 +1511,6 @@ static const GDBusMethodTable device_methods[] = {
{ }
};
static const GDBusSignalTable device_signals[] = {
{ GDBUS_SIGNAL("DisconnectRequested", NULL) },
{ }
};
static const GDBusPropertyTable device_properties[] = {
{ "Address", "s", dev_property_get_address },
{ "Name", "s", dev_property_get_name, NULL, dev_property_exists_name },
@ -1960,7 +1950,7 @@ static struct btd_device *device_new(struct btd_adapter *adapter,
if (g_dbus_register_interface(btd_get_dbus_connection(),
device->path, DEVICE_INTERFACE,
device_methods, device_signals,
device_methods, NULL,
device_properties, device,
device_free) == FALSE) {
device_free(device);