diff src/gtk/transfer.c @ 319:2ad0b9a00fdd

2003-11-23 Brian Masney <[e-mail]> * src/gtk/transfer.c - when transfering a file, if the file being transfered is greater in the destination than in the source, overwrite it * lib/rfc959.c (rfc959_ipv6_data_connection_new) - when parsing the output, parse the integers as unsigned.

--- a/src/gtk/transfer.c	Wed Nov 12 00:39:32 2003 +0000
+++ b/src/gtk/transfer.c	Sun Nov 23 15:52:22 2003 +0000
@@ -1993,19 +1993,24 @@
       add_data[0] = pos;
 
       if (overwrite_default)
-        add_data[3] = _("Overwrite");
+        {
+          add_data[3] = _("Overwrite");
+          tempfle->transfer_action = GFTP_TRANS_ACTION_OVERWRITE;
+        }
+      else if (tempfle->startsize == tempfle->size)
+        {
+          add_data[3] = _("Skip");
+          tempfle->transfer_action = GFTP_TRANS_ACTION_SKIP;
+        }
+      else if (tempfle->startsize > tempfle->size)
+        {
+          add_data[3] = _("Overwrite");
+          tempfle->transfer_action = GFTP_TRANS_ACTION_OVERWRITE;
+        }
       else
         {
-          if (tempfle->startsize >= tempfle->size)
-            {
-              add_data[3] = _("Skip");
-              tempfle->transfer_action = GFTP_TRANS_ACTION_SKIP;
-            }
-          else
-            {
-              add_data[3] = _("Resume");
-              tempfle->transfer_action = GFTP_TRANS_ACTION_RESUME;
-            }
+          add_data[3] = _("Resume");
+          tempfle->transfer_action = GFTP_TRANS_ACTION_RESUME;
         }
 
       add_data[1] = insert_commas (tempfle->size, tempstr, sizeof (tempstr));