Mercurial > gftp.yaz
changeset 472:5100b89c44e1
2004-5-26 Brian Masney <masneyb@gftp.org>
* src/gtk/dnd.c - when a URL is dropped on the connect button, log the
URL that is received
* src/gtk/gftp-gtk.c src/gtk/options_dialog.c - more 64 bit cleanups
| author | masneyb |
|---|---|
| date | Thu, 27 May 2004 09:54:57 +0000 |
| parents | f78b7f3b4919 |
| children | 45fb9dc47a2e |
| files | ChangeLog src/gtk/dnd.c src/gtk/gftp-gtk.c src/gtk/options_dialog.c |
| diffstat | 4 files changed, 21 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu May 20 16:35:09 2004 +0000 +++ b/ChangeLog Thu May 27 09:54:57 2004 +0000 @@ -1,3 +1,9 @@ +2004-5-26 Brian Masney <masneyb@gftp.org> + * src/gtk/dnd.c - when a URL is dropped on the connect button, log the + URL that is received + + * src/gtk/gftp-gtk.c src/gtk/options_dialog.c - more 64 bit cleanups + 2004-5-16 Brian Masney <masneyb@gftp.org> * src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h src/gtk/transfer.c - fixed detection of SIGCHLD when viewing/editing a file (from @@ -2463,7 +2469,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.262 2004/05/16 13:34:02 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.263 2004/05/27 09:54:57 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/src/gtk/dnd.c Thu May 20 16:35:09 2004 +0000 +++ b/src/gtk/dnd.c Thu May 27 09:54:57 2004 +0000 @@ -123,7 +123,12 @@ if (gftp_parse_url (current_wdata->request, (char *) selection_data->data) == 0) - ftp_connect (current_wdata, current_wdata->request, 1); + { + ftp_log (gftp_logging_misc, NULL, + _("Received URL %s\n"), (char *) selection_data->data); + + ftp_connect (current_wdata, current_wdata->request, 1); + } } }
--- a/src/gtk/gftp-gtk.c Thu May 20 16:35:09 2004 +0000 +++ b/src/gtk/gftp-gtk.c Thu May 27 09:54:57 2004 +0000 @@ -55,7 +55,7 @@ static void doexit (GtkWidget * widget, gpointer data) { - int ret; + intptr_t ret; ret = GTK_WIDGET (local_frame)->allocation.width; gftp_set_global_option ("listbox_local_width", GINT_TO_POINTER (ret)); @@ -1091,11 +1091,11 @@ sortrows (GtkCList * clist, gint column, gpointer data) { char sortcol_name[25], sortasds_name[25]; - int swap_col; intptr_t sortcol, sortasds; gftp_window_data * wdata; GtkWidget * sort_wid; GList * templist; + int swap_col; wdata = data; g_snprintf (sortcol_name, sizeof (sortcol_name), "%s_sortcol", wdata->prefix_col_str);
--- a/src/gtk/options_dialog.c Thu May 20 16:35:09 2004 +0000 +++ b/src/gtk/options_dialog.c Thu May 27 09:54:57 2004 +0000 @@ -517,7 +517,7 @@ { gftp_options_dialog_data * option_data; const char *tempstr; - int val; + intptr_t val; option_data = user_data; tempstr = gtk_entry_get_text (GTK_ENTRY (cv->user_data)); @@ -577,7 +577,7 @@ _save_option_type_checkbox (gftp_config_vars * cv, void *user_data) { gftp_options_dialog_data * option_data; - int val; + intptr_t val; option_data = user_data; @@ -612,19 +612,17 @@ _save_option_type_float (gftp_config_vars * cv, void *user_data) { gftp_options_dialog_data * option_data; + union { void *ptr; float f; } fv; const char *tempstr; - void *val; - float f; option_data = user_data; tempstr = gtk_entry_get_text (GTK_ENTRY (cv->user_data)); - f = strtod (tempstr, NULL); - memcpy (&val, &f, sizeof (val)); + fv.f = strtod (tempstr, NULL); if (option_data->bm == NULL) - gftp_set_global_option (cv->key, val); + gftp_set_global_option (cv->key, fv.ptr); else - gftp_set_bookmark_option (option_data->bm, cv->key, val); + gftp_set_bookmark_option (option_data->bm, cv->key, fv.ptr); }