From c1c0390313d33b20ba4e9ceba508c07e024a7a7d Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 10 Dec 2012 13:28:46 +0200 Subject: [PATCH] core: Remove useless device_is_creating function --- src/device.c | 26 -------------------------- src/device.h | 1 - 2 files changed, 27 deletions(-) diff --git a/src/device.c b/src/device.c index b8f6801a1..419bf9b0b 100644 --- a/src/device.c +++ b/src/device.c @@ -329,9 +329,6 @@ static void browse_request_cancel(struct browse_req *req) struct btd_device *device = req->device; struct btd_adapter *adapter = device->adapter; - if (device_is_creating(device, NULL)) - device_set_temporary(device, TRUE); - bt_cancel_discovery(adapter_get_address(adapter), &device->bdaddr); attio_cleanup(device); @@ -3473,29 +3470,6 @@ void device_bonding_complete(struct btd_device *device, uint8_t status) } } -gboolean device_is_creating(struct btd_device *device, const char *sender) -{ - DBusMessage *msg; - - if (device->bonding && device->bonding->msg) - msg = device->bonding->msg; - else if (device->browse && device->browse->msg) - msg = device->browse->msg; - else - return FALSE; - - if (!dbus_message_is_method_call(msg, ADAPTER_INTERFACE, - "CreatePairedDevice") && - !dbus_message_is_method_call(msg, ADAPTER_INTERFACE, - "CreateDevice")) - return FALSE; - - if (sender == NULL) - return TRUE; - - return g_str_equal(sender, dbus_message_get_sender(msg)); -} - gboolean device_is_bonding(struct btd_device *device, const char *sender) { struct bonding_req *bonding = device->bonding; diff --git a/src/device.h b/src/device.h index 33f8f31b1..5e173bd59 100644 --- a/src/device.h +++ b/src/device.h @@ -73,7 +73,6 @@ void device_set_rssi(struct btd_device *device, int8_t rssi); void device_set_auto_connect(struct btd_device *device, gboolean enable); gboolean device_is_connected(struct btd_device *device); void device_bonding_complete(struct btd_device *device, uint8_t status); -gboolean device_is_creating(struct btd_device *device, const char *sender); gboolean device_is_bonding(struct btd_device *device, const char *sender); void device_cancel_bonding(struct btd_device *device, uint8_t status); int device_request_pincode(struct btd_device *device, gboolean secure); -- 2.47.3