From 1f4b97c87852f284434151d564e6f1bf1752ca0f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 24 Jul 2012 12:57:42 -0500 Subject: [PATCH] bluetooth: ignore more Bluez launch failures If bluez is started by systemd but for some reason is not set to be D-Bus activated (as seems to be the case on Fedora 16 and later), then don't emit a warning. --- src/bluez-manager/nm-bluez-manager.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bluez-manager/nm-bluez-manager.c b/src/bluez-manager/nm-bluez-manager.c index 4290f618be..7e1566efc7 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") + && !dubs_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)");