diff src/gtk/gtkui_transfer.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/gtkui_transfer.c	Sun Oct 15 18:45:06 2006 +0000
+++ b/src/gtk/gtkui_transfer.c	Thu Oct 19 11:41:04 2006 +0000
@@ -206,7 +206,7 @@
 gftpui_ask_transfer (gftp_transfer * tdata)
 {
   char *dltitles[4], *add_data[4] = { NULL, NULL, NULL, NULL },
-       tempstr[50], temp1str[50], *pos, *utf8_file;
+       tempstr[50], temp1str[50], *pos;
   GtkWidget * dialog, * tempwid, * scroll, * hbox;
   gftp_file * tempfle;
   GList * templist;
@@ -293,8 +293,7 @@
       if (strncmp (pos, tdata->toreq->directory, len) == 0)
         pos += len + 1;
 
-      utf8_file = gftp_string_to_utf8 (tdata->toreq, pos);
-      add_data[0] = utf8_file != NULL ? utf8_file : pos;
+      add_data[0] = pos;
 
       gftp_get_transfer_action (tdata->fromreq, tempfle);
       switch (tempfle->transfer_action)
@@ -319,9 +318,6 @@
 
       i = gtk_clist_append (GTK_CLIST (tdata->clist), add_data);
       gtk_clist_set_row_data (GTK_CLIST (tdata->clist), i, tempfle);
-
-      if (utf8_file != NULL)
-        g_free (utf8_file);
     }
 
   gtk_clist_select_all (GTK_CLIST (tdata->clist));