[patch] patch v2

patch (text/plain), 2.33 KB, created by xeb on 2006-12-01 12:21:19 UTC

diff -Nupr MPlayer-1.0rc1.orig/Gui/mplayer/gtk/pl.c MPlayer-1.0rc1/Gui/mplayer/gtk/pl.c
--- MPlayer-1.0rc1.orig/Gui/mplayer/gtk/pl.c	2006-11-27 00:49:12.000000000 +0300
+++ MPlayer-1.0rc1/Gui/mplayer/gtk/pl.c	2006-12-01 21:49:50.000000000 +0300
@@ -160,9 +160,10 @@ void ShowPlayList( void )
    while ( next || next->next )
     {
      char * text[1][3]; text[0][2]="";
-     text[0][0]=next->name;
+     text[0][0]=g_locale_to_utf8( next->name,-1,NULL,NULL,NULL );
      text[0][1]=next->path;
      gtk_clist_append( GTK_CLIST( CLSelected ),text[0] );
+     g_free(text[0][0]);
      NrOfSelected++;
      if ( next->next ) next=next->next; else break;
     }
@@ -217,7 +218,7 @@ static void plButtonReleased( GtkButton 
 	  item=calloc( 1,sizeof( plItem ) );
 	  gtk_clist_get_text( GTK_CLIST( CLSelected ),i,0,&text[0] );
 	  gtk_clist_get_text( GTK_CLIST( CLSelected ),i,1,&text[1] );
-	  item->name=strdup( text[0] );
+	  item->name=g_locale_from_utf8( text[0],-1,NULL,NULL,NULL );
 	  item->path=strdup( text[1] );
 	  gtkSet( gtkAddPlItem,0,(void*)item );
 	 }
@@ -332,7 +333,7 @@ static void plCTree( GtkCTree * ctree,Gt
        path=calloc( 1,strlen( DirNode->path ) + strlen( dirent->d_name ) + 2 );
        if ( !strcmp( current_path,"/" ) ) sprintf( path,"/%s",dirent->d_name );
 	else sprintf( path,"%s/%s",current_path,dirent->d_name );
-       text=dirent->d_name;
+       text=g_locale_to_utf8( dirent->d_name,-1,NULL,NULL,NULL );
 
        if ( stat( path,&statbuf ) != -1 && S_ISDIR( statbuf.st_mode ) && dirent->d_name[0] != '.' )
 	{
@@ -342,6 +343,7 @@ static void plCTree( GtkCTree * ctree,Gt
 	 gtk_ctree_node_set_row_data_full( ctree,node,DirNode,NULL );
 	 if ( subdir ) node=gtk_ctree_insert_node( ctree,node,NULL,&dummy,4,NULL,NULL,NULL,NULL,FALSE,FALSE );
 	}
+       g_free( text );	
        free( path ); path=NULL;
       }
      closedir( dir );
@@ -369,9 +371,10 @@ static void scan_dir( char * path )
 	 curr=calloc( 1,strlen( path ) + strlen( dirent->d_name ) + 3 ); sprintf( curr,"%s/%s",path,dirent->d_name );
 	 if ( stat( curr,&statbuf ) != -1 && ( S_ISREG( statbuf.st_mode ) || S_ISLNK( statbuf.st_mode ) ) )
 	  {
-	   text[0][0]=dirent->d_name;
+	   text[0][0]=g_locale_to_utf8( dirent->d_name,-1,NULL,NULL,NULL );
 	   gtk_clist_append( GTK_CLIST( CLFiles ),text[0] );
 	   NrOfEntrys++;
+	   g_free(text[0][0]);
 	  }
 	 free( curr );
 	}