# HG changeset patch
# User masneyb
# Date 1065088220 0
# Node ID 3bc63e3dbe12c39176cc6bb39386015449c2e446
# Parent  186552196fc70c77bdbbaf770b4c613172d51155
2003-10-2 Brian Masney <masneyb@gftp.org>

        * lib/rfc959.c - fixed rename bug (from
        Aurelien Jarno <aurel32@debian.org>)

        * src/gtk/gftp-gtk.c - make the help menu left aligned so that it is
        more consistent with other GNOME apps
        (from Miguel Ibarra <mibarra@ximian.com>)

        * src/gtk/transfer.c - right after the pointer to the next transfer
        is moved, set the current transfer size back to 0. The user could
        briefly (< 1 sec) see the old size transfered on the next file.

diff -r 186552196fc7 -r 3bc63e3dbe12 ChangeLog
--- a/ChangeLog	Tue Sep 23 04:15:18 2003 +0000
+++ b/ChangeLog	Thu Oct 02 09:50:20 2003 +0000
@@ -1,3 +1,15 @@
+2003-10-2 Brian Masney <masneyb@gftp.org>
+	* lib/rfc959.c - fixed rename bug (from 
+	Aurelien Jarno <aurel32@debian.org>)
+
+	* src/gtk/gftp-gtk.c - make the help menu left aligned so that it is
+	more consistent with other GNOME apps 
+	(from Miguel Ibarra <mibarra@ximian.com>)
+
+	* src/gtk/transfer.c - right after the pointer to the next transfer
+	is moved, set the current transfer size back to 0. The user could
+	briefly (< 1 sec) see the old size transfered on the next file.
+	
 2003-09-23  Taneem Ahmed  <taneem@bengalinux.org>
 
 	* configure.in: Added "bn" to ALL_LINGUAS.
@@ -1521,7 +1533,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.142 2003/09/23 04:15:11 taneem Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.143 2003/10/02 09:50:17 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 186552196fc7 -r 3bc63e3dbe12 lib/rfc959.c
--- a/lib/rfc959.c	Tue Sep 23 04:15:18 2003 +0000
+++ b/lib/rfc959.c	Thu Oct 02 09:50:20 2003 +0000
@@ -1551,7 +1551,7 @@
 
   if (ret < 0)
     return (ret);
-  else if (ret != '2')
+  else if (ret != '3')
     return (GFTP_ERETRYABLE);
 
   tempstr = g_strconcat ("RNTO ", newname, "\r\n", NULL);
diff -r 186552196fc7 -r 3bc63e3dbe12 src/gtk/gftp-gtk.c
--- a/src/gtk/gftp-gtk.c	Tue Sep 23 04:15:18 2003 +0000
+++ b/src/gtk/gftp-gtk.c	Thu Oct 02 09:50:20 2003 +0000
@@ -244,7 +244,7 @@
     {N_("/Tools/tearoff"), NULL, 0, 0, MN_("<Tearoff>")},
     {N_("/Tools/Compare Windows"), NULL, compare_windows, 0, MN_(NULL)},
     {N_("/Tools/Clear Cache"), NULL, clear_cache, 0, MS_(GTK_STOCK_CLEAR)},
-    {N_("/_Help"), NULL, 0, 0, MN_("<LastBranch>")},
+    {N_("/_Help"), NULL, 0, 0, MN_("<Branch>")},
     {N_("/Help/tearoff"), NULL, 0, 0, MN_("<Tearoff>")},
     {N_("/Help/About..."), NULL, about_dialog, 0, MS_(GTK_STOCK_HELP)}
   };
diff -r 186552196fc7 -r 3bc63e3dbe12 src/gtk/transfer.c
--- a/src/gtk/transfer.c	Tue Sep 23 04:15:18 2003 +0000
+++ b/src/gtk/transfer.c	Thu Oct 02 09:50:20 2003 +0000
@@ -755,6 +755,7 @@
         }
 
       g_static_mutex_lock (&transfer->structmutex);
+      transfer->curtrans = 0;
       transfer->next_file = 1;
       curfle->transfer_done = 1;
       transfer->curfle = transfer->curfle->next;