From c357d5fbe5d569c96aca26e8ca9467a7d69ea67a Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 20 Jul 2012 14:47:41 -0500 Subject: [PATCH] bluetooth: suppress another Bluez warning (rh #840580) When Bluez can't be launched for some reason, like because it doesn't exist, ignore that. --- src/bluez-manager/nm-bluez-manager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bluez-manager/nm-bluez-manager.c b/src/bluez-manager/nm-bluez-manager.c index e485ffe46..4290f618b 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)"); }