diff options
| author | Michael Biebl <biebl@debian.org> | 2012-08-07 14:23:39 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-08-07 14:23:39 +0200 |
| commit | 543d05fc6d12cc608dc37ae97d4843431c6de4a8 (patch) | |
| tree | def16257d58256bc116737bdc04edce693a656de /src/bluez-manager/nm-bluez-manager.c | |
| parent | 73f59c42ef878adf32efe8c7c4cb0d50ea2d04a1 (diff) | |
| parent | 7f1d08cf21e97f5e60d4636bb1e6c287c34ee2df (diff) | |
Merge tag 'upstream/0.9.5.96' into experimental
Upstream version 0.9.5.96
Diffstat (limited to 'src/bluez-manager/nm-bluez-manager.c')
| -rw-r--r-- | src/bluez-manager/nm-bluez-manager.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bluez-manager/nm-bluez-manager.c b/src/bluez-manager/nm-bluez-manager.c index e485ffe4..4290f618 100644 --- a/src/bluez-manager/nm-bluez-manager.c +++ b/src/bluez-manager/nm-bluez-manager.c @@ -184,7 +184,8 @@ default_adapter_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data) DBUS_TYPE_G_OBJECT_PATH, &default_adapter, 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")) { + if ( !dbus_g_error_has_name (err, "org.bluez.Error.NoSuchAdapter") + && !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)"); } |