Mercurial > gftp.yaz
diff src/gtk/misc-gtk.c @ 66:cd3e457cbc85
2002-11-26 Brian Masney <masneyb@gftp.org>
* configure.in - change version to 2.0.14rc1
* lib/local.c - fix for uploading files. Move setting of hostname
from local_connect() to local_init()
* lib/misc.c (gftp_request) - copy only select fields over instead of
whole structure
* lib/protocols.c (gftp_request_new) - set datafd and cachefd to -1
* lib/protocols.c (gftp_set_proxy_config) - allow a NULL proxy_config
to be passed
* src/gtk/misc-gtk.c (update_window) - don't show the hostname if we
are connected via the local protocol
* src/gtk/transfer.c (create_transfer) - check to see if this protocol
is always connected
author | masneyb |
---|---|
date | Wed, 27 Nov 2002 02:23:51 +0000 |
parents | 41b71c4e5076 |
children | c48f19f24050 |
line wrap: on
line diff
--- a/src/gtk/misc-gtk.c Tue Nov 26 14:58:13 2002 +0000 +++ b/src/gtk/misc-gtk.c Wed Nov 27 02:23:51 2002 +0000 @@ -298,7 +298,8 @@ { fspec = wdata->show_selected ? "Selected" : strcmp (wdata->filespec, "*") == 0 ? _("All Files") : wdata->filespec; - if ((temp1str = GFTP_GET_HOSTNAME (wdata->request)) == NULL) + if ((temp1str = GFTP_GET_HOSTNAME (wdata->request)) == NULL || + wdata->request->protonum == GFTP_LOCAL_NUM) temp1str = ""; tempstr = g_strconcat (temp1str, *temp1str == '\0' ? "[" : " [", GFTP_GET_PROTOCOL_NAME (wdata->request), @@ -687,6 +688,7 @@ check_reconnect (gftp_window_data *wdata) { return (wdata->request->cached && wdata->request->sockfd < 0 && + !wdata->request->always_connected && !ftp_connect (wdata, wdata->request, 0) ? -1 : 0); }