Mercurial > gftp.yaz
comparison lib/protocols.c @ 397:14ef37b62c20
2004-2-8 Brian Masney <masneyb@gftp.org>
* src/gtk/gftp-gtk.h src/gtk/gtkui.c - added
gftpui_gtk_get_utf8_file_pos() that will return the file in UTF8
format if it is available
* src/gtk/gtkui_transfer.c src/gtk/transfer.c - call
gftpui_gtk_get_utf8_file_pos() to display the file in the file transfer
status. This fixes a bug where non-UTF8 files were being chopped off
* src/text/textui.c src/uicommon/gftpui.c src/uicommon/gftpui.h
src/text/gtkui_transfer.c - updated declaration of
gftpui_add_file_to_transfer()
* lib/protocols.c (gftp_swap_socks) - swap the SSL sockets between
the two request structures
* lib/ftps.c - added ftps_get_next_file() that will pull items from
the cache properly
* lib/Makefile.am - updated LOCALE_DIR declaration
(from Sung-Hyun Nam <namsh@kldp.org>)
* ChangeLog-old - updated summary of changes since 2.0.16
* TODO - removed several items that were completed
author | masneyb |
---|---|
date | Sun, 08 Feb 2004 16:19:26 +0000 |
parents | 1c86bcb0b232 |
children | 38bfc112ab46 |
comparison
equal
deleted
inserted
replaced
396:151d91e84b39 | 397:14ef37b62c20 |
---|---|
2531 g_return_if_fail (source != NULL); | 2531 g_return_if_fail (source != NULL); |
2532 g_return_if_fail (dest->protonum == source->protonum); | 2532 g_return_if_fail (dest->protonum == source->protonum); |
2533 | 2533 |
2534 dest->datafd = source->datafd; | 2534 dest->datafd = source->datafd; |
2535 dest->cached = 0; | 2535 dest->cached = 0; |
2536 #ifdef USE_SSL | |
2537 dest->ssl = source->ssl; | |
2538 #endif | |
2539 | |
2536 if (!source->always_connected) | 2540 if (!source->always_connected) |
2537 { | 2541 { |
2538 source->datafd = -1; | 2542 source->datafd = -1; |
2539 source->cached = 1; | 2543 source->cached = 1; |
2544 #ifdef USE_SSL | |
2545 source->ssl = NULL; | |
2546 #endif | |
2540 } | 2547 } |
2541 | 2548 |
2542 if (dest->swap_socks) | 2549 if (dest->swap_socks) |
2543 dest->swap_socks (dest, source); | 2550 dest->swap_socks (dest, source); |
2544 } | 2551 } |