bt-manager: update logging

This commit is contained in:
Dan Williams 2010-04-06 17:16:45 -07:00
parent 4ff8f21e4c
commit 3d6108f245
3 changed files with 17 additions and 17 deletions

View file

@ -15,7 +15,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright (C) 2009 Red Hat, Inc.
* Copyright (C) 2009 - 2010 Red Hat, Inc.
*/
#include <glib.h>
@ -27,7 +27,7 @@
#include "nm-bluez-device.h"
#include "nm-bluez-common.h"
#include "nm-dbus-glib-types.h"
#include "nm-utils.h"
#include "nm-logging.h"
G_DEFINE_TYPE (NMBluezAdapter, nm_bluez_adapter, G_TYPE_OBJECT)
@ -175,8 +175,8 @@ get_properties_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
if (!dbus_g_proxy_end_call (proxy, call, &err,
DBUS_TYPE_G_MAP_OF_VARIANT, &properties,
G_TYPE_INVALID)) {
nm_warning ("bluez error getting adapter properties: %s",
err && err->message ? err->message : "(unknown)");
nm_log_warn (LOGD_BT, "bluez error getting adapter properties: %s",
err && err->message ? err->message : "(unknown)");
g_error_free (err);
goto done;
}
@ -209,8 +209,8 @@ query_properties (NMBluezAdapter *self)
self,
NULL, G_TYPE_INVALID);
if (!call) {
nm_warning ("failed to request Bluetooth adapter properties for %s.",
priv->path);
nm_log_warn (LOGD_BT, "failed to request Bluetooth adapter properties for %s.",
priv->path);
}
}

View file

@ -15,7 +15,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright (C) 2009 Red Hat, Inc.
* Copyright (C) 2009 - 2010 Red Hat, Inc.
*/
#include <glib.h>
@ -26,7 +26,7 @@
#include "nm-bluez-device.h"
#include "nm-bluez-common.h"
#include "nm-dbus-glib-types.h"
#include "nm-utils.h"
#include "nm-logging.h"
#include "nm-marshal.h"
@ -228,8 +228,8 @@ get_properties_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
if (!dbus_g_proxy_end_call (proxy, call, &err,
DBUS_TYPE_G_MAP_OF_VARIANT, &properties,
G_TYPE_INVALID)) {
nm_warning ("bluez error getting device properties: %s",
err && err->message ? err->message : "(unknown)");
nm_log_warn (LOGD_BT, "bluez error getting device properties: %s",
err && err->message ? err->message : "(unknown)");
g_error_free (err);
g_signal_emit (self, signals[INITIALIZED], 0, FALSE);
return;
@ -270,8 +270,8 @@ query_properties (NMBluezDevice *self)
self,
NULL, G_TYPE_INVALID);
if (!call) {
nm_warning ("failed to request Bluetooth device properties for %s.",
priv->path);
nm_log_warn (LOGD_BT, "failed to request Bluetooth device properties for %s.",
priv->path);
}
}

View file

@ -16,7 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright (C) 2007 - 2008 Novell, Inc.
* Copyright (C) 2007 - 2009 Red Hat, Inc.
* Copyright (C) 2007 - 2010 Red Hat, Inc.
*/
#include <signal.h>
@ -24,7 +24,7 @@
#include <stdlib.h>
#include <dbus/dbus-glib.h>
#include "nm-utils.h"
#include "nm-logging.h"
#include "nm-dbus-glib-types.h"
#include "nm-marshal.h"
#include "nm-bluez-manager.h"
@ -181,8 +181,8 @@ 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_warning ("bluez error getting default adapter: %s",
err && err->message ? err->message : "(unknown)");
nm_log_warn (LOGD_BT, "bluez error getting default adapter: %s",
err && err->message ? err->message : "(unknown)");
g_error_free (err);
return;
}
@ -201,7 +201,7 @@ query_default_adapter (NMBluezManager *self)
self,
NULL, G_TYPE_INVALID);
if (!call)
nm_warning ("failed to request default Bluetooth adapter.");
nm_log_warn (LOGD_BT, "failed to request default Bluetooth adapter.");
}
static void