summaryrefslogtreecommitdiff
path: root/src/bluez-manager
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2011-12-12 14:06:22 -0600
committerDan Williams <dcbw@redhat.com>2011-12-12 14:06:22 -0600
commitf03b0ac17681a45764c504ebdb2d96fbd7c2d227 (patch)
treea0618707855a8c8a458fb77b1a9d60dd5c60d592 /src/bluez-manager
parenta868fd5a98875515f2e368557b02a8c90d9405f1 (diff)
downloadNetworkManager-f03b0ac17681a45764c504ebdb2d96fbd7c2d227.tar.gz
bluetooth: ignore "No such adapter" warnings when bluetooth is inactive
Diffstat (limited to 'src/bluez-manager')
-rw-r--r--src/bluez-manager/nm-bluez-manager.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/bluez-manager/nm-bluez-manager.c b/src/bluez-manager/nm-bluez-manager.c
index 5381151ea8..942d0f3429 100644
--- a/src/bluez-manager/nm-bluez-manager.c
+++ b/src/bluez-manager/nm-bluez-manager.c
@@ -181,8 +181,11 @@ default_adapter_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
if (!dbus_g_proxy_end_call (proxy, call, &err,
DBUS_TYPE_G_OBJECT_PATH, &default_adapter,
G_TYPE_INVALID)) {
- nm_log_warn (LOGD_BT, "bluez error getting default adapter: %s",
- err && err->message ? err->message : "(unknown)");
+ /* Ignore "No such adapter" errors; just means bluetooth isn't active */
+ if (!dbus_g_error_has_name (err, "org.bluez.Error.NoSuchAdapter")) {
+ nm_log_warn (LOGD_BT, "bluez error getting default adapter: %s",
+ err && err->message ? err->message : "(unknown)");
+ }
g_error_free (err);
return;
}