[Xfce4-commits] <parole:master> Merge branch 'master' of github.com:ochosi/Parole

[Simon Steinbeiss]

Updating branch refs/heads/master
         to 3e5ed8c60f08430e61946ce6e3303437e5fb2398 (commit)
       from c2abe62f033fa097c7fc897381682e55f1ea5ab3 (commit)

commit 3e5ed8c60f08430e61946ce6e3303437e5fb2398
Merge: c2abe62 146b2c9
Author: Simon Steinbeiss <ochosi at xfce.org>
Date:   Wed Jul 11 17:15:02 2012 +0200

    Merge branch 'master' of github.com:ochosi/Parole

commit 146b2c937b9f75d24cb7fe870ceb0d0e7fd6497e
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Wed Jul 11 11:08:30 2012 -0400

    Fixed show/hide order for buffer and scale.

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

diff --git a/src/parole-player.c b/src/parole-player.c
index 62d6529..1a419e5 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1050,8 +1050,8 @@ parole_player_buffering_cb (ParoleGst *gst, const ParoleStream *stream, gint per
     {
 	player->priv->buffering = FALSE;
 	parole_gst_resume (PAROLE_GST (player->priv->gst));
-	gtk_widget_show (player->priv->playcontrol_box);
 	gtk_widget_hide (player->priv->progressbar_buffering);
+	gtk_widget_show (player->priv->playcontrol_box);
     }
     else
     {
@@ -1067,8 +1067,8 @@ parole_player_buffering_cb (ParoleGst *gst, const ParoleStream *stream, gint per
     
     gtk_progress_bar_set_text (GTK_PROGRESS_BAR (player->priv->progressbar_buffering), buff);
     gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (player->priv->progressbar_buffering), (gdouble) percentage/100);
-    gtk_widget_show (player->priv->progressbar_buffering);
 	gtk_widget_hide (player->priv->playcontrol_box);
+    gtk_widget_show (player->priv->progressbar_buffering);
     g_free (buff);
     }
 }