From 78dbd8ba260260585650a4b7a748f0e600771b6d Mon Sep 17 00:00:00 2001
From: iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 20 Aug 2007 14:17:43 +0000
Subject: remove gconvert_uri_to_filename() and use url_unescape_string()
 instead. reasons: * gconvert strdup()s the original string, but it may exit
 without returning or freeing it. * gconvert returns the original pointer when
 no % escaping is done. It is then free()ed and used in that state. * gconvert
 doesn't consider that % may be at the end of the string and could continue
 parsing past the end. * gconvert would try to free() pointer that iconv()
 have modified. * gconvert would try to convert filenames from utf-8 to
 iso8859-1.   Seems like no other DnD programs convert to utf-8 and/or honors
 CHARSET.   Not converting seems to work best. Fix it if problem arises.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24106 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 gui/interface.c  | 43 -------------------------------------------
 gui/interface.h  |  1 -
 gui/mplayer/mw.c |  9 ++-------
 3 files changed, 2 insertions(+), 51 deletions(-)

(limited to 'gui')

diff --git a/gui/interface.c b/gui/interface.c
index 1dc00ba184..b4229e3994 100644
--- a/gui/interface.c
+++ b/gui/interface.c
@@ -157,49 +157,6 @@ void greplace(char ***list, const char *search, const char *replace)
  (*list)[i] = gstrdup(replace);
  (*list)[i + 1] = NULL;
 }
-
-#ifdef USE_ICONV
-char * gconvert_uri_to_filename( char * str )
-{
- iconv_t   d;
- char    * out = strdup( str );
- char	 * tmp = NULL;
- char    * ize;
- size_t    inb,outb;
- char    * charset = "ISO8859-1";
- char    * cs;
-
- if ( !strchr( str,'%' ) ) return str;
-	     
- {
-  char * t = calloc( 1,strlen( out ) );
-  int    i,c = 0;
-  for ( i=0;i < (int)strlen( out );i++ )
-   if ( out[i] != '%' ) t[c++]=out[i];
-    else
-     {
-      char tmp[5] = "0xXX"; 
-//	  if ( out[++i] == '%' ) { t[c++]='%'; continue; };
-      tmp[2]=out[++i]; tmp[3]=out[++i]; 
-      t[c++]=(char)strtol( tmp,(char **)NULL,0 );
-     }
-  free( out );
-  out=t;
- }
-
- if ( (cs=getenv( "CHARSET" )) && *cs ) charset=cs;
-
- inb=outb=strlen( out );
- tmp=calloc( 1,outb + 1 );
- ize=tmp;
- d=iconv_open( charset,"UTF-8" );
- if ( (iconv_t)(-1) == d ) return str;
- iconv( d,&out,&inb,&tmp,&outb ); 
- iconv_close( d ); 
- free( out );
- return ize;
-}
-#endif
 							    
 void guiInit( void )
 {
diff --git a/gui/interface.h b/gui/interface.h
index c6cbe4fe4d..26a885a9d8 100644
--- a/gui/interface.h
+++ b/gui/interface.h
@@ -210,7 +210,6 @@ extern float gtkEquChannels[6][10];
 
 extern void * gtkSet( int cmd,float param, void * vparam );
 
-extern char * gconvert_uri_to_filename( char * str );
 extern char * gstrdup( const char * str );
 extern int    gstrcmp( const char * a,const char * b );
 extern void   gfree( void ** p );
diff --git a/gui/mplayer/mw.c b/gui/mplayer/mw.c
index 1762eea45d..4a72480d60 100644
--- a/gui/mplayer/mw.c
+++ b/gui/mplayer/mw.c
@@ -20,6 +20,7 @@
 #include "../libvo/fastmemcpy.h"
 
 #include "../stream/stream.h"
+#include "stream/url.h"
 #include "../mixer.h"
 #include "../libvo/sub.h"
 #include "../access_mpcontext.h"
@@ -559,13 +560,7 @@ void mplDandDHandler(int num,char** files)
     char* str = strdup( files[f] );
     plItem* item;
 
-#ifdef USE_ICONV
-    if ( strchr( str,'%' ) )
-     {
-      char * tmp=gconvert_uri_to_filename( str );
-      free( str ); str=tmp;
-     }
-#endif
+    url_unescape_string(str, files[f]);
 
     if(stat(str,&buf) == 0 && S_ISDIR(buf.st_mode) == 0) {
       /* this is not a directory so try to play it */
-- 
cgit v1.2.3