fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-06 12:50:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

devices: fix warning when creating bluetooth device

Browse source 
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
This commit is contained in:
Dan Winship 2013-06-06 09:05:59 -03:00
parent 8feb3878f9
commit 63ea8e5779
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/devices/nm-device-bt.c
View file

@ -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);

3
src/devices/nm-device-bt.h
View file

@ -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);

2
src/nm-manager.c
View file

@ -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,