Mercurial > gftp.yaz

changeset 326:cdabbe5c9a95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2003-12-4 Brian Masney <masneyb@gftp.org> * 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 <gbeauchesne@mandrakesoft.com>) * 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
author masneyb
date Fri, 05 Dec 2003 00:21:15 +0000
parents 0fcc6468a0af
children 98487556a058
files ChangeLog 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
diffstat 8 files changed, 33 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Dec 05 00:19:48 2003 +0000
+++ b/ChangeLog	Fri Dec 05 00:21:15 2003 +0000
@@ -1,4 +1,6 @@
 2003-12-4 Brian Masney <masneyb@gftp.org>
+	* 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
@@ -1799,7 +1801,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.177 2003/12/05 00:19:47 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.178 2003/12/05 00:21:14 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
--- a/src/gtk/chmod_dialog.c	Fri Dec 05 00:19:48 2003 +0000
+++ b/src/gtk/chmod_dialog.c	Fri Dec 05 00:21:15 2003 +0000
@@ -28,7 +28,8 @@
 static void *
 do_chmod_thread (void * data)
 {
-  int success, num, sj, network_timeout;
+  int success, num, sj;
+  intptr_t network_timeout;
   GList * filelist, * templist;
   gftp_window_data * wdata;
   gftp_file * tempfle;
--- a/src/gtk/gftp-gtk.c	Fri Dec 05 00:19:48 2003 +0000
+++ b/src/gtk/gftp-gtk.c	Fri Dec 05 00:21:15 2003 +0000
@@ -152,7 +152,7 @@
 static GtkWidget *
 CreateMenus (GtkWidget * parent)
 {
-  int local_len, remote_len, len, i, trans_len, log_len, tools_len,
+  intptr_t local_len, remote_len, len, i, trans_len, log_len, tools_len,
       ascii_transfers;
   GtkAccelGroup *accel_group;
   GtkWidget * tempwid;
@@ -470,6 +470,7 @@
   gtk_container_border_width (GTK_CONTAINER (stop_btn), 1);
   gtk_box_pack_start (GTK_BOX (box), stop_btn, FALSE, FALSE, 0);
 
+  gtk_widget_grab_focus (GTK_COMBO (hostedit)->entry);
   return (toolbar);
 }
 
@@ -489,7 +490,8 @@
 static void
 list_doaction (gftp_window_data * wdata)
 {
-  int num, dir, success, list_dblclk_action;
+  int num, dir, success;
+  intptr_t list_dblclk_action;
   GList *templist, *filelist;
   gftp_file *tempfle;
 
@@ -591,7 +593,7 @@
     {"application/x-rootwin-drop", 0, 1}
   };
   GtkWidget *box, *scroll_list, *parent;
-  int listbox_file_height, colwidth;
+  intptr_t listbox_file_height, colwidth;
   char *titles[7], tempstr[50];
 
   titles[0] = "";
@@ -718,7 +720,7 @@
             *button;
   gftp_config_list_vars * tmplistvar;
   char *dltitles[2];
-  int tmplookup;
+  intptr_t tmplookup;
 #if GTK_MAJOR_VERSION > 1
   GtkTextBuffer * textbuf;
   GtkTextIter iter;
@@ -981,7 +983,8 @@
 sortrows (GtkCList * clist, gint column, gpointer data)
 {
   char sortcol_name[25], sortasds_name[25];
-  int swap_col, sortcol, sortasds;
+  int swap_col;
+  intptr_t sortcol, sortasds;
   gftp_window_data * wdata;
   GtkWidget * sort_wid;
   GList * templist;
--- a/src/gtk/menu-items.c	Fri Dec 05 00:19:48 2003 +0000
+++ b/src/gtk/menu-items.c	Fri Dec 05 00:21:15 2003 +0000
@@ -393,7 +393,8 @@
 static void *
 do_change_dir_thread (void * data)
 {
-  int success, sj, network_timeout;
+  int success, sj;
+  intptr_t network_timeout;
   gftp_window_data * wdata;
 
   wdata = data;
--- a/src/gtk/misc-gtk.c	Fri Dec 05 00:19:48 2003 +0000
+++ b/src/gtk/misc-gtk.c	Fri Dec 05 00:21:15 2003 +0000
@@ -39,7 +39,7 @@
 ftp_log (gftp_logging_level level, gftp_request * request, 
          const char *string, ...)
 {
-  guint max_log_window_size;
+  uintptr_t max_log_window_size;
   int upd, free_logstr;
   gftp_log * newlog;
   char *logstr;
@@ -661,7 +661,8 @@
 {
   char *add_data[7] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL }, *pos;
   gftp_config_list_vars * tmplistvar;
-  int clist_num, show_hidden_files;
+  int clist_num;
+  intptr_t show_hidden_files;
   gftp_file_extensions * tempext;
   char *tempstr, *str;
   GdkBitmap * bitmap;
--- a/src/gtk/mkdir_dialog.c	Fri Dec 05 00:19:48 2003 +0000
+++ b/src/gtk/mkdir_dialog.c	Fri Dec 05 00:21:15 2003 +0000
@@ -26,7 +26,8 @@
 static void *
 do_make_dir_thread (void * data)
 {
-  int success, sj, network_timeout;
+  int success, sj;
+  intptr_t network_timeout;
   gftp_window_data * wdata;
 
   wdata = data;
--- a/src/gtk/rename_dialog.c	Fri Dec 05 00:19:48 2003 +0000
+++ b/src/gtk/rename_dialog.c	Fri Dec 05 00:21:15 2003 +0000
@@ -27,7 +27,8 @@
 static void *
 do_rename_thread (void * data)
 {
-  int success, sj, network_timeout;
+  int success, sj;
+  intptr_t network_timeout;
   gftp_window_data * wdata;
 
   wdata = data;
--- 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;