diff src/gtk/misc-gtk.c @ 830:afbe37351940

2006-10-19 Brian Masney <[e-mail]> WARNING: The CVS version of gFTP is currently broken, especially for international users. This will be fixed in a few days. * src/gtk/gtkui.c src/gtk/gtkui_transfer.c src/gtk/misc-gtk.c lib/gftp.h lib/misc.c lib/protocols.c - removed code that converts the filename to UTF8. This will be handled by the library. Removed utf8_file member from the gftp_file structure. * lib/rfc959.c - convert the file or directory from UTF8 to the proper locale when sending a command to the server. * src/uicommon/gftpui.c src/gtk/menu-items.c lib/misc.c lib/gftp.h (gftp_gen_ls_string) - convert the filename from UTF8 to the proper locale before it is displayed to the user.

--- a/src/gtk/misc-gtk.c	Sun Oct 15 18:45:06 2006 +0000
+++ b/src/gtk/misc-gtk.c	Thu Oct 19 11:41:04 2006 +0000
@@ -298,7 +298,7 @@
 void
 update_window (gftp_window_data * wdata)
 {
-  char *tempstr, *hostname, *fspec, *utf8_directory;
+  char *tempstr, *hostname, *fspec;
   int connected, start;
 
   connected = GFTP_IS_CONNECTED (wdata->request);
@@ -320,19 +320,8 @@
       g_free (tempstr);
 
       if (wdata->request->directory != NULL)
-        {
-          utf8_directory = gftp_string_to_utf8 (wdata->request, 
-                                                wdata->request->directory);
-          if (utf8_directory != NULL)
-            {
-              gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (wdata->combo)->entry),
-                                  utf8_directory);
-              g_free (utf8_directory);
-            }
-          else
-            gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (wdata->combo)->entry),
-                                wdata->request->directory);
-        }
+        gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (wdata->combo)->entry),
+                            wdata->request->directory);
     }
   else if (wdata->hoststxt != NULL)
     {
@@ -757,10 +746,7 @@
    
   gtk_clist_set_pixmap (GTK_CLIST (wdata->listbox), clist_num, 0, pix, bitmap);
 
-  if (fle->utf8_file)
-    gtk_clist_set_text (GTK_CLIST (wdata->listbox), clist_num, 1, 
-                        fle->utf8_file);
-  else if (fle->file)
+  if (fle->file != NULL)
     gtk_clist_set_text (GTK_CLIST (wdata->listbox), clist_num, 1, fle->file);
 
   if (GFTP_IS_SPECIAL_DEVICE (fle->st_mode))