[Xfce4-commits] <parole:0.2.2> Fix Reset Screen Saver feature.

[Ali Abdallah]

Updating branch refs/heads/0.2.2
         to f31dfd809eb152872e461f4c6b16e4436209ab37 (commit)
       from 353c6ee81841b0b2903c59964e2d402023ed7ef5 (commit)

commit f31dfd809eb152872e461f4c6b16e4436209ab37
Author: Ali Abdallah <aliov at xfce.org>
Date:   Sun Jan 31 19:21:21 2010 +0100

    Fix Reset Screen Saver feature.

 src/parole-player.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index 44199cc..428b61e 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -563,8 +563,6 @@ parole_player_playing (ParolePlayer *player, const ParoleStream *stream)
     gboolean seekable;
     gboolean live;
     
-    player->priv->state = PAROLE_MEDIA_STATE_PLAYING;
-    
     pix = parole_icon_load ("player_play", 16);
     
     if ( !pix )
@@ -610,8 +608,6 @@ parole_player_paused (ParolePlayer *player)
 {
     GdkPixbuf *pix = NULL;
     
-    player->priv->state = PAROLE_MEDIA_STATE_PAUSED;
-    
     TRACE ("Player paused");
     
     pix = parole_icon_load (GTK_STOCK_MEDIA_PAUSE, 16);
@@ -643,8 +639,6 @@ parole_player_stopped (ParolePlayer *player)
 {
     TRACE ("Player stopped");
     
-    player->priv->state = PAROLE_MEDIA_STATE_STOPPED;
-    
     gtk_widget_set_sensitive (player->priv->play_pause, 
 			      parole_media_list_is_selected_row (player->priv->list) || 
 			      !parole_media_list_is_empty (player->priv->list));
@@ -775,7 +769,9 @@ parole_player_reset_saver_changed (ParolePlayer *player, const ParoleStream *str
 		      NULL);
 		      
 	if ( has_video )
+	{
 	    parole_screen_saver_inhibit (player->priv->screen_saver);
+	}
     }
     else
 	parole_screen_saver_uninhibit (player->priv->screen_saver);
@@ -786,6 +782,9 @@ parole_player_media_state_cb (ParoleGst *gst, const ParoleStream *stream, Parole
 {
     PAROLE_DEBUG_ENUM ("State callback", state, GST_ENUM_TYPE_MEDIA_STATE);
 
+
+    player->priv->state = state;
+    
     parole_player_reset_saver_changed (player, stream);
     
     if ( state == PAROLE_MEDIA_STATE_PLAYING )