[Xfce4-commits] <parole:master> Tiny code cleanup

Simon Steinbeiss noreply at xfce.org
Sat Dec 1 02:00:01 CET 2012


Updating branch refs/heads/master
         to 8a81ce27765cdf695f90bfc7f04b4765a97e3694 (commit)
       from c9c5a76d05d484a9e09dbc5cf3d7818333fd387d (commit)

commit 8a81ce27765cdf695f90bfc7f04b4765a97e3694
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Sat Dec 1 01:58:43 2012 +0100

    Tiny code cleanup

 src/parole-player.c |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index 08c0cf8..d57c52d 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1545,27 +1545,22 @@ parole_player_media_tag_cb (ParoleGst *gst, const ParoleStream *stream, ParolePl
 	    g_free (title);
 	}
 	else
-	{
 	    gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_title), g_strdup_printf("<span color='#F4F4F4'><b><big>%s</big></b></span>", _("Unknown Song")));
-	}
 
 	if ( album )
 	{
 	    if (year)
+	    {
 	        gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_markup_printf_escaped("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s (%s)</span></big>", _("on"), album, year));
-
+		g_free (year);
+	    }
 	    else
 	        gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_markup_printf_escaped("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>", _("on"), album));
 	        
 	    g_free (album);
 	}
 	else
-	{
 	    gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_strdup_printf("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>", _("on"), _("Unknown Album")));
-	}
-	
-	if (year)
-        g_free (year);
 
 	if ( artist )
 	{
@@ -1573,9 +1568,7 @@ parole_player_media_tag_cb (ParoleGst *gst, const ParoleStream *stream, ParolePl
 	    g_free (artist);
 	}
 	else
-	{
 	    gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_artist), g_strdup_printf("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>", _("by"), _("Unknown Artist")));
-	}
 	
 	image = parole_stream_get_image(G_OBJECT(stream));
 	if (image)


More information about the Xfce4-commits mailing list