[totem-pl-parser/gnome-2-26] Bug 585764 – Does nothing when opening m3u playlist file

[Bastien Nocera <hadess src gnome org>]

commit 15d612c5d25cf12e88c917484a4d060f6636c63e
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jun 17 11:07:47 2009 +0100

    Bug 585764 â?? Does nothing when opening m3u playlist file
    
    2009-06-17  Bastien Nocera  <hadess hadess net>
    
    	* plparse/totem-pl-parser-lines.c (totem_pl_parser_add_m3u):
    	Fix parsing of mixed Unix/DOS linefeeds (Closes: #585764)

 ChangeLog                       |    5 +++++
 plparse/totem-pl-parser-lines.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9cc8d45..c5c273f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-17  Bastien Nocera  <hadess hadess net>
+
+	* plparse/totem-pl-parser-lines.c (totem_pl_parser_add_m3u):
+	Fix parsing of mixed Unix/DOS linefeeds (Closes: #585764)
+
 ============ Version 2.26.2
 
 2009-05-03  Bastien Nocera  <hadess hadess net>
diff --git a/plparse/totem-pl-parser-lines.c b/plparse/totem-pl-parser-lines.c
index e149726..0859779 100644
--- a/plparse/totem-pl-parser-lines.c
+++ b/plparse/totem-pl-parser-lines.c
@@ -389,7 +389,7 @@ totem_pl_parser_add_m3u (TotemPlParser *parser,
 		dos = TRUE;
 	}
 
-	lines = g_strsplit (contents, split_char, 0);
+	lines = g_strsplit_set (contents, split_char, 0);
 	g_free (contents);
 	num_lines = g_strv_length (lines);
 	/* We don't count the terminating NULL */