mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-14 12:05:03 +00:00
bluetooth: fixes and addition of NMDeviceBt to libnm-glib
This commit is contained in:
parent
524ad83bc7
commit
1bb492935a
|
@ -32,6 +32,7 @@
|
|||
#define NM_DBUS_INTERFACE_DEVICE NM_DBUS_INTERFACE ".Device"
|
||||
#define NM_DBUS_INTERFACE_DEVICE_WIRED NM_DBUS_INTERFACE_DEVICE ".Wired"
|
||||
#define NM_DBUS_INTERFACE_DEVICE_WIRELESS NM_DBUS_INTERFACE_DEVICE ".Wireless"
|
||||
#define NM_DBUS_INTERFACE_DEVICE_BLUETOOTH NM_DBUS_INTERFACE_DEVICE ".Bluetooth"
|
||||
#define NM_DBUS_PATH_ACCESS_POINT NM_DBUS_PATH "/AccessPoint"
|
||||
#define NM_DBUS_INTERFACE_ACCESS_POINT NM_DBUS_INTERFACE ".AccessPoint"
|
||||
#define NM_DBUS_INTERFACE_SERIAL_DEVICE NM_DBUS_INTERFACE_DEVICE ".Serial"
|
||||
|
@ -142,15 +143,20 @@ typedef enum {
|
|||
NM_802_11_MODE_INFRA
|
||||
} NM80211Mode;
|
||||
|
||||
/*
|
||||
* Bluetooth device capabilities
|
||||
/**
|
||||
* NMBluetoothCapabilities:
|
||||
* @NM_BT_CAPABILITY_NONE: device has no usable capabilities
|
||||
* @NM_BT_CAPABILITY_DUN: device provides Dial-Up Networking capability
|
||||
* @NM_BT_CAPABILITY_PAN: device provides Personal Area Networking capability
|
||||
*
|
||||
* #NMBluetoothCapabilities values indicate the usable capabilities of a
|
||||
* Bluetooth device.
|
||||
*/
|
||||
enum {
|
||||
typedef enum {
|
||||
NM_BT_CAPABILITY_NONE = 0x00000000,
|
||||
NM_BT_CAPABILITY_DUN = 0x00000001,
|
||||
NM_BT_CAPABILITY_NAP = 0x00000002,
|
||||
};
|
||||
} NMBluetoothCapabilities;
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
</tp:docstring>
|
||||
</property>
|
||||
|
||||
<property name="BtCapabilities" type="u" access="read">
|
||||
<property name="BtCapabilities" type="u" access="read" tp:type="NM_BT_CAPABILITIES">
|
||||
<tp:docstring>
|
||||
Bluetooth capabilities of the device (either DUN or NAP).
|
||||
</tp:docstring>
|
||||
|
@ -29,5 +29,20 @@
|
|||
</arg>
|
||||
</signal>
|
||||
|
||||
<tp:flags name="NM_BT_CAPABILITIES" value-prefix="NM_BT_CAPABILITY" type="u">
|
||||
<tp:docstring>
|
||||
Flags describing the capabilities of a Bluetooth device.
|
||||
</tp:docstring>
|
||||
<tp:flag suffix="NONE" value="0x0">
|
||||
<tp:docstring>The device has no recognized capabilities.</tp:docstring>
|
||||
</tp:flag>
|
||||
<tp:flag suffix="DUN" value="0x1">
|
||||
<tp:docstring>The device supports Bluetooth Dial-Up Networking.</tp:docstring>
|
||||
</tp:flag>
|
||||
<tp:flag suffix="PAN" value="0x2">
|
||||
<tp:docstring>The device supports Bluetooth Personal Area Networking.</tp:docstring>
|
||||
</tp:flag>
|
||||
</tp:flags>
|
||||
|
||||
</interface>
|
||||
</node>
|
||||
|
|
|
@ -9,6 +9,7 @@ BUILT_SOURCES = \
|
|||
nm-device-bindings.h \
|
||||
nm-device-ethernet-bindings.h \
|
||||
nm-device-wifi-bindings.h \
|
||||
nm-device-bt-bindings.h \
|
||||
nm-exported-connection-glue.h \
|
||||
nm-exported-connection-bindings.h \
|
||||
nm-settings-glue.h \
|
||||
|
@ -37,6 +38,7 @@ libnminclude_HEADERS = \
|
|||
nm-device.h \
|
||||
nm-device-ethernet.h \
|
||||
nm-device-wifi.h \
|
||||
nm-device-bt.h \
|
||||
nm-access-point.h \
|
||||
nm-ip4-config.h \
|
||||
nm-settings.h \
|
||||
|
@ -64,6 +66,7 @@ libnm_glib_la_SOURCES = \
|
|||
nm-device-private.h \
|
||||
nm-device-ethernet.c \
|
||||
nm-device-wifi.c \
|
||||
nm-device-bt.c \
|
||||
nm-access-point.c \
|
||||
nm-ip4-config.c \
|
||||
nm-settings.c \
|
||||
|
@ -118,6 +121,9 @@ nm-device-ethernet-bindings.h: $(top_srcdir)/introspection/nm-device-ethernet.xm
|
|||
nm-device-wifi-bindings.h: $(top_srcdir)/introspection/nm-device-wifi.xml
|
||||
dbus-binding-tool --prefix=nm_device_wifi --mode=glib-client --output=$@ $<
|
||||
|
||||
nm-device-bt-bindings.h: $(top_srcdir)/introspection/nm-device-bt.xml
|
||||
dbus-binding-tool --prefix=nm_device_bt --mode=glib-client --output=$@ $<
|
||||
|
||||
nm-access-point-bindings.h: $(top_srcdir)/introspection/nm-access-point.xml
|
||||
dbus-binding-tool --prefix=nm_access_point --mode=glib-client --output=$@ $<
|
||||
|
||||
|
|
|
@ -50,6 +50,11 @@ global:
|
|||
nm_dbus_settings_system_get_type;
|
||||
nm_dbus_settings_system_get_unmanaged_devices;
|
||||
nm_dbus_settings_system_new;
|
||||
nm_device_bt_new;
|
||||
nm_device_bt_get_capabilities;
|
||||
nm_device_bt_get_hw_address;
|
||||
nm_device_bt_get_name;
|
||||
nm_device_bt_get_type;
|
||||
nm_device_ethernet_get_carrier;
|
||||
nm_device_ethernet_get_hw_address;
|
||||
nm_device_ethernet_get_speed;
|
||||
|
|
307
libnm-glib/nm-device-bt.c
Normal file
307
libnm-glib/nm-device-bt.c
Normal file
|
@ -0,0 +1,307 @@
|
|||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
||||
/*
|
||||
* libnm_glib -- Access network status & information from glib applications
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
* Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Copyright (C) 2007 - 2008 Novell, Inc.
|
||||
* Copyright (C) 2007 - 2009 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-device-bt.h"
|
||||
#include "nm-device-private.h"
|
||||
#include "nm-object-private.h"
|
||||
|
||||
#include "nm-device-bt-bindings.h"
|
||||
|
||||
G_DEFINE_TYPE (NMDeviceBt, nm_device_bt, NM_TYPE_DEVICE)
|
||||
|
||||
#define NM_DEVICE_BT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_BT, NMDeviceBtPrivate))
|
||||
|
||||
typedef struct {
|
||||
DBusGProxy *proxy;
|
||||
|
||||
char *hw_address;
|
||||
char *name;
|
||||
guint32 bt_capabilities;
|
||||
gboolean bt_capabilities_valid;
|
||||
|
||||
gboolean disposed;
|
||||
} NMDeviceBtPrivate;
|
||||
|
||||
enum {
|
||||
PROP_0,
|
||||
PROP_HW_ADDRESS,
|
||||
PROP_NAME,
|
||||
PROP_BT_CAPABILITIES,
|
||||
|
||||
LAST_PROP
|
||||
};
|
||||
|
||||
#define DBUS_PROP_HW_ADDRESS "HwAddress"
|
||||
#define DBUS_PROP_NAME "Name"
|
||||
#define DBUS_PROP_BT_CAPABILITIES "BtCapabilities"
|
||||
|
||||
/**
|
||||
* nm_device_bt_new:
|
||||
* @connection: the #DBusGConnection
|
||||
* @path: the DBus object path of the device
|
||||
*
|
||||
* Creates a new #NMDeviceBt.
|
||||
*
|
||||
* Returns: a new device
|
||||
**/
|
||||
GObject *
|
||||
nm_device_bt_new (DBusGConnection *connection, const char *path)
|
||||
{
|
||||
g_return_val_if_fail (connection != NULL, NULL);
|
||||
g_return_val_if_fail (path != NULL, NULL);
|
||||
|
||||
return g_object_new (NM_TYPE_DEVICE_BT,
|
||||
NM_OBJECT_DBUS_CONNECTION, connection,
|
||||
NM_OBJECT_DBUS_PATH, path,
|
||||
NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* nm_device_bt_get_hw_address:
|
||||
* @device: a #NMDeviceBt
|
||||
*
|
||||
* Gets the hardware (MAC) address of the #NMDeviceBt
|
||||
*
|
||||
* Returns: the hardware address. This is the internal string used by the
|
||||
* device, and must not be modified.
|
||||
**/
|
||||
const char *
|
||||
nm_device_bt_get_hw_address (NMDeviceBt *device)
|
||||
{
|
||||
NMDeviceBtPrivate *priv;
|
||||
|
||||
g_return_val_if_fail (NM_IS_DEVICE_BT (device), NULL);
|
||||
|
||||
priv = NM_DEVICE_BT_GET_PRIVATE (device);
|
||||
if (!priv->hw_address) {
|
||||
priv->hw_address = _nm_object_get_string_property (NM_OBJECT (device),
|
||||
NM_DBUS_INTERFACE_DEVICE_WIRED,
|
||||
DBUS_PROP_HW_ADDRESS);
|
||||
}
|
||||
|
||||
return priv->hw_address;
|
||||
}
|
||||
|
||||
/**
|
||||
* nm_device_bt_get_name:
|
||||
* @device: a #NMDeviceBt
|
||||
*
|
||||
* Gets the name of the #NMDeviceBt.
|
||||
*
|
||||
* Returns: the name of the device
|
||||
**/
|
||||
const char *
|
||||
nm_device_bt_get_name (NMDeviceBt *device)
|
||||
{
|
||||
NMDeviceBtPrivate *priv;
|
||||
|
||||
g_return_val_if_fail (NM_IS_DEVICE_BT (device), NULL);
|
||||
|
||||
priv = NM_DEVICE_BT_GET_PRIVATE (device);
|
||||
if (!priv->name) {
|
||||
priv->name = _nm_object_get_string_property (NM_OBJECT (device),
|
||||
NM_DBUS_INTERFACE_DEVICE_BLUETOOTH,
|
||||
DBUS_PROP_NAME);
|
||||
}
|
||||
|
||||
return priv->name;
|
||||
}
|
||||
|
||||
/**
|
||||
* nm_device_bt_get_capabilities:
|
||||
* @device: a #NMDeviceBt
|
||||
*
|
||||
* Returns the Bluetooth device's usable capabilities.
|
||||
*
|
||||
* Returns: a combination of #NMBluetoothCapabilities
|
||||
**/
|
||||
NMBluetoothCapabilities
|
||||
nm_device_bt_get_capabilities (NMDeviceBt *device)
|
||||
{
|
||||
NMDeviceBtPrivate *priv;
|
||||
|
||||
g_return_val_if_fail (NM_IS_DEVICE_BT (device), NM_BT_CAPABILITY_NONE);
|
||||
|
||||
priv = NM_DEVICE_BT_GET_PRIVATE (device);
|
||||
if (!priv->bt_capabilities_valid) {
|
||||
priv->bt_capabilities = _nm_object_get_uint_property (NM_OBJECT (device),
|
||||
NM_DBUS_INTERFACE_DEVICE_BLUETOOTH,
|
||||
DBUS_PROP_BT_CAPABILITIES);
|
||||
priv->bt_capabilities_valid = TRUE;
|
||||
}
|
||||
|
||||
return priv->bt_capabilities;
|
||||
}
|
||||
|
||||
static void
|
||||
nm_device_bt_init (NMDeviceBt *device)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
register_for_property_changed (NMDeviceBt *device)
|
||||
{
|
||||
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
|
||||
const NMPropertiesChangedInfo property_changed_info[] = {
|
||||
{ NM_DEVICE_BT_HW_ADDRESS, _nm_object_demarshal_generic, &priv->hw_address },
|
||||
{ NM_DEVICE_BT_NAME, _nm_object_demarshal_generic, &priv->name },
|
||||
{ NM_DEVICE_BT_CAPABILITIES, _nm_object_demarshal_generic, &priv->bt_capabilities },
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
_nm_object_handle_properties_changed (NM_OBJECT (device),
|
||||
priv->proxy,
|
||||
property_changed_info);
|
||||
}
|
||||
|
||||
static GObject*
|
||||
constructor (GType type,
|
||||
guint n_construct_params,
|
||||
GObjectConstructParam *construct_params)
|
||||
{
|
||||
GObject *object;
|
||||
|
||||
object = G_OBJECT_CLASS (nm_device_bt_parent_class)->constructor (type,
|
||||
n_construct_params,
|
||||
construct_params);
|
||||
if (object) {
|
||||
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (object);
|
||||
|
||||
priv->proxy = dbus_g_proxy_new_for_name (nm_object_get_connection (NM_OBJECT (object)),
|
||||
NM_DBUS_SERVICE,
|
||||
nm_object_get_path (NM_OBJECT (object)),
|
||||
NM_DBUS_INTERFACE_DEVICE_BLUETOOTH);
|
||||
|
||||
register_for_property_changed (NM_DEVICE_BT (object));
|
||||
}
|
||||
|
||||
return object;
|
||||
}
|
||||
|
||||
static void
|
||||
dispose (GObject *object)
|
||||
{
|
||||
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (object);
|
||||
|
||||
if (priv->disposed) {
|
||||
G_OBJECT_CLASS (nm_device_bt_parent_class)->dispose (object);
|
||||
return;
|
||||
}
|
||||
priv->disposed = TRUE;
|
||||
|
||||
g_object_unref (priv->proxy);
|
||||
|
||||
G_OBJECT_CLASS (nm_device_bt_parent_class)->dispose (object);
|
||||
}
|
||||
|
||||
static void
|
||||
finalize (GObject *object)
|
||||
{
|
||||
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (object);
|
||||
|
||||
g_free (priv->hw_address);
|
||||
g_free (priv->name);
|
||||
|
||||
G_OBJECT_CLASS (nm_device_bt_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
static void
|
||||
get_property (GObject *object,
|
||||
guint prop_id,
|
||||
GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
NMDeviceBt *device = NM_DEVICE_BT (object);
|
||||
|
||||
switch (prop_id) {
|
||||
case PROP_HW_ADDRESS:
|
||||
g_value_set_string (value, nm_device_bt_get_hw_address (device));
|
||||
break;
|
||||
case PROP_NAME:
|
||||
g_value_set_string (value, nm_device_bt_get_name (device));
|
||||
break;
|
||||
case PROP_BT_CAPABILITIES:
|
||||
g_value_set_uint (value, nm_device_bt_get_capabilities (device));
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
nm_device_bt_class_init (NMDeviceBtClass *device_class)
|
||||
{
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (device_class);
|
||||
|
||||
g_type_class_add_private (device_class, sizeof (NMDeviceBtPrivate));
|
||||
|
||||
/* virtual methods */
|
||||
object_class->constructor = constructor;
|
||||
object_class->dispose = dispose;
|
||||
object_class->finalize = finalize;
|
||||
object_class->get_property = get_property;
|
||||
|
||||
/* properties */
|
||||
|
||||
/**
|
||||
* NMDeviceBt:hw-address:
|
||||
*
|
||||
* The hardware (MAC) address of the device.
|
||||
**/
|
||||
g_object_class_install_property
|
||||
(object_class, PROP_HW_ADDRESS,
|
||||
g_param_spec_string (NM_DEVICE_BT_HW_ADDRESS,
|
||||
"MAC Address",
|
||||
"Hardware MAC address",
|
||||
NULL,
|
||||
G_PARAM_READABLE));
|
||||
|
||||
/**
|
||||
* NMDeviceBt:name:
|
||||
*
|
||||
* The name of the bluetooth device.
|
||||
**/
|
||||
g_object_class_install_property
|
||||
(object_class, PROP_NAME,
|
||||
g_param_spec_string (NM_DEVICE_BT_NAME,
|
||||
"Name",
|
||||
"Device name",
|
||||
NULL,
|
||||
G_PARAM_READABLE));
|
||||
|
||||
/**
|
||||
* NMDeviceBt:bt-capabilities:
|
||||
*
|
||||
* The device's bluetooth capabilities, a combination of #NMBluetoothCapabilities.
|
||||
**/
|
||||
g_object_class_install_property
|
||||
(object_class, PROP_BT_CAPABILITIES,
|
||||
g_param_spec_uint (NM_DEVICE_BT_CAPABILITIES,
|
||||
"BtCapabilities",
|
||||
"Bluetooth capabilities",
|
||||
NM_BT_CAPABILITY_NONE, G_MAXUINT32, NM_BT_CAPABILITY_NONE,
|
||||
G_PARAM_READABLE));
|
||||
|
||||
}
|
||||
|
63
libnm-glib/nm-device-bt.h
Normal file
63
libnm-glib/nm-device-bt.h
Normal file
|
@ -0,0 +1,63 @@
|
|||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
||||
/*
|
||||
* libnm_glib -- Access network status & information from glib applications
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
* Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Copyright (C) 2008 - 2009 Red Hat, Inc.
|
||||
* Copyright (C) 2008 Novell, Inc.
|
||||
*/
|
||||
|
||||
#ifndef NM_DEVICE_BT_H
|
||||
#define NM_DEVICE_BT_H
|
||||
|
||||
#include "NetworkManager.h"
|
||||
#include "nm-device.h"
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define NM_TYPE_DEVICE_BT (nm_device_bt_get_type ())
|
||||
#define NM_DEVICE_BT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_BT, NMDeviceBt))
|
||||
#define NM_DEVICE_BT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_BT, NMDeviceBtClass))
|
||||
#define NM_IS_DEVICE_BT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_BT))
|
||||
#define NM_IS_DEVICE_BT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DEVICE_BT))
|
||||
#define NM_DEVICE_BT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_BT, NMDeviceBtClass))
|
||||
|
||||
#define NM_DEVICE_BT_HW_ADDRESS "hw-address"
|
||||
#define NM_DEVICE_BT_NAME "name"
|
||||
#define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
|
||||
|
||||
typedef struct {
|
||||
NMDevice parent;
|
||||
} NMDeviceBt;
|
||||
|
||||
typedef struct {
|
||||
NMDeviceClass parent;
|
||||
} NMDeviceBtClass;
|
||||
|
||||
GType nm_device_bt_get_type (void);
|
||||
|
||||
GObject *nm_device_bt_new (DBusGConnection *connection, const char *path);
|
||||
|
||||
const char *nm_device_bt_get_hw_address (NMDeviceBt *device);
|
||||
|
||||
const char *nm_device_bt_get_name (NMDeviceBt *device);
|
||||
|
||||
NMBluetoothCapabilities nm_device_bt_get_capabilities (NMDeviceBt *device);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* NM_DEVICE_BT_H */
|
|
@ -31,6 +31,7 @@
|
|||
#include "nm-device-wifi.h"
|
||||
#include "nm-gsm-device.h"
|
||||
#include "nm-cdma-device.h"
|
||||
#include "nm-device-bt.h"
|
||||
#include "nm-device.h"
|
||||
#include "nm-device-private.h"
|
||||
#include "nm-object-private.h"
|
||||
|
@ -555,6 +556,9 @@ nm_device_new (DBusGConnection *connection, const char *path)
|
|||
case NM_DEVICE_TYPE_CDMA:
|
||||
dtype = NM_TYPE_CDMA_DEVICE;
|
||||
break;
|
||||
case NM_DEVICE_TYPE_BT:
|
||||
dtype = NM_TYPE_DEVICE_BT;
|
||||
break;
|
||||
default:
|
||||
g_warning ("Unknown device type %d", g_value_get_uint (&value));
|
||||
break;
|
||||
|
|
|
@ -34,7 +34,7 @@ G_BEGIN_DECLS
|
|||
|
||||
#define NM_DEVICE_BT_HW_ADDRESS "hw-address"
|
||||
#define NM_DEVICE_BT_NAME "name"
|
||||
#define NM_DEVICE_BT_CAPABILITIES "capabilities"
|
||||
#define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
|
||||
|
||||
typedef struct {
|
||||
NMDevice parent;
|
||||
|
|
|
@ -1329,10 +1329,11 @@ bluez_manager_bdaddr_added_cb (NMBluezManager *bluez_mgr,
|
|||
if (!bluez_manager_find_connection (manager, bdaddr, capabilities))
|
||||
return;
|
||||
|
||||
device = nm_device_bt_new (object_path, bdaddr, name, capabilities, TRUE);
|
||||
device = nm_device_bt_new (object_path, bdaddr, name, capabilities, FALSE);
|
||||
if (device) {
|
||||
g_message ("%s: BT device %s added (%s%s%s)",
|
||||
g_message ("%s: BT device %s (%s) added (%s%s%s)",
|
||||
__func__,
|
||||
name,
|
||||
bdaddr,
|
||||
has_dun ? "DUN" : "",
|
||||
has_dun && has_nap ? " " : "",
|
||||
|
@ -2508,11 +2509,9 @@ dispose (GObject *object)
|
|||
free_get_secrets_info (info);
|
||||
}
|
||||
|
||||
g_message ("%s: priv->devices %p (length %d)", __func__, priv->devices, g_slist_length (priv->devices));
|
||||
while (g_slist_length (priv->devices)) {
|
||||
NMDevice *device = NM_DEVICE (priv->devices->data);
|
||||
|
||||
g_message ("%s: candidate %p", __func__, device);
|
||||
priv->devices = remove_one_device (manager, priv->devices, device);
|
||||
}
|
||||
|
||||
|
|
|
@ -37,6 +37,7 @@
|
|||
#include <nm-device-wifi.h>
|
||||
#include <nm-gsm-device.h>
|
||||
#include <nm-cdma-device.h>
|
||||
#include <nm-device-bt.h>
|
||||
#include <nm-utils.h>
|
||||
#include <nm-setting-ip4-config.h>
|
||||
#include <nm-vpn-connection.h>
|
||||
|
@ -307,6 +308,8 @@ detail_device (gpointer data, gpointer user_data)
|
|||
print_string ("Type", "Mobile Broadband (GSM)");
|
||||
else if (NM_IS_CDMA_DEVICE (device))
|
||||
print_string ("Type", "Mobile Broadband (CDMA)");
|
||||
else if (NM_IS_DEVICE_BT (device))
|
||||
print_string ("Type", "Bluetooth");
|
||||
|
||||
print_string ("Driver", nm_device_get_driver (device) ? nm_device_get_driver (device) : "(unknown)");
|
||||
|
||||
|
|
Loading…
Reference in a new issue