[Xfce4-commits] <parole:master> Change the order of the stream check, as most likely streams will be local.

[Ali Abdallah]

Updating branch refs/heads/master
         to c4c528824ecd48ba1cc908ff15f478616a3667b3 (commit)
       from 698cba63d878171086247d61e09ffc7c570b077e (commit)

commit c4c528824ecd48ba1cc908ff15f478616a3667b3
Author: Ali Abdallah <aliov at xfce.org>
Date:   Fri Dec 11 10:59:34 2009 +0100

    Change the order of the stream check, as most likely streams will be local.

 src/parole-statusbar.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/parole-statusbar.c b/src/parole-statusbar.c
index 71780c2..fdfcb3e 100644
--- a/src/parole-statusbar.c
+++ b/src/parole-statusbar.c
@@ -147,14 +147,7 @@ static void parole_statusbar_set_text (ParoleStatusbar *bar, const ParoleStream
 		      "live", &live,
 		      NULL);
 
-	if ( live )
-	{
-	    filename = g_filename_from_uri (uri, NULL, NULL);
-	    text = g_strdup_printf ("%s '%s'", _("Live stream:"), filename);
-	    gtk_label_set_text (GTK_LABEL (bar->priv->label_text), text);
-	    g_free (filename);
-	}
-	else
+	if ( G_LIKELY (live == FALSE) )
 	{
 	    if ( title == NULL )
 	    {
@@ -165,6 +158,14 @@ static void parole_statusbar_set_text (ParoleStatusbar *bar, const ParoleStream
 	    text = g_strdup (title != NULL ? title : filename);
 	    gtk_label_set_text (GTK_LABEL (bar->priv->label_text), text);
 	}
+	else
+	{
+	    filename = g_filename_from_uri (uri, NULL, NULL);
+	    text = g_strdup_printf ("%s '%s'", _("Live stream:"), filename);
+	    gtk_label_set_text (GTK_LABEL (bar->priv->label_text), text);
+	    g_free (filename);
+	    
+	}
 	
 	g_free (text);
 	g_free (title);