[Xfce4-commits] <parole:master> Minor changes in the configure file+don't set the play widget to paused when the user is seeking.

[Ali Abdallah]

Updating branch refs/heads/master
         to cf27874d136f656264d8431a75fce0d85021c4fb (commit)
       from 906d26ffb6b003fe7570eef8f31ba7e151c0cd06 (commit)

commit cf27874d136f656264d8431a75fce0d85021c4fb
Author: Ali Abdallah <aliov at xfce.org>
Date:   Mon Nov 30 10:38:02 2009 +0100

    Minor changes in the configure file+don't set the play widget to paused when the user is seeking.

 configure.ac.in     |   22 ++++++++++++++++++----
 src/parole-player.c |   21 +++------------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 0c01107..71d5b06 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -260,18 +260,32 @@ echo "
 ------------------------------------------------------
             Parole Media Player $VERSION
         ====================================
- 
+	
+	Installation:
+	=============
         prefix:                 	$prefix
 	pixmapsdir:			$pixmapsdir
-	Notification:			$LIBNOTIFY_FOUND
         Debug:   			$enable_debug
 	Building plugin api docs:       ${enable_gtk_doc}
 	
+	Optional dependencies:
+	======================
+	Libnotify:			$LIBNOTIFY_FOUND
+	Taglib:				$TAGLIB_FOUND
 	
 	Plugins to build:
 	=================
-	Stream Properties:       	${ac_properties_plugin} (With taglib $TAGLIB_FOUND)
-	System Tray icon:       	${ac_tray_plugin} (With notification $LIBNOTIFY_FOUND)
+	Stream Properties:       	${ac_properties_plugin}" 
+	if test x${ac_properties_plugin} = x"yes"; then 
+	echo "	(With taglib $TAGLIB_FOUND)" 
+	fi 
+	echo "	
+	System Tray icon:       	${ac_tray_plugin}" 
+	if test x${ac_tray_plugin} = x"yes"; then 
+	echo " 	(With notification $LIBNOTIFY_FOUND)" 
+	fi 
+	
+	echo "
 	Window title:			${ac_window_title_plugin}
 	Power Manager:			${ac_power_manager_plugin}
 
diff --git a/src/parole-player.c b/src/parole-player.c
index 77d52cf..6338fae 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -442,22 +442,6 @@ parole_player_media_progressed_cb (ParoleGst *gst, const ParoleStream *stream, g
 }
 
 static void
-parole_player_set_playpause_widget_image (GtkWidget *widget, const gchar *stock_id)
-{
-    GtkWidget *img;
-    
-    g_object_get (G_OBJECT (widget),
-		  "image", &img,
-		  NULL);
-		  
-    g_object_set (G_OBJECT (img),
-		  "stock", stock_id,
-		  NULL);
-
-    g_object_unref (img);
-}
-
-static void
 parole_player_set_playpause_button_image (GtkWidget *widget, const gchar *stock_id)
 {
     GtkWidget *img;
@@ -580,7 +564,8 @@ parole_player_paused (ParolePlayer *player)
     gtk_widget_set_sensitive (player->priv->play_pause, TRUE);
     gtk_widget_set_sensitive (player->priv->stop, TRUE);
     
-    parole_player_set_playpause_widget_image (player->priv->play_pause, GTK_STOCK_MEDIA_PLAY);
+    if ( player->priv->user_seeking == FALSE)
+	parole_player_set_playpause_button_image (player->priv->play_pause, GTK_STOCK_MEDIA_PLAY);
     
     if ( pix )
 	g_object_unref (pix);
@@ -624,7 +609,7 @@ parole_player_stopped (ParolePlayer *player)
     gtk_widget_set_sensitive (player->priv->seekf, FALSE);
     gtk_widget_set_sensitive (player->priv->seekb, FALSE);
 
-    parole_player_set_playpause_widget_image (player->priv->play_pause, GTK_STOCK_MEDIA_PLAY);
+    parole_player_set_playpause_button_image (player->priv->play_pause, GTK_STOCK_MEDIA_PLAY);
     
     parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, NULL);