diff lib/protocols.c @ 569:6dcef47f3187

2004-9-27 Brian Masney <[e-mail]> * lib/protocols.c (gftp_put_file) docs/gftp-faq.sgml - use gftp_string_from_utf8() to encode the filename. This will use the remote_charsets option instead of the GLIB environment variable

--- a/lib/protocols.c	Tue Sep 28 01:54:46 2004 +0000
+++ b/lib/protocols.c	Tue Sep 28 01:58:54 2004 +0000
@@ -187,9 +187,7 @@
 gftp_put_file (gftp_request * request, const char *filename, int fd,
                off_t startsize, off_t totalsize)
 {
-  char *tempstr, *enc_filename;
-  gsize bread, bwrite;
-  GError * error;
+  char *enc_filename;
   int ret;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
@@ -198,17 +196,8 @@
   if (request->put_file == NULL)
     return (GFTP_EFATAL);
 
-  if (g_utf8_validate (filename, -1, NULL))
-    enc_filename = g_filename_from_utf8 (filename, -1, &bread, &bwrite, &error);
-  else
-    {
-      tempstr = gftp_string_to_utf8 (request, filename);
-      enc_filename = g_filename_from_utf8 (tempstr, -1, &bread, &bwrite,
-                                           &error);
-      g_free (tempstr);
-    }
-
-  if (enc_filename)
+  enc_filename = gftp_string_from_utf8 (request, filename);
+  if (enc_filename != NULL)
     {
       ret = request->put_file (request, enc_filename, fd, startsize, totalsize);
       g_free (enc_filename);