From 63ea8e577950b129f6035316df5d8e3bf04120bf Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 6 Jun 2013 09:05:59 -0300 Subject: [PATCH] devices: fix warning when creating bluetooth device nm_device_bt_new() was trying to set NM_DEVICE_MANAGED, but that's been read-only now for a while. Fortunately, it was already trying to set it to FALSE, which is the default, so we can just remove that line. https://bugzilla.gnome.org/show_bug.cgi?id=701715 --- src/devices/nm-device-bt.c | 4 +--- src/devices/nm-device-bt.h | 3 +-- src/nm-manager.c | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/devices/nm-device-bt.c b/src/devices/nm-device-bt.c index 0abd8fb7fb..9b7744c40e 100644 --- a/src/devices/nm-device-bt.c +++ b/src/devices/nm-device-bt.c @@ -1115,8 +1115,7 @@ NMDevice * nm_device_bt_new (const char *udi, const char *bdaddr, const char *name, - guint32 capabilities, - gboolean managed) + guint32 capabilities) { g_return_val_if_fail (udi != NULL, NULL); g_return_val_if_fail (bdaddr != NULL, NULL); @@ -1130,7 +1129,6 @@ nm_device_bt_new (const char *udi, NM_DEVICE_HW_ADDRESS, bdaddr, NM_DEVICE_BT_NAME, name, NM_DEVICE_BT_CAPABILITIES, capabilities, - NM_DEVICE_MANAGED, managed, NM_DEVICE_TYPE_DESC, "Bluetooth", NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_BT, NULL); diff --git a/src/devices/nm-device-bt.h b/src/devices/nm-device-bt.h index 2be9db382e..bcc9f822bc 100644 --- a/src/devices/nm-device-bt.h +++ b/src/devices/nm-device-bt.h @@ -58,8 +58,7 @@ GType nm_device_bt_get_type (void); NMDevice *nm_device_bt_new (const char *udi, const char *bdaddr, const char *name, - guint32 capabilities, - gboolean managed); + guint32 capabilities); guint32 nm_device_bt_get_capabilities (NMDeviceBt *device); diff --git a/src/nm-manager.c b/src/nm-manager.c index 9d6de6b457..5184bf243a 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1980,7 +1980,7 @@ bluez_manager_bdaddr_added_cb (NMBluezManager *bluez_mgr, if (nm_manager_get_device_by_udi (manager, object_path)) return; - device = nm_device_bt_new (object_path, bdaddr, name, capabilities, FALSE); + device = nm_device_bt_new (object_path, bdaddr, name, capabilities); if (device) { nm_log_info (LOGD_HW, "BT device %s (%s) added (%s%s%s)", name,