# HG changeset patch
# User masneyb
# Date 1161261584 0
# Node ID f2772ac00751e4aa72edace553f5f122fb42e1c2
# Parent  739462d1bfb5f0aa664b4e53d274652772bb795d
2006-10-19 Brian Masney <masneyb@gftp.org>

        WARNING: The CVS version of gFTP is currently broken, especially for
        international users. This will be fixed in a few days.

        * lib/fsp.c lib/gftp.h lib/local.c lib/protocols.c lib/rfc2068.c
        lib/rfc959.c lib/sshv2.c - added use_local_encoding variable to the
        gftp_request structure. This will determine if the filename should
        be converted to the local or remote character set.

diff -r 739462d1bfb5 -r f2772ac00751 ChangeLog
--- a/ChangeLog	Thu Oct 19 12:32:11 2006 +0000
+++ b/ChangeLog	Thu Oct 19 12:39:44 2006 +0000
@@ -2,6 +2,11 @@
 	WARNING: The CVS version of gFTP is currently broken, especially for
 	international users. This will be fixed in a few days.
 
+	* lib/fsp.c lib/gftp.h lib/local.c lib/protocols.c lib/rfc2068.c
+	lib/rfc959.c lib/sshv2.c - added use_local_encoding variable to the
+	gftp_request structure. This will determine if the filename should
+	be converted to the local or remote character set.
+
 	* lib/local.c - convert the file or directory to the proper locale
 
 	* src/gtk/gtkui.c src/gtk/gtkui_transfer.c src/gtk/misc-gtk.c lib/gftp.h
@@ -3651,7 +3656,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.486 2006/10/19 12:32:10 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.487 2006/10/19 12:39:43 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 739462d1bfb5 -r f2772ac00751 lib/fsp.c
--- a/lib/fsp.c	Thu Oct 19 12:32:11 2006 +0000
+++ b/lib/fsp.c	Thu Oct 19 12:39:44 2006 +0000
@@ -632,6 +632,7 @@
   request->need_password = 0;
   request->use_cache = 1;
   request->always_connected = 0;
+  request->use_local_encoding = 0;
 
   lpd = g_malloc0 (sizeof (*lpd));
   request->protocol_data = lpd;
diff -r 739462d1bfb5 -r f2772ac00751 lib/gftp.h
--- a/lib/gftp.h	Thu Oct 19 12:32:11 2006 +0000
+++ b/lib/gftp.h	Thu Oct 19 12:39:44 2006 +0000
@@ -402,7 +402,8 @@
                cached : 1,              /* Is this directory listing cached? */
                cancel : 1,		/* If a signal is received, should
 					   we cancel this operation */
-               stopable : 1;
+               stopable : 1,
+               use_local_encoding : 1;
 
   off_t gotbytes;
  
diff -r 739462d1bfb5 -r f2772ac00751 lib/local.c
--- a/lib/local.c	Thu Oct 19 12:32:11 2006 +0000
+++ b/lib/local.c	Thu Oct 19 12:39:44 2006 +0000
@@ -756,6 +756,7 @@
   request->need_password = 0;
   request->use_cache = 0;
   request->always_connected = 1;
+  request->use_local_encoding = 1;
 
   lpd = g_malloc0 (sizeof (*lpd));
   request->protocol_data = lpd;
diff -r 739462d1bfb5 -r f2772ac00751 lib/protocols.c
--- a/lib/protocols.c	Thu Oct 19 12:32:11 2006 +0000
+++ b/lib/protocols.c	Thu Oct 19 12:39:44 2006 +0000
@@ -510,6 +510,8 @@
   if (request == NULL)
     return (NULL);
 
+  /* FIXME - use request->use_local_encoding */
+
   /* If the string isn't in UTF-8 format, assume it is already in the current
      locale... */
   if (!g_utf8_validate (str, -1, NULL))
diff -r 739462d1bfb5 -r f2772ac00751 lib/rfc2068.c
--- a/lib/rfc2068.c	Thu Oct 19 12:32:11 2006 +0000
+++ b/lib/rfc2068.c	Thu Oct 19 12:39:44 2006 +0000
@@ -931,6 +931,7 @@
   request->need_password = 0;
   request->use_cache = 1;
   request->always_connected = 1;
+  request->use_local_encoding = 0;
 
   request->protocol_data = g_malloc0 (sizeof (rfc2068_params));
   params = request->protocol_data;
diff -r 739462d1bfb5 -r f2772ac00751 lib/rfc959.c
--- a/lib/rfc959.c	Thu Oct 19 12:32:11 2006 +0000
+++ b/lib/rfc959.c	Thu Oct 19 12:39:44 2006 +0000
@@ -1912,6 +1912,7 @@
   request->need_password = 1;
   request->use_cache = 1;
   request->always_connected = 0;
+  request->use_local_encoding = 0;
 
   request->protocol_data = g_malloc0 (sizeof (rfc959_parms));
   parms = request->protocol_data;
diff -r 739462d1bfb5 -r f2772ac00751 lib/sshv2.c
--- a/lib/sshv2.c	Thu Oct 19 12:32:11 2006 +0000
+++ b/lib/sshv2.c	Thu Oct 19 12:39:44 2006 +0000
@@ -2126,6 +2126,7 @@
   request->need_password = 1;
   request->use_cache = 1;
   request->always_connected = 0;
+  request->use_local_encoding = 0;
   request->protocol_data = g_malloc0 (sizeof (sshv2_params));
   request->server_type = GFTP_DIRTYPE_UNIX;