[xine-cvs] HG: gxine: Fix a double-encoding bug which could break subtitles autodetection.

[<li...@yo...>]

# HG changeset patch
# User Darren Salt <li...@yo...>
# Date 1200251662 0
# Node ID 5415d1ddf125e3a88ad7d3efeb04e77311d0f77f
# Parent  88ecea4e3fbf1aab72fe7300df8651cb7a92ae80
Fix a double-encoding bug which could break subtitles autodetection.

diff -r 5415d1ddf125e3a88ad7d3efeb04e77311d0f77f -r 88ecea4e3fbf1aab72fe7300df8651cb7a92ae80 ChangeLog
--- a/ChangeLog	Sun Jan 13 19:14:22 2008 +0000
+++ b/ChangeLog	Sun Jan 13 17:16:09 2008 +0000
@@ -105,6 +105,7 @@ 0.5.900:2007/??/??
 	* Use of -A or -V no longer hides the corresponding driver pref.
 	  The configuration remains unchanged by these options.
 	* No longer build with libjs/libsmjs - old libraries, can't test.
+	* Fixed a double-encoding bug which could break subtitle autodetection.
 
 0.5.11:	2007/02/01
 	[dsalt]
diff -r 5415d1ddf125e3a88ad7d3efeb04e77311d0f77f -r 88ecea4e3fbf1aab72fe7300df8651cb7a92ae80 src/player.c
--- a/src/player.c	Sun Jan 13 19:14:22 2008 +0000
+++ b/src/player.c	Sun Jan 13 17:16:09 2008 +0000
@@ -199,9 +199,7 @@ static __attribute__ ((noreturn)) void *
       if (i < G_N_ELEMENTS (subs))
       {
 	char *tmp = g_filename_to_uri (file, NULL, NULL);
-	char *uri = g_filename_to_uri (tmp + 7, NULL, NULL);
-	mrl = g_strconcat (cur_mrl, hash ? ";subtitle:" : "#subtitle:", uri + 7, NULL);
-	free (uri);
+	mrl = g_strconcat (cur_mrl, hash ? ";subtitle:" : "#subtitle:", tmp + 7, NULL);
 	free (tmp);
       }
     }