[Xfce4-commits] <parole:master> Escape audio-labels and make unknown information more "useful"

[Simon Steinbeiss]

Updating branch refs/heads/master
         to f65378f4d6f357b758898cc73022726f0617f736 (commit)
       from 5971d7a90a14156a31d86e19d1399f1bc3085ab5 (commit)

commit f65378f4d6f357b758898cc73022726f0617f736
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Thu Nov 29 01:50:50 2012 +0100

    Escape audio-labels and make unknown information more "useful"

 src/parole-player.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index a3eb521..3ae8395 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1582,27 +1582,27 @@ parole_player_media_tag_cb (ParoleGst *gst, const ParoleStream *stream, ParolePl
 	if ( title )
 	{
 	    parole_media_list_set_row_name (player->priv->list, player->priv->row, title);
-	    gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_title), g_strdup_printf("<span color=\"white\"><b><big>%s</big></b></span>", title));
+	    gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_title), g_markup_printf_escaped("<span color=\"white\"><b><big>%s</big></b></span>", title));
 	    g_free (title);
 	}
 	else
 	{
-	    gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_title), g_strdup_printf("<span color=\"white\"><b><big>%s</big></b></span>", _("Unknown")));
+	    gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_title), g_strdup_printf("<span color=\"white\"><b><big>%s</big></b></span>", _("Unknown Song")));
 	}
 
 	if ( album )
 	{
 	    if (year)
-	        gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_strdup_printf("<span color=\"white\"><big>%s %s (%s)</big></span>", _("on"), album, year));
+	        gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_markup_printf_escaped("<span color=\"white\"><big>%s %s (%s)</big></span>", _("on"), album, year));
 
 	    else
-	        gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_strdup_printf("<span color=\"white\"><big>%s %s</big></span>", _("on"), album));
+	        gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_markup_printf_escaped("<span color=\"white\"><big>%s %s</big></span>", _("on"), album));
 	        
 	    g_free (album);
 	}
 	else
 	{
-	    gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_strdup_printf("<span color=\"white\"><big>%s</big></span>", _("Unknown")));
+	    gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_strdup_printf("<span color=\"white\"><big>%s %s</big></span>", _("on"), _("Unknown Album")));
 	}
 	
 	if (year)
@@ -1610,12 +1610,12 @@ parole_player_media_tag_cb (ParoleGst *gst, const ParoleStream *stream, ParolePl
 
 	if ( artist )
 	{
-	    gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_artist), g_strdup_printf("<span color=\"white\"><big>%s %s</big></span>", _("by"), artist));
+	    gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_artist), g_markup_printf_escaped("<span color=\"white\"><big>%s %s</big></span>", _("by"), artist));
 	    g_free (artist);
 	}
 	else
 	{
-	    gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_artist), g_strdup_printf("<span color=\"white\"><big>%s %s</big></span>", _("by"), _("Unknown")));
+	    gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_artist), g_strdup_printf("<span color=\"white\"><big>%s %s</big></span>", _("by"), _("Unknown Artist")));
 	}
 	
 	image = parole_stream_get_image(G_OBJECT(stream));