# HG changeset patch
# User masneyb
# Date 1055844806 0
# Node ID cc94bd62d290a4bcf3d956954d81cc0a708825c3
# Parent  65eb40fb4f03f4693ad2d4b0cf2eb61e8bea922b
2003-6-16 Brian Masney <masneyb@gftp.org>

        * lib/protocols.c (_gftp_get_next_charset) - set the separator for
        remote charsets to be a comma

        * lib/options.h - updated description of remote charsets

diff -r 65eb40fb4f03 -r cc94bd62d290 ChangeLog
--- a/ChangeLog	Tue Jun 17 02:02:42 2003 +0000
+++ b/ChangeLog	Tue Jun 17 10:13:26 2003 +0000
@@ -1,4 +1,9 @@
 2003-6-16 Brian Masney <masneyb@gftp.org>
+	* lib/protocols.c (_gftp_get_next_charset) - set the separator for
+	remote charsets to be a comma
+
+	* lib/options.h - updated description of remote charsets
+
 	* lib/gftp.h lib/misc.c lib/options.h lib/protocols.c
 	src/gtk/misc-gtk.c - added remote_charsets option. Whenever a file is
 	read in that is not in UTF-8, it will first attempt to convert it from
@@ -1003,7 +1008,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.90 2003/06/17 02:02:40 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.91 2003/06/17 10:13:21 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 65eb40fb4f03 -r cc94bd62d290 lib/options.h
--- a/lib/options.h	Tue Jun 17 02:02:42 2003 +0000
+++ b/lib/options.h	Tue Jun 17 10:13:26 2003 +0000
@@ -47,7 +47,7 @@
    GFTP_PORT_GTK, NULL},
   {"remote_charsets", N_("Remote Character Sets:"), 
    gftp_option_type_text, "", NULL, 0,
-   N_("The character sets to try to convert the remote filenames to the current locale"), 
+   N_("This is a comma separated list of charsets to try to convert the remote messages to the current locale"), 
    GFTP_PORT_ALL, NULL},
 
   {"append_transfers", N_("Append file transfers"), 
diff -r 65eb40fb4f03 -r cc94bd62d290 lib/protocols.c
--- a/lib/protocols.c	Tue Jun 17 02:02:42 2003 +0000
+++ b/lib/protocols.c	Tue Jun 17 10:13:26 2003 +0000
@@ -345,9 +345,9 @@
 
   ret = *curpos;
   if (*curpos != remote_charsets)
-    *(*curpos - 1) = '\0';
-
-  if ((endpos = strchr (*curpos, ' ')) == NULL)
+    *(*curpos - 1) = ',';
+
+  if ((endpos = strchr (*curpos, ',')) == NULL)
     *curpos += strlen (*curpos);
   else
     {
@@ -401,6 +401,8 @@
           request->iconv_initialized = 1;
           break;
         }
+
+      /* FIXME - fix NUL character in remote_charsets */
     }
 
   return (ret);