# HG changeset patch
# User nenolod
# Date 1160654534 25200
# Node ID 0f39dea9f26efd38257f3fcd6343cdf6903bb822
# Parent  8b63c8a65ae79736e1914f9479ce5b15f22cbab5
[svn] - some fixes via alxorlov on the forums

diff -r 8b63c8a65ae7 -r 0f39dea9f26e ChangeLog
--- a/ChangeLog	Thu Oct 12 04:52:51 2006 -0700
+++ b/ChangeLog	Thu Oct 12 05:02:14 2006 -0700
@@ -1,3 +1,10 @@
+2006-10-12 11:52:51 +0000  Tony Vroon <chainsaw@gentoo.org>
+  revision [2683]
+  Remove taglib CFLAGS, CONFIG & LIBS, no longer used.
+  trunk/mk/rules.mk.in |    3 ---
+  1 file changed, 3 deletions(-)
+
+
 2006-10-12 11:51:39 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2681]
   - remove checks for taglib in the player
diff -r 8b63c8a65ae7 -r 0f39dea9f26e audacious/prefswin.c
--- a/audacious/prefswin.c	Thu Oct 12 04:52:51 2006 -0700
+++ b/audacious/prefswin.c	Thu Oct 12 05:02:14 2006 -0700
@@ -1923,7 +1923,8 @@
     db = bmp_cfg_db_open();
     bmp_cfg_db_set_string(db, NULL, "chardet_detector", cfg.chardet_detector);
     bmp_cfg_db_close(db);
-    gtk_widget_set_sensitive(GTK_WIDGET(data), 1);
+    if (data != NULL)
+        gtk_widget_set_sensitive(GTK_WIDGET(data), 1);
 }
 
 static void
@@ -1950,7 +1951,10 @@
 
 #ifdef USE_CHARDET
     gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), index);
-    gtk_widget_set_sensitive(GTK_WIDGET(data), 1);
+
+    if (data != NULL)
+        gtk_widget_set_sensitive(GTK_WIDGET(data), TRUE);
+
     g_signal_connect(combobox, "changed",
                      G_CALLBACK(on_chardet_detector_cbox_changed), NULL);
 #else
diff -r 8b63c8a65ae7 -r 0f39dea9f26e audacious/ui_fileinfo.c
--- a/audacious/ui_fileinfo.c	Thu Oct 12 04:52:51 2006 -0700
+++ b/audacious/ui_fileinfo.c	Thu Oct 12 05:02:14 2006 -0700
@@ -356,11 +356,16 @@
 
 	gtk_widget_realize(fileinfo_win);
 
-	fileinfo_entry_set_text("entry_title", tuple->track_name);
-	fileinfo_entry_set_text("entry_artist", tuple->performer);
-	fileinfo_entry_set_text("entry_album", tuple->album_name);
-	fileinfo_entry_set_text("entry_comment", tuple->comment);
-	fileinfo_entry_set_text("entry_genre", tuple->genre);
+	if (tuple->track_name)
+		fileinfo_entry_set_text("entry_title", tuple->track_name);
+	if (tuple->performer)
+		fileinfo_entry_set_text("entry_artist", tuple->performer);
+	if (tuple->album_name)
+		fileinfo_entry_set_text("entry_album", tuple->album_name);
+	if (tuple->comment)
+		fileinfo_entry_set_text("entry_comment", tuple->comment);
+	if (tuple->genre)
+		fileinfo_entry_set_text("entry_genre", tuple->genre);
 
 	tmp = g_strdup_printf("%s/%s", tuple->file_path, tuple->file_name);
 	if(tmp){