From bce19ecc849f5f447794c4add97dce3cbdd4873f Mon Sep 17 00:00:00 2001
From: Roman Bogorodskiy <mirrorbox@users.sourceforge.net>
Date: Sat, 12 Aug 2006 05:19:40 +0000
Subject: [PATCH] - configure.in -> configure.ac - Print a summary of the
 configure options

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@686 7f574dfc-610e-0410-a909-a81674777703
---
 configure.in => configure.ac | 28 ++++++++++++++++++++++++++
 src/bmpx.c                   | 38 +++++++++++++++++++++++++++---------
 2 files changed, 57 insertions(+), 9 deletions(-)
 rename configure.in => configure.ac (97%)

diff --git a/configure.in b/configure.ac
similarity index 97%
rename from configure.in
rename to configure.ac
index b75e5431..64160123 100644
--- a/configure.in
+++ b/configure.ac
@@ -606,3 +606,31 @@ AC_SUBST(X11_LIBS)
 AC_SUBST(XFT_LIBS)
 
 AC_OUTPUT
+
+dnl
+dnl Print summary
+dnl
+cat << EOF
+
+$PACKAGE $VERSION configured successfully:
+  
+ * x11:
+  x11 support:		$want_x11
+  xft support:		$want_xft
+  xdamage extension:	$want_xdamage  
+
+ * music detection:
+  xmms:			$want_xmms
+  bmp:			$want_bmp
+  audacious:		$want_audacious
+  infopipe:		$want_infopipe
+  bmpx:			$want_bmpx
+  xmms2:		$want_xmms2
+  mpd:			$want_mpd
+
+ * general:
+  portmon:		$want_portmon  
+  mldonkey:		$want_mldonkey
+  hddtemp:		$want_hddtemp
+
+EOF
diff --git a/src/bmpx.c b/src/bmpx.c
index c7252ff7..e425d158 100644
--- a/src/bmpx.c
+++ b/src/bmpx.c
@@ -57,7 +57,15 @@ void update_bmpx()
 			ERR("BMPx error 3: %s\n", error->message);
 			goto fail;
 		}
-	
+
+		if (current_track == -1) {
+			printf("Here!!!\n");
+			goto fail;
+		}
+
+		printf("Here!!! ct = %d\n", current_track);
+
+		
 		if (dbus_g_proxy_call(remote_object, "GetMetadataForListItem", &error,
 				G_TYPE_INT,
 				current_track,
@@ -65,24 +73,36 @@ void update_bmpx()
 				DBUS_TYPE_G_STRING_VALUE_HASHTABLE,
 				&metadata,
 				G_TYPE_INVALID)) {
-			if (current_info->bmpx.title) {
-				free(current_info->bmpx.title);
-				current_info->bmpx.title = 0;
+			gchar *tmp_title, *tmp_artist, *tmp_album;
+			tmp_title = current_info->bmpx.title;
+			tmp_artist = current_info->bmpx.artist;
+			tmp_album = current_info->bmpx.album;
+			/*			if (current_info->bmpx.title) {
+				g_free(current_info->bmpx.title);
+				current_info->bmpx.title = NULL;
 			}
 			if (current_info->bmpx.artist) {
-				free(current_info->bmpx.artist);
-				current_info->bmpx.artist = 0;
+				g_free(current_info->bmpx.artist);
+				current_info->bmpx.artist = NULL;
 			}
 			if (current_info->bmpx.album) {
-				free(current_info->bmpx.album);
-				current_info->bmpx.album = 0;
-			}
+				g_free(current_info->bmpx.album);
+				current_info->bmpx.album = NULL;
+			}*/
 			current_info->bmpx.title = g_value_dup_string(g_hash_table_lookup(metadata, "title"));
 			current_info->bmpx.artist = g_value_dup_string(g_hash_table_lookup(metadata, "artist"));
 			current_info->bmpx.album = g_value_dup_string(g_hash_table_lookup(metadata, "album"));
 			current_info->bmpx.bitrate = g_value_get_int(g_hash_table_lookup(metadata, "bitrate"));
 			current_info->bmpx.track = g_value_get_int(g_hash_table_lookup(metadata, "track-number"));
 			current_info->bmpx.uri = g_value_get_string(g_hash_table_lookup(metadata, "location"));
+
+			if (tmp_title != NULL)
+				g_free(tmp_title);
+
+			if (tmp_artist != NULL)
+				g_free(tmp_artist);
+			if (tmp_album != NULL)
+				g_free(tmp_album);
 		} else {
 			ERR("BMPx error 4: %s\n", error->message);
 			goto fail;