diff options
Diffstat (limited to 'src/bluez-manager')
| -rw-r--r-- | src/bluez-manager/Makefile.am | 6 | ||||
| -rw-r--r-- | src/bluez-manager/Makefile.in | 6 | ||||
| -rw-r--r-- | src/bluez-manager/nm-bluez-adapter.h | 2 | ||||
| -rw-r--r-- | src/bluez-manager/nm-bluez-device.h | 2 | ||||
| -rw-r--r-- | src/bluez-manager/nm-bluez-manager.c | 1 | ||||
| -rw-r--r-- | src/bluez-manager/nm-bluez-manager.h | 2 |
6 files changed, 10 insertions, 9 deletions
diff --git a/src/bluez-manager/Makefile.am b/src/bluez-manager/Makefile.am index 10b32d25..63c6d3de 100644 --- a/src/bluez-manager/Makefile.am +++ b/src/bluez-manager/Makefile.am @@ -1,12 +1,12 @@ INCLUDES = \ -I${top_srcdir} \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ + -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ + -I${top_srcdir}/libnm-util \ -I${top_srcdir}/src \ - -I${top_srcdir}/src/generated \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging noinst_LTLIBRARIES = libbluez-manager.la diff --git a/src/bluez-manager/Makefile.in b/src/bluez-manager/Makefile.in index 7c6b0884..7a7320a9 100644 --- a/src/bluez-manager/Makefile.in +++ b/src/bluez-manager/Makefile.in @@ -335,13 +335,13 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = \ -I${top_srcdir} \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ + -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ + -I${top_srcdir}/libnm-util \ -I${top_srcdir}/src \ - -I${top_srcdir}/src/generated \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging noinst_LTLIBRARIES = libbluez-manager.la diff --git a/src/bluez-manager/nm-bluez-adapter.h b/src/bluez-manager/nm-bluez-adapter.h index 36aa55df..8e53b40d 100644 --- a/src/bluez-manager/nm-bluez-adapter.h +++ b/src/bluez-manager/nm-bluez-adapter.h @@ -31,7 +31,7 @@ #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 ((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_BLUEZ_ADAPTER_PATH "path" diff --git a/src/bluez-manager/nm-bluez-device.h b/src/bluez-manager/nm-bluez-device.h index f5fdbf5f..18f9fc30 100644 --- a/src/bluez-manager/nm-bluez-device.h +++ b/src/bluez-manager/nm-bluez-device.h @@ -31,7 +31,7 @@ #define NM_BLUEZ_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_BLUEZ_DEVICE, NMBluezDevice)) #define NM_BLUEZ_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_BLUEZ_DEVICE, NMBluezDeviceClass)) #define NM_IS_BLUEZ_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_BLUEZ_DEVICE)) -#define NM_IS_BLUEZ_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_BLUEZ_DEVICE)) +#define NM_IS_BLUEZ_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_BLUEZ_DEVICE)) #define NM_BLUEZ_DEVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_BLUEZ_DEVICE, NMBluezDeviceClass)) #define NM_BLUEZ_DEVICE_PATH "path" diff --git a/src/bluez-manager/nm-bluez-manager.c b/src/bluez-manager/nm-bluez-manager.c index 4290f618..a6848631 100644 --- a/src/bluez-manager/nm-bluez-manager.c +++ b/src/bluez-manager/nm-bluez-manager.c @@ -185,6 +185,7 @@ default_adapter_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data) G_TYPE_INVALID)) { /* Ignore "No such adapter" errors; just means bluetooth isn't active */ if ( !dbus_g_error_has_name (err, "org.bluez.Error.NoSuchAdapter") + && !dbus_g_error_has_name (err, "org.freedesktop.systemd1.LoadFailed") && !g_error_matches (err, DBUS_GERROR, DBUS_GERROR_SERVICE_UNKNOWN)) { nm_log_warn (LOGD_BT, "bluez error getting default adapter: %s", err && err->message ? err->message : "(unknown)"); diff --git a/src/bluez-manager/nm-bluez-manager.h b/src/bluez-manager/nm-bluez-manager.h index 1549e699..2bfc971e 100644 --- a/src/bluez-manager/nm-bluez-manager.h +++ b/src/bluez-manager/nm-bluez-manager.h @@ -33,7 +33,7 @@ G_BEGIN_DECLS #define NM_BLUEZ_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_BLUEZ_MANAGER, NMBluezManager)) #define NM_BLUEZ_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_BLUEZ_MANAGER, NMBluezManagerClass)) #define NM_IS_BLUEZ_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_BLUEZ_MANAGER)) -#define NM_IS_BLUEZ_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_BLUEZ_MANAGER)) +#define NM_IS_BLUEZ_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_BLUEZ_MANAGER)) #define NM_BLUEZ_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_BLUEZ_MANAGER, NMBluezManagerClass)) #define NM_BLUEZ_MANAGER_BDADDR_ADDED "bdaddr-added" |