Mercurial > gftp.yaz
changeset 519:c3edcd3e9db9
2004-7-27 Brian Masney <masneyb@gftp.org>
* lib/sshv2.c - fixed SSHV2 transfers so that they work again
(they were busted in the last CVS commit due to the wrong file
offset being sent over)
* src/gtk/misc-gtk.c - fix for the log window so that the contents
are properly shown. (this was busted in the last CVS commit)
| author | masneyb |
|---|---|
| date | Wed, 28 Jul 2004 01:58:28 +0000 |
| parents | c6a6e908dbaf |
| children | e67a52327b24 |
| files | ChangeLog lib/sshv2.c src/gtk/misc-gtk.c |
| diffstat | 3 files changed, 19 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jul 28 01:37:15 2004 +0000 +++ b/ChangeLog Wed Jul 28 01:58:28 2004 +0000 @@ -1,4 +1,11 @@ 2004-7-27 Brian Masney <masneyb@gftp.org> + * lib/sshv2.c - fixed SSHV2 transfers so that they work again + (they were busted in the last CVS commit due to the wrong file + offset being sent over) + + * src/gtk/misc-gtk.c - fix for the log window so that the contents + are properly shown. (this was busted in the last CVS commit) + * lib/protocols.c lib/rfc2068.c lib/rfc959.c lib/sshv2.c src/gtk/bookmarks.c src/gtk/dnd.c src/gtk/gftp-gtk.c src/gtk/gtui.c src/gtk/menu-items.c src/misc-gtk.c src/gtk/options_dialog.c @@ -2667,7 +2674,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.296 2004/07/28 01:37:15 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.297 2004/07/28 01:58:28 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/lib/sshv2.c Wed Jul 28 01:37:15 2004 +0000 +++ b/lib/sshv2.c Wed Jul 28 01:58:28 2004 +0000 @@ -1843,12 +1843,13 @@ #ifdef G_HAVE_GINT64 static gint64 -hton64 (gint64 val) +sshv2_hton64 (gint64 val) { - if (G_BYTE_ORDER != G_BIG_ENDIAN) - return (GINT64_TO_BE (val)); - else - return (val); +#if G_BYTE_ORDER != G_BIG_ENDIAN + return (GINT64_TO_BE (val)); +#else + return (val); +#endif } #endif @@ -1861,9 +1862,9 @@ #ifdef G_HAVE_GINT64 gint64 offset; - offset = hton64 (params->offset); - lownum = offset & 0xffffffff; - hinum = offset >> 32; + offset = sshv2_hton64 (params->offset); + lownum = offset >> 32; + hinum = (guint32) offset; #else hinum = 0; lownum = htonl (params->offset);
--- a/src/gtk/misc-gtk.c Wed Jul 28 01:37:15 2004 +0000 +++ b/src/gtk/misc-gtk.c Wed Jul 28 01:58:28 2004 +0000 @@ -41,10 +41,11 @@ { uintptr_t max_log_window_size; int upd, free_logstr; - size_t len, delsize; gftp_log * newlog; + gint delsize; char *logstr; va_list argp; + size_t len; #if GTK_MAJOR_VERSION == 1 gftp_color * color; GdkColor fore;