[Xfce4-commits] <parole:master> Select first media in the added list of files once

[Ali Abdallah]

Updating branch refs/heads/master
         to fb4b167b8eb03571eca1a1ee855a706e246b3746 (commit)
       from 8feea61d5346f2b476c5b8946a0995c8bf04e996 (commit)

commit fb4b167b8eb03571eca1a1ee855a706e246b3746
Author: Ali Abdallah <ali at ali-xfce.org>
Date:   Mon Oct 5 14:45:03 2009 +0000

    Select first media in the added list of files once

 parole/parole-gst.c          |    2 +-
 parole/parole-mediachooser.c |    7 ++++---
 parole/parole-medialist.c    |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/parole/parole-gst.c b/parole/parole-gst.c
index 2c2913e..76324c3 100644
--- a/parole/parole-gst.c
+++ b/parole/parole-gst.c
@@ -1528,7 +1528,7 @@ parole_gst_terminate_internal (ParoleGst *gst, gboolean fade_sound)
 		  "has-video", &playing_video,
 		  NULL);
     
-    if ( fade_sound && gst->priv->state == GST_STATE_PLAYING && playing_video )
+    if ( fade_sound && gst->priv->state == GST_STATE_PLAYING && !playing_video )
     {
 	gdouble volume;
 	gdouble step;
diff --git a/parole/parole-mediachooser.c b/parole/parole-mediachooser.c
index fadbf29..7af1af3 100644
--- a/parole/parole-mediachooser.c
+++ b/parole/parole-mediachooser.c
@@ -87,6 +87,7 @@ media_chooser_folder_changed_cb (GtkWidget *widget, gpointer data)
 static void
 parole_media_chooser_add (ParoleMediaChooser *chooser, GtkWidget *file_chooser)
 {
+    GSList *media_files = NULL;
     GSList *files;
     GtkFileFilter *filter;
     gchar *file;
@@ -103,13 +104,13 @@ parole_media_chooser_add (ParoleMediaChooser *chooser, GtkWidget *file_chooser)
     
     for ( i = 0; i < len; i++)
     {
-	GSList *media_files = NULL;
 	file = g_slist_nth_data (files, i);
 	parole_get_media_files (filter, file, &media_files);
-	g_signal_emit (G_OBJECT (chooser), signals [MEDIA_FILES_OPENED], 0, media_files);
-	g_slist_free (media_files);
     }
     
+    g_signal_emit (G_OBJECT (chooser), signals [MEDIA_FILES_OPENED], 0, media_files);
+    g_slist_free (media_files);
+    
     g_slist_foreach (files, (GFunc) g_free, NULL);
     g_slist_free (files);
 }
diff --git a/parole/parole-medialist.c b/parole/parole-medialist.c
index d4a7ae5..ef0358a 100644
--- a/parole/parole-medialist.c
+++ b/parole/parole-medialist.c
@@ -241,7 +241,7 @@ parole_media_list_files_opened_cb (ParoleMediaChooser *chooser, GSList *files, P
     guint i;
     
     len = g_slist_length (files);
-    
+    TRACE ("Adding files");
     if ( len != 0 )
     {
 	file = g_slist_nth_data (files, 0);