Bugfix: make sure $else works correct and without memleaks

[monky] / src / bmpx.c

diff --git a/src/bmpx.c b/src/bmpx.c
index 3ca9cf2..2e04670 100644 (file)
--- a/src/bmpx.c
+++ b/src/bmpx.c
@@ -1,4 +1,5 @@
 /* -*- 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
  *
@@ -24,8 +25,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * vim: ts=4 sw=4 noet ai cindent syntax=c
- *
  */
 
 #include "config.h"
@@ -58,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;
                }
@@ -66,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;
                }
@@ -78,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;
                }
@@ -112,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;
                }