changeset 2362:424bc51df918 trunk

[svn] - ensure that year/tracknumber/length fields are cleared if necessary
author giacomo
date Thu, 18 Jan 2007 07:32:07 -0800
parents f24ae4f40e29
children d9208536e270
files ChangeLog src/audacious/ui_fileinfopopup.c
diffstat 2 files changed, 16 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jan 18 03:02:55 2007 -0800
+++ b/ChangeLog	Thu Jan 18 07:32:07 2007 -0800
@@ -1,3 +1,14 @@
+2007-01-18 11:02:55 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [3732]
+  - security and warning fixes from ssommer@suse
+  
+  trunk/src/audacious/controlsocket.c         |    9 ++++++++-
+  trunk/src/audacious/util.c                  |    7 ++++++-
+  trunk/src/audacious/widgets/playlist_list.c |    2 +-
+  trunk/src/libaudacious/beepctrl.c           |    9 ++++++++-
+  4 files changed, 23 insertions(+), 4 deletions(-)
+
+
 2007-01-18 09:46:30 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [3730]
   - Add GenericName and remove icon filename extension from .desktop file. 
--- a/src/audacious/ui_fileinfopopup.c	Thu Jan 18 03:02:55 2007 -0800
+++ b/src/audacious/ui_fileinfopopup.c	Thu Jan 18 07:32:07 2007 -0800
@@ -529,14 +529,19 @@
 	}
 	else
 	{
+		filepopup_entry_set_text(filepopup_win, "label_tracklen", "");
 		g_object_set_data( G_OBJECT(filepopup_win), "length" , GINT_TO_POINTER(-1) );
 	}
 
 	if (tuple->year != 0)
 		filepopup_entry_set_text_free(filepopup_win, "label_year", g_strdup_printf("%d", tuple->year));
+	else
+		filepopup_entry_set_text(filepopup_win, "label_year", "");
 
 	if (tuple->track_number != 0)
 		filepopup_entry_set_text_free(filepopup_win, "label_tracknum", g_strdup_printf("%d", tuple->track_number));
+	else
+		filepopup_entry_set_text(filepopup_win, "label_tracknum", "");
 
 	tmp = fileinfo_recursive_get_image(tuple->file_path, tuple->file_name, 0);
 	if (tmp) { // picture found