Index: Gui/mplayer/gtk/fs.c
===================================================================
--- Gui/mplayer/gtk/fs.c	(revision 22941)
+++ Gui/mplayer/gtk/fs.c	(working copy)
@@ -174,7 +174,7 @@
    stat( gg.gl_pathv[i],&fs );
    if( !S_ISDIR( fs.st_mode ) ) continue;
 
-   str[0][1]=gg.gl_pathv[i];
+   str[0][1]=g_filename_to_utf8(gg.gl_pathv[i], -1, NULL, NULL, NULL);
    pixmap=dpixmap; mask=dmask;
    gtk_clist_append( GTK_CLIST( list ),str[0] );
    gtk_clist_set_pixmap( GTK_CLIST( list ),c++,0,pixmap,mask );
@@ -222,7 +222,7 @@
    stat( gg.gl_pathv[i],&fs );
    if(  S_ISDIR( fs.st_mode ) ) continue;
 
-   str[0][1]=gg.gl_pathv[i];
+   str[0][1]=g_filename_to_utf8( gg.gl_pathv[i], -1, NULL, NULL, NULL );
    gtk_clist_append( GTK_CLIST( list ),str[0] );
    gtk_clist_set_pixmap( GTK_CLIST( list ),c++,0,pixmap,mask );
   }
@@ -327,9 +327,9 @@
   if ( fsType == fsVideoSelector )
    {
     for ( i=0;i < fsPersistant_MaxPos;i++ )
-     if ( fsHistory[i] ) { fsTopList_items=g_list_append( fsTopList_items,fsHistory[i] ); c=0; }
+     if ( fsHistory[i] ) { fsTopList_items=g_list_append( fsTopList_items, g_filename_to_utf8( fsHistory[i], -1, NULL, NULL, NULL ) ); c=0; }
    }
-  if ( c ) fsTopList_items=g_list_append( fsTopList_items,(gchar *)get_current_dir_name() );
+  if ( c ) fsTopList_items=g_list_append( fsTopList_items,(gchar *)g_filename_to_utf8(get_current_dir_name(), -1, NULL, NULL, NULL ) );
  }
  if ( getenv( "HOME" ) ) fsTopList_items=g_list_append( fsTopList_items,getenv( "HOME" ) );
  fsTopList_items=g_list_append( fsTopList_items,"/home" );
@@ -418,6 +418,7 @@
  unsigned char * str;
 
  str=gtk_entry_get_text( GTK_ENTRY( user_data ) );
+ str=g_filename_from_utf8(str, -1, NULL, NULL, NULL);
  if ( chdir( str ) != -1 ) CheckDir( fsFNameList,get_current_dir_name() );
 }
 
@@ -426,6 +427,7 @@
  unsigned char * str;
 
  str=gtk_entry_get_text( GTK_ENTRY( user_data ) );
+ str=g_filename_from_utf8(str, -1, NULL, NULL, NULL);
  fsPressed=2;
  if ( chdir( str ) != -1 ) CheckDir( fsFNameList,get_current_dir_name() );
 }
@@ -454,13 +456,14 @@
  int             size,j,i = 1;
  struct stat     fs;
 
+ fsSelectedFile = g_filename_from_utf8(fsSelectedFile, -1, NULL, NULL, NULL);
  stat( fsSelectedFile,&fs );
  if(  S_ISDIR(fs.st_mode ) )
   {
    chdir( fsSelectedFile );
    fsSelectedFile=fsThatDir;
    CheckDir( fsFNameList,get_current_dir_name() );
-   gtk_entry_set_text( GTK_ENTRY( fsPathCombo ),(unsigned char *)get_current_dir_name() );
+   gtk_entry_set_text( GTK_ENTRY( fsPathCombo ),(unsigned char *)g_filename_to_utf8(get_current_dir_name(), -1, NULL, NULL, NULL) );
    return;
   }