X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fbmpx.c;h=2e04670e6169b9b091782f9534d56b6febf4bc56;hb=f3e250df559a6e4677072bbe2936a8a093798bbd;hp=d3d25b8a7a4c4aabdb785bac7e567be20ac4e335;hpb=9a85812e06f8a278d36b988765c102eaf1c60f88;p=monky

diff --git a/src/bmpx.c b/src/bmpx.c
index d3d25b8..2e04670 100644
--- a/src/bmpx.c
+++ b/src/bmpx.c
@@ -1,4 +1,7 @@
-/* Conky, a system monitor, based on torsmo
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
+ * Conky, a system monitor, based on torsmo
  *
  * Any original torsmo code is licensed under the BSD license
  *
@@ -6,7 +9,7 @@
  *
  * Please see COPYING for details
  *
- * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
  *	(see AUTHORS)
  * All rights reserved.
  *
@@ -54,7 +57,7 @@ void update_bmpx()
 
 		bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
 		if (bus == NULL) {
-			ERR("BMPx error 1: %s\n", error->message);
+			NORM_ERR("BMPx error 1: %s\n", error->message);
 			fail(error);
 			return;
 		}
@@ -62,7 +65,7 @@ void update_bmpx()
 		remote_object = dbus_g_proxy_new_for_name(bus, BMP_DBUS_SERVICE,
 				BMP_DBUS_PATH, BMP_DBUS_INTERFACE);
 		if (!remote_object) {
-			ERR("BMPx error 2: %s\n", error->message);
+			NORM_ERR("BMPx error 2: %s\n", error->message);
 			fail(error);
 			return;
 		}
@@ -74,7 +77,7 @@ void update_bmpx()
 		if (dbus_g_proxy_call(remote_object, "GetCurrentTrack", &error,
 					G_TYPE_INVALID, G_TYPE_INT, &current_track, G_TYPE_INVALID)) {
 		} else {
-			ERR("BMPx error 3: %s\n", error->message);
+			NORM_ERR("BMPx error 3: %s\n", error->message);
 			fail(error);
 			return;
 		}
@@ -108,7 +111,7 @@ void update_bmpx()
 			current_info->bmpx.uri =
 				g_value_get_string(g_hash_table_lookup(metadata, "location"));
 		} else {
-			ERR("BMPx error 4: %s\n", error->message);
+			NORM_ERR("BMPx error 4: %s\n", error->message);
 			fail(error);
 			return;
 		}