# HG changeset patch
# User masneyb
# Date 1102026785 0
# Node ID 056c54ac52a0e2c4fe9956c139991374584a9a32
# Parent  b3a0cccb1cd6f91f4052583717f1b2fd272e7631
2004-12-2 Brian Masney <masneyb@gftp.org>

        * src/gtk/gtkui_transfer.c (gftpui_ask_transfer) - fixes for the first
        character of the filename being stripped off when it already existed on
        the remote side and it was being uploaded to the root directory. Note,
        the file truncation only occured in it being displayed to the user. It
        was not stripping the filename when it was being transfered (from
        Aurelien Jarno <aurelien@aurel32.net >) (fixes #158713)

diff -r b3a0cccb1cd6 -r 056c54ac52a0 ChangeLog
--- a/ChangeLog	Thu Dec 02 22:22:31 2004 +0000
+++ b/ChangeLog	Thu Dec 02 22:33:05 2004 +0000
@@ -1,6 +1,14 @@
+2004-12-2 Brian Masney <masneyb@gftp.org>
+	* src/gtk/gtkui_transfer.c (gftpui_ask_transfer) - fixes for the first
+	character of the filename being stripped off when it already existed on
+	the remote side and it was being uploaded to the root directory. Note,
+	the file truncation only occured in it being displayed to the user. It
+	was not stripping the filename when it was being transfered (from
+	Aurelien Jarno <aurelien@aurel32.net >) (fixes #158713)
+
 2004-11-18  Dennis Cranston <dennis_cranston@yahoo.com>
 	* src/gtk/options_dialog.c:  GNOME HIG fixes for the GTK+2 
-	version of the Options and Add/Edit dialogs.
+	version of the Options and Add/Edit dialogs. (fixes #158642)
 	
 	Changes for the Options dialog:
 	   *  Use proper GNOME HIG widget spacing and padding
@@ -3110,7 +3118,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.372 2004/12/02 22:22:31 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.373 2004/12/02 22:33:04 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r b3a0cccb1cd6 -r 056c54ac52a0 src/gtk/gtkui_transfer.c
--- a/src/gtk/gtkui_transfer.c	Thu Dec 02 22:22:31 2004 +0000
+++ b/src/gtk/gtkui_transfer.c	Thu Dec 02 22:33:05 2004 +0000
@@ -286,10 +286,12 @@
         }
       tempfle->shown = 1;
 
+      len = strlen (tdata->toreq->directory);
       pos = tempfle->destfile;
-      len = strlen (tdata->toreq->directory);
+      if (len == 1 && (*tdata->toreq->directory) == '/')
+        pos++;
       if (strncmp (pos, tdata->toreq->directory, len) == 0)
-        pos = tempfle->destfile + len + 1;
+        pos += len + 1;
 
       utf8_file = gftp_string_to_utf8 (tdata->toreq, pos);
       add_data[0] = utf8_file != NULL ? utf8_file : pos;