Mercurial > gftp.yaz
changeset 187:a8ec69e39112
2003-6-16 Brian Masney <masneyb@gftp.org>
* lib/protocols.c - run g_iconv_close() in gftp_disconnect() instead
of gftp_end_transfer()
| author | masneyb |
|---|---|
| date | Tue, 17 Jun 2003 10:51:49 +0000 |
| parents | 13ca1defdc75 |
| children | 836822c2d4e7 |
| files | ChangeLog lib/protocols.c |
| diffstat | 2 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jun 17 10:49:16 2003 +0000 +++ b/ChangeLog Tue Jun 17 10:51:49 2003 +0000 @@ -1,4 +1,7 @@ 2003-6-16 Brian Masney <masneyb@gftp.org> + * lib/protocols.c - run g_iconv_close() in gftp_disconnect() instead + of gftp_end_transfer() + * lib/gftp.h src/text/gftp-text.c src/gtk/misc-gtk.c - changed 2nd parameter of logging function to be a request structure, instead of request->user_data. In the logging functions, if the string isn't in @@ -1021,7 +1024,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.92 2003/06/17 10:49:13 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.93 2003/06/17 10:51:48 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/lib/protocols.c Tue Jun 17 10:49:16 2003 +0000 +++ b/lib/protocols.c Tue Jun 17 10:51:49 2003 +0000 @@ -137,6 +137,14 @@ } #endif +#if GLIB_MAJOR_VERSION > 1 + if (request->iconv_initialized) + { + g_iconv_close (request->iconv); + request->iconv_initialized = 0; + } +#endif + request->cached = 0; if (request->disconnect == NULL) return; @@ -282,12 +290,6 @@ request->last_dir_entry_len = 0; } - if (request->iconv_initialized) - { - g_iconv_close (request->iconv); - request->iconv_initialized = 0; - } - return (ret); }