[Xfce4-commits] <parole:master> Fix some subtitles format reported as playlists.

[Ali Abdallah]

Updating branch refs/heads/master
         to 43006e0f381ffa329b45543f599a48ad81c033bd (commit)
       from a32db98736726959d718d63d96b20a63bca03e7a (commit)

commit 43006e0f381ffa329b45543f599a48ad81c033bd
Author: Ali Abdallah <ali at ali-xfce.org>
Date:   Thu Nov 26 11:35:13 2009 +0100

    Fix some subtitles format reported as playlists.

 src/parole-filters.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/parole-filters.c b/src/parole-filters.c
index 0d8811b..f59c778 100644
--- a/src/parole-filters.c
+++ b/src/parole-filters.c
@@ -144,7 +144,7 @@ gboolean parole_file_filter (GtkFileFilter *filter, ParoleFile *file)
     filter_info.contains = GTK_FILE_FILTER_DISPLAY_NAME | GTK_FILE_FILTER_MIME_TYPE;
     
     ret = gtk_file_filter_filter (filter, &filter_info);
-
+    
     return ret;
 }
 
@@ -164,7 +164,8 @@ void parole_get_media_files (GtkFileFilter *filter, const gchar *path,
     if ( g_file_test (path, G_FILE_TEST_IS_REGULAR ) )
     {
 	file = parole_file_new (path);
-	if ( parole_file_filter (playlist_filter, file) )
+	if ( parole_file_filter (playlist_filter, file) && 
+	     parole_pl_parser_guess_format_from_extension (path) != PAROLE_PL_FORMAT_UNKNOWN )
 	{
 	    playlist = parole_pl_parser_load_file (path);
 	    g_object_unref (file);
@@ -197,9 +198,10 @@ void parole_get_media_files (GtkFileFilter *filter, const gchar *path,
 	    else if ( g_file_test (path_internal, G_FILE_TEST_IS_REGULAR) )
 	    {
 		file = parole_file_new (path_internal);
-		if ( parole_file_filter (playlist_filter, file) )
+		if ( parole_file_filter (playlist_filter, file) &&
+		     parole_pl_parser_guess_format_from_extension (path) != PAROLE_PL_FORMAT_UNKNOWN)
 		{
-		    playlist = parole_pl_parser_load_file (path);
+		    playlist = parole_pl_parser_load_file (path_internal);
 		    g_object_unref (file);
 		    if ( playlist)
 		    {