diff src/gtk/transfer.c @ 326:cdabbe5c9a95

2003-12-4 Brian Masney <[e-mail]> * src/gftp.in - check for the bin_dir for the binary location * lib/cache.c lib/misc.c lib/protocols.c lib/rfc2068.c lib/rfc959.c lib/sshv2.c lib/sslcommon.c src/text/gftp-text.c src/gtk/chmod_dialog.c src/gtk/gftp-gtk.c src/gtk/menu-items.c src/gtk/misc-gtk.c src/gtk/mkdir_dialog.c src/gtk/rename_dialog.c src/gtk/transfer.c - when calling gftp_lookup_global_option() or gftp_lookup_request_option(), if the value is an integer, declare the variable type to be intptr_t. This fixes a bug on 64bit platforms (from Gwenole Beauchesne <[e-mail]>) * lib/config_file.c (gftp_config_file_read_float) - 64bit fixup * configure.in - increment version to 2.0.17pre0. Undefine _GNU_SOURCE. Check for stdint.h. * lib/gftp.h - include stdint.h if it is found on the system. * src/gtk/gftp-gtk.c (CreateToolbar) - on startup, have the host edit box grab the keyboard focus

--- a/src/gtk/transfer.c	Fri Dec 05 00:19:48 2003 +0000
+++ b/src/gtk/transfer.c	Fri Dec 05 00:21:15 2003 +0000
@@ -239,7 +239,8 @@
 static void *
 connect_thread (void *data)
 {
-  int ret, sj, retries, sleep_time, network_timeout;
+  int ret, sj;
+  intptr_t retries, sleep_time, network_timeout;
   static int conn_num;
   gftp_request * request;
 
@@ -580,7 +581,8 @@
 void * 
 gftp_gtk_transfer_files (void *data)
 {
-  int i, mode, tofd, fromfd, preserve_permissions;
+  int i, mode, tofd, fromfd;
+  intptr_t preserve_permissions;
   gftp_transfer * transfer;
   char buf[8192];
   off_t fromsize, total;
@@ -773,7 +775,8 @@
                    gftp_window_data * fromwdata, gftp_window_data * towdata, 
                    GList * files, int copy_req)
 {
-  int dialog, append_transfers, one_transfer;
+  int dialog;
+  intptr_t  append_transfers, one_transfer;
   gftp_curtrans_data * transdata;
   GList * templist, *curfle;
   gftp_transfer * tdata;
@@ -1041,7 +1044,8 @@
 static void
 on_next_transfer (gftp_transfer * tdata)
 {
-  int fd, refresh_files;
+  int fd;
+  intptr_t refresh_files;
   gftp_file * tempfle;
 
   tdata->next_file = 0;
@@ -1439,7 +1443,7 @@
 gint
 update_downloads (gpointer data)
 {
-  int do_one_transfer_at_a_time;
+  intptr_t do_one_transfer_at_a_time;
   GList * templist, * next;
   gftp_transfer * tdata;
 
@@ -1915,7 +1919,8 @@
   char *dltitles[4], *add_data[4] = { NULL, NULL, NULL, NULL },
        tempstr[50], temp1str[50], *pos;
   GtkWidget * tempwid, * scroll, * hbox;
-  int i, overwrite_default;
+  int i;
+  intptr_t overwrite_default;
   gftp_file * tempfle;
   GList * templist;
   size_t len;