diff options
author | Thomas Haller <thaller@redhat.com> | 2013-10-02 23:41:57 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2013-10-18 19:56:37 +0200 |
commit | ef8501096fd7a458f14c0fb36fbdf3c592b6c957 (patch) | |
tree | dd71c4ff63f551cf8926c16f20d640eca0fd0b7e | |
parent | e8e8031676e724a6ccc0ecbdc96b6d59bd5c92f2 (diff) | |
download | NetworkManager-ef8501096fd7a458f14c0fb36fbdf3c592b6c957.tar.gz |
bluez: rename BlueZ 4 adapter to make the BlueZ version explicit
Signed-off-by: Thomas Haller <thaller@redhat.com>
-rw-r--r-- | src/bluez-manager/nm-bluez-manager.c | 2 | ||||
-rw-r--r-- | src/bluez-manager/nm-bluez4-adapter.c | 98 | ||||
-rw-r--r-- | src/bluez-manager/nm-bluez4-adapter.h | 46 | ||||
-rw-r--r-- | src/bluez-manager/nm-bluez4-manager.c | 24 |
4 files changed, 85 insertions, 85 deletions
diff --git a/src/bluez-manager/nm-bluez-manager.c b/src/bluez-manager/nm-bluez-manager.c index 974a772a54..2dd050a249 100644 --- a/src/bluez-manager/nm-bluez-manager.c +++ b/src/bluez-manager/nm-bluez-manager.c @@ -354,7 +354,7 @@ nm_bluez_manager_get (NMConnectionProvider *provider) singleton = (NMBluezManager *) g_object_new (NM_TYPE_BLUEZ_MANAGER, NULL); g_assert (singleton); - /* Cache the connection provider for NMBluezAdapter objects */ + /* Cache the connection provider */ NM_BLUEZ_MANAGER_GET_PRIVATE (singleton)->provider = provider; return singleton; diff --git a/src/bluez-manager/nm-bluez4-adapter.c b/src/bluez-manager/nm-bluez4-adapter.c index 295ddda723..fe72f0c686 100644 --- a/src/bluez-manager/nm-bluez4-adapter.c +++ b/src/bluez-manager/nm-bluez4-adapter.c @@ -30,9 +30,9 @@ #include "nm-logging.h" -G_DEFINE_TYPE (NMBluezAdapter, nm_bluez_adapter, G_TYPE_OBJECT) +G_DEFINE_TYPE (NMBluez4Adapter, nm_bluez4_adapter, G_TYPE_OBJECT) -#define NM_BLUEZ_ADAPTER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_BLUEZ_ADAPTER, NMBluezAdapterPrivate)) +#define NM_BLUEZ4_ADAPTER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_BLUEZ4_ADAPTER, NMBluez4AdapterPrivate)) typedef struct { char *path; @@ -44,7 +44,7 @@ typedef struct { /* Cached for devices */ NMConnectionProvider *provider; -} NMBluezAdapterPrivate; +} NMBluez4AdapterPrivate; enum { @@ -65,37 +65,37 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; const char * -nm_bluez_adapter_get_path (NMBluezAdapter *self) +nm_bluez4_adapter_get_path (NMBluez4Adapter *self) { - g_return_val_if_fail (NM_IS_BLUEZ_ADAPTER (self), NULL); + g_return_val_if_fail (NM_IS_BLUEZ4_ADAPTER (self), NULL); - return NM_BLUEZ_ADAPTER_GET_PRIVATE (self)->path; + return NM_BLUEZ4_ADAPTER_GET_PRIVATE (self)->path; } const char * -nm_bluez_adapter_get_address (NMBluezAdapter *self) +nm_bluez4_adapter_get_address (NMBluez4Adapter *self) { - g_return_val_if_fail (NM_IS_BLUEZ_ADAPTER (self), NULL); + g_return_val_if_fail (NM_IS_BLUEZ4_ADAPTER (self), NULL); - return NM_BLUEZ_ADAPTER_GET_PRIVATE (self)->address; + return NM_BLUEZ4_ADAPTER_GET_PRIVATE (self)->address; } gboolean -nm_bluez_adapter_get_initialized (NMBluezAdapter *self) +nm_bluez4_adapter_get_initialized (NMBluez4Adapter *self) { - g_return_val_if_fail (NM_IS_BLUEZ_ADAPTER (self), FALSE); + g_return_val_if_fail (NM_IS_BLUEZ4_ADAPTER (self), FALSE); - return NM_BLUEZ_ADAPTER_GET_PRIVATE (self)->initialized; + return NM_BLUEZ4_ADAPTER_GET_PRIVATE (self)->initialized; } GSList * -nm_bluez_adapter_get_devices (NMBluezAdapter *self) +nm_bluez4_adapter_get_devices (NMBluez4Adapter *self) { GSList *devices = NULL; GHashTableIter iter; NMBluezDevice *device; - g_hash_table_iter_init (&iter, NM_BLUEZ_ADAPTER_GET_PRIVATE (self)->devices); + g_hash_table_iter_init (&iter, NM_BLUEZ4_ADAPTER_GET_PRIVATE (self)->devices); while (g_hash_table_iter_next (&iter, NULL, (gpointer) &device)) { if (nm_bluez_device_get_usable (device)) devices = g_slist_append (devices, device); @@ -106,7 +106,7 @@ nm_bluez_adapter_get_devices (NMBluezAdapter *self) static void device_usable (NMBluezDevice *device, GParamSpec *pspec, gpointer user_data) { - NMBluezAdapter *self = NM_BLUEZ_ADAPTER (user_data); + NMBluez4Adapter *self = NM_BLUEZ4_ADAPTER (user_data); gboolean usable = nm_bluez_device_get_usable (device); nm_log_dbg (LOGD_BT, "(%s): bluez device now %s", @@ -125,8 +125,8 @@ device_usable (NMBluezDevice *device, GParamSpec *pspec, gpointer user_data) static void device_initialized (NMBluezDevice *device, gboolean success, gpointer user_data) { - NMBluezAdapter *self = NM_BLUEZ_ADAPTER (user_data); - NMBluezAdapterPrivate *priv = NM_BLUEZ_ADAPTER_GET_PRIVATE (self); + NMBluez4Adapter *self = NM_BLUEZ4_ADAPTER (user_data); + NMBluez4AdapterPrivate *priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (self); nm_log_dbg (LOGD_BT, "(%s): bluez device %s", nm_bluez_device_get_path (device), @@ -138,8 +138,8 @@ device_initialized (NMBluezDevice *device, gboolean success, gpointer user_data) static void device_created (DBusGProxy *proxy, const char *path, gpointer user_data) { - NMBluezAdapter *self = NM_BLUEZ_ADAPTER (user_data); - NMBluezAdapterPrivate *priv = NM_BLUEZ_ADAPTER_GET_PRIVATE (self); + NMBluez4Adapter *self = NM_BLUEZ4_ADAPTER (user_data); + NMBluez4AdapterPrivate *priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (self); NMBluezDevice *device; device = nm_bluez_device_new (path, priv->provider, 4); @@ -153,8 +153,8 @@ device_created (DBusGProxy *proxy, const char *path, gpointer user_data) static void device_removed (DBusGProxy *proxy, const char *path, gpointer user_data) { - NMBluezAdapter *self = NM_BLUEZ_ADAPTER (user_data); - NMBluezAdapterPrivate *priv = NM_BLUEZ_ADAPTER_GET_PRIVATE (self); + NMBluez4Adapter *self = NM_BLUEZ4_ADAPTER (user_data); + NMBluez4AdapterPrivate *priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (self); NMBluezDevice *device; nm_log_dbg (LOGD_BT, "(%s): bluez device removed", path); @@ -172,8 +172,8 @@ device_removed (DBusGProxy *proxy, const char *path, gpointer user_data) static void get_properties_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data) { - NMBluezAdapter *self = NM_BLUEZ_ADAPTER (user_data); - NMBluezAdapterPrivate *priv = NM_BLUEZ_ADAPTER_GET_PRIVATE (self); + NMBluez4Adapter *self = NM_BLUEZ4_ADAPTER (user_data); + NMBluez4AdapterPrivate *priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (self); GHashTable *properties = NULL; GError *err = NULL; GValue *value; @@ -207,9 +207,9 @@ done: } static void -query_properties (NMBluezAdapter *self) +query_properties (NMBluez4Adapter *self) { - NMBluezAdapterPrivate *priv = NM_BLUEZ_ADAPTER_GET_PRIVATE (self); + NMBluez4AdapterPrivate *priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (self); DBusGProxyCall *call; call = dbus_g_proxy_begin_call (priv->proxy, "GetProperties", @@ -224,20 +224,20 @@ query_properties (NMBluezAdapter *self) /***********************************************************/ -NMBluezAdapter * -nm_bluez_adapter_new (const char *path, NMConnectionProvider *provider) +NMBluez4Adapter * +nm_bluez4_adapter_new (const char *path, NMConnectionProvider *provider) { - NMBluezAdapter *self; - NMBluezAdapterPrivate *priv; + NMBluez4Adapter *self; + NMBluez4AdapterPrivate *priv; DBusGConnection *connection; - self = (NMBluezAdapter *) g_object_new (NM_TYPE_BLUEZ_ADAPTER, - NM_BLUEZ_ADAPTER_PATH, path, - NULL); + self = (NMBluez4Adapter *) g_object_new (NM_TYPE_BLUEZ4_ADAPTER, + NM_BLUEZ4_ADAPTER_PATH, path, + NULL); if (!self) return NULL; - priv = NM_BLUEZ_ADAPTER_GET_PRIVATE (self); + priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (self); priv->provider = provider; @@ -263,9 +263,9 @@ nm_bluez_adapter_new (const char *path, NMConnectionProvider *provider) } static void -nm_bluez_adapter_init (NMBluezAdapter *self) +nm_bluez4_adapter_init (NMBluez4Adapter *self) { - NMBluezAdapterPrivate *priv = NM_BLUEZ_ADAPTER_GET_PRIVATE (self); + NMBluez4AdapterPrivate *priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (self); priv->devices = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref); @@ -274,8 +274,8 @@ nm_bluez_adapter_init (NMBluezAdapter *self) static void dispose (GObject *object) { - NMBluezAdapter *self = NM_BLUEZ_ADAPTER (object); - NMBluezAdapterPrivate *priv = NM_BLUEZ_ADAPTER_GET_PRIVATE (self); + NMBluez4Adapter *self = NM_BLUEZ4_ADAPTER (object); + NMBluez4AdapterPrivate *priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (self); GHashTableIter iter; NMBluezDevice *device; @@ -284,27 +284,27 @@ dispose (GObject *object) g_signal_emit (self, signals[DEVICE_REMOVED], 0, device); g_hash_table_remove_all (priv->devices); - G_OBJECT_CLASS (nm_bluez_adapter_parent_class)->dispose (object); + G_OBJECT_CLASS (nm_bluez4_adapter_parent_class)->dispose (object); } static void finalize (GObject *object) { - NMBluezAdapterPrivate *priv = NM_BLUEZ_ADAPTER_GET_PRIVATE (object); + NMBluez4AdapterPrivate *priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (object); g_hash_table_destroy (priv->devices); g_free (priv->address); g_free (priv->path); g_object_unref (priv->proxy); - G_OBJECT_CLASS (nm_bluez_adapter_parent_class)->finalize (object); + G_OBJECT_CLASS (nm_bluez4_adapter_parent_class)->finalize (object); } static void get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - NMBluezAdapterPrivate *priv = NM_BLUEZ_ADAPTER_GET_PRIVATE (object); + NMBluez4AdapterPrivate *priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (object); switch (prop_id) { case PROP_PATH: @@ -323,7 +323,7 @@ static void set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - NMBluezAdapterPrivate *priv = NM_BLUEZ_ADAPTER_GET_PRIVATE (object); + NMBluez4AdapterPrivate *priv = NM_BLUEZ4_ADAPTER_GET_PRIVATE (object); switch (prop_id) { case PROP_PATH: @@ -337,11 +337,11 @@ set_property (GObject *object, guint prop_id, } static void -nm_bluez_adapter_class_init (NMBluezAdapterClass *config_class) +nm_bluez4_adapter_class_init (NMBluez4AdapterClass *config_class) { GObjectClass *object_class = G_OBJECT_CLASS (config_class); - g_type_class_add_private (config_class, sizeof (NMBluezAdapterPrivate)); + g_type_class_add_private (config_class, sizeof (NMBluez4AdapterPrivate)); /* virtual methods */ object_class->get_property = get_property; @@ -352,7 +352,7 @@ nm_bluez_adapter_class_init (NMBluezAdapterClass *config_class) /* Properties */ g_object_class_install_property (object_class, PROP_PATH, - g_param_spec_string (NM_BLUEZ_ADAPTER_PATH, + g_param_spec_string (NM_BLUEZ4_ADAPTER_PATH, "DBus Path", "DBus Path", NULL, @@ -360,7 +360,7 @@ nm_bluez_adapter_class_init (NMBluezAdapterClass *config_class) g_object_class_install_property (object_class, PROP_ADDRESS, - g_param_spec_string (NM_BLUEZ_ADAPTER_ADDRESS, + g_param_spec_string (NM_BLUEZ4_ADAPTER_ADDRESS, "Address", "Address", NULL, @@ -370,7 +370,7 @@ nm_bluez_adapter_class_init (NMBluezAdapterClass *config_class) signals[INITIALIZED] = g_signal_new ("initialized", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NMBluezAdapterClass, initialized), + G_STRUCT_OFFSET (NMBluez4AdapterClass, initialized), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); @@ -378,7 +378,7 @@ nm_bluez_adapter_class_init (NMBluezAdapterClass *config_class) signals[DEVICE_ADDED] = g_signal_new ("device-added", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NMBluezAdapterClass, device_added), + G_STRUCT_OFFSET (NMBluez4AdapterClass, device_added), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_OBJECT); @@ -386,7 +386,7 @@ nm_bluez_adapter_class_init (NMBluezAdapterClass *config_class) signals[DEVICE_REMOVED] = g_signal_new ("device-removed", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (NMBluezAdapterClass, device_removed), + G_STRUCT_OFFSET (NMBluez4AdapterClass, device_removed), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_OBJECT); diff --git a/src/bluez-manager/nm-bluez4-adapter.h b/src/bluez-manager/nm-bluez4-adapter.h index 8e53b40d1b..454ca557eb 100644 --- a/src/bluez-manager/nm-bluez4-adapter.h +++ b/src/bluez-manager/nm-bluez4-adapter.h @@ -18,8 +18,8 @@ * Copyright (C) 2009 - 2012 Red Hat, Inc. */ -#ifndef NM_BLUEZ_ADAPTER_H -#define NM_BLUEZ_ADAPTER_H +#ifndef NM_BLUEZ4_ADAPTER_H +#define NM_BLUEZ4_ADAPTER_H #include <glib.h> #include <glib-object.h> @@ -27,43 +27,43 @@ #include "nm-bluez-device.h" #include "nm-connection-provider.h" -#define NM_TYPE_BLUEZ_ADAPTER (nm_bluez_adapter_get_type ()) -#define NM_BLUEZ_ADAPTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_BLUEZ_ADAPTER, NMBluezAdapter)) -#define NM_BLUEZ_ADAPTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_BLUEZ_ADAPTER, NMBluezAdapterClass)) -#define NM_IS_BLUEZ_ADAPTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_BLUEZ_ADAPTER)) -#define NM_IS_BLUEZ_ADAPTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_BLUEZ_ADAPTER)) -#define NM_BLUEZ_ADAPTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_BLUEZ_ADAPTER, NMBluezAdapterClass)) +#define NM_TYPE_BLUEZ4_ADAPTER (nm_bluez4_adapter_get_type ()) +#define NM_BLUEZ4_ADAPTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_BLUEZ4_ADAPTER, NMBluez4Adapter)) +#define NM_BLUEZ4_ADAPTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_BLUEZ4_ADAPTER, NMBluez4AdapterClass)) +#define NM_IS_BLUEZ4_ADAPTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_BLUEZ4_ADAPTER)) +#define NM_IS_BLUEZ4_ADAPTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_BLUEZ4_ADAPTER)) +#define NM_BLUEZ4_ADAPTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_BLUEZ4_ADAPTER, NMBluez4AdapterClass)) -#define NM_BLUEZ_ADAPTER_PATH "path" -#define NM_BLUEZ_ADAPTER_ADDRESS "address" +#define NM_BLUEZ4_ADAPTER_PATH "path" +#define NM_BLUEZ4_ADAPTER_ADDRESS "address" typedef struct { GObject parent; -} NMBluezAdapter; +} NMBluez4Adapter; typedef struct { GObjectClass parent; /* virtual functions */ - void (*initialized) (NMBluezAdapter *self, gboolean success); + void (*initialized) (NMBluez4Adapter *self, gboolean success); - void (*device_added) (NMBluezAdapter *self, NMBluezDevice *device); + void (*device_added) (NMBluez4Adapter *self, NMBluezDevice *device); - void (*device_removed) (NMBluezAdapter *self, NMBluezDevice *device); -} NMBluezAdapterClass; + void (*device_removed) (NMBluez4Adapter *self, NMBluezDevice *device); +} NMBluez4AdapterClass; -GType nm_bluez_adapter_get_type (void); +GType nm_bluez4_adapter_get_type (void); -NMBluezAdapter *nm_bluez_adapter_new (const char *path, - NMConnectionProvider *provider); +NMBluez4Adapter *nm_bluez4_adapter_new (const char *path, + NMConnectionProvider *provider); -const char *nm_bluez_adapter_get_path (NMBluezAdapter *self); +const char *nm_bluez4_adapter_get_path (NMBluez4Adapter *self); -const char *nm_bluez_adapter_get_address (NMBluezAdapter *self); +const char *nm_bluez4_adapter_get_address (NMBluez4Adapter *self); -gboolean nm_bluez_adapter_get_initialized (NMBluezAdapter *self); +gboolean nm_bluez4_adapter_get_initialized (NMBluez4Adapter *self); -GSList *nm_bluez_adapter_get_devices (NMBluezAdapter *self); +GSList *nm_bluez4_adapter_get_devices (NMBluez4Adapter *self); -#endif /* NM_BLUEZ_ADAPTER_H */ +#endif /* NM_BLUEZ4_ADAPTER_H */ diff --git a/src/bluez-manager/nm-bluez4-manager.c b/src/bluez-manager/nm-bluez4-manager.c index bf06312d24..1e7fc2010e 100644 --- a/src/bluez-manager/nm-bluez4-manager.c +++ b/src/bluez-manager/nm-bluez4-manager.c @@ -40,7 +40,7 @@ typedef struct { DBusGProxy *proxy; - NMBluezAdapter *adapter; + NMBluez4Adapter *adapter; } NMBluezManagerPrivate; #define NM_BLUEZ_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_BLUEZ_MANAGER, NMBluezManagerPrivate)) @@ -77,20 +77,20 @@ nm_bluez_manager_query_devices (NMBluezManager *self) if (!priv->adapter) return; - devices = nm_bluez_adapter_get_devices (priv->adapter); + devices = nm_bluez4_adapter_get_devices (priv->adapter); for (iter = devices; iter; iter = g_slist_next (iter)) emit_bdaddr_added (self, NM_BLUEZ_DEVICE (iter->data)); g_slist_free (devices); } static void -device_added (NMBluezAdapter *adapter, NMBluezDevice *device, gpointer user_data) +device_added (NMBluez4Adapter *adapter, NMBluezDevice *device, gpointer user_data) { emit_bdaddr_added (NM_BLUEZ_MANAGER (user_data), device); } static void -device_removed (NMBluezAdapter *adapter, NMBluezDevice *device, gpointer user_data) +device_removed (NMBluez4Adapter *adapter, NMBluezDevice *device, gpointer user_data) { NMBluezManager *self = NM_BLUEZ_MANAGER (user_data); @@ -100,7 +100,7 @@ device_removed (NMBluezAdapter *adapter, NMBluezDevice *device, gpointer user_da } static void -adapter_initialized (NMBluezAdapter *adapter, gboolean success, gpointer user_data) +adapter_initialized (NMBluez4Adapter *adapter, gboolean success, gpointer user_data) { NMBluezManager *self = NM_BLUEZ_MANAGER (user_data); NMBluezManagerPrivate *priv = NM_BLUEZ_MANAGER_GET_PRIVATE (self); @@ -108,7 +108,7 @@ adapter_initialized (NMBluezAdapter *adapter, gboolean success, gpointer user_da if (success) { GSList *devices, *iter; - devices = nm_bluez_adapter_get_devices (adapter); + devices = nm_bluez4_adapter_get_devices (adapter); for (iter = devices; iter; iter = g_slist_next (iter)) emit_bdaddr_added (self, NM_BLUEZ_DEVICE (iter->data)); g_slist_free (devices); @@ -126,11 +126,11 @@ adapter_removed (DBusGProxy *proxy, const char *path, NMBluezManager *self) { NMBluezManagerPrivate *priv = NM_BLUEZ_MANAGER_GET_PRIVATE (self); - if (priv->adapter && !strcmp (path, nm_bluez_adapter_get_path (priv->adapter))) { - if (nm_bluez_adapter_get_initialized (priv->adapter)) { + if (priv->adapter && !strcmp (path, nm_bluez4_adapter_get_path (priv->adapter))) { + if (nm_bluez4_adapter_get_initialized (priv->adapter)) { GSList *devices, *iter; - devices = nm_bluez_adapter_get_devices (priv->adapter); + devices = nm_bluez4_adapter_get_devices (priv->adapter); for (iter = devices; iter; iter = g_slist_next (iter)) { NMBluezDevice *device = NM_BLUEZ_DEVICE (iter->data); @@ -153,7 +153,7 @@ default_adapter_changed (DBusGProxy *proxy, const char *path, NMBluezManager *se const char *cur_path = NULL; if (priv->adapter) - cur_path = nm_bluez_adapter_get_path (priv->adapter); + cur_path = nm_bluez4_adapter_get_path (priv->adapter); if (cur_path) { if (!path || strcmp (path, cur_path)) { @@ -167,7 +167,7 @@ default_adapter_changed (DBusGProxy *proxy, const char *path, NMBluezManager *se /* Add the new default adapter */ if (path) { - priv->adapter = nm_bluez_adapter_new (path, priv->provider); + priv->adapter = nm_bluez4_adapter_new (path, priv->provider); g_signal_connect (priv->adapter, "initialized", G_CALLBACK (adapter_initialized), self); } } @@ -310,7 +310,7 @@ nm_bluez_manager_get (NMConnectionProvider *provider) singleton = (NMBluezManager *) g_object_new (NM_TYPE_BLUEZ_MANAGER, NULL); g_assert (singleton); - /* Cache the connection provider for NMBluezAdapter objects */ + /* Cache the connection provider for NMBluez4Adapter objects */ NM_BLUEZ_MANAGER_GET_PRIVATE (singleton)->provider = provider; return singleton; |