diff lib/misc.c @ 66:cd3e457cbc85

2002-11-26 Brian Masney <[e-mail]> * 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

--- a/lib/misc.c	Tue Nov 26 14:58:13 2002 +0000
+++ b/lib/misc.c	Wed Nov 27 02:23:51 2002 +0000
@@ -569,8 +569,7 @@
 {
   gftp_request * newreq;
 
-  newreq = g_malloc0 (sizeof (*newreq));
-  memcpy (newreq, req, sizeof (*newreq));
+  newreq = gftp_request_new ();
 
   if (req->hostname)
     newreq->hostname = g_strdup (req->hostname);
@@ -582,24 +581,20 @@
     newreq->account = g_strdup (req->account);
   if (req->directory)
     newreq->directory = g_strdup (req->directory);
+  newreq->port = req->port;
+  newreq->data_type = req->data_type;
+  newreq->use_proxy = req->use_proxy;
+  gftp_set_proxy_config (newreq, req->proxy_config);
+  newreq->transfer_type = req->transfer_type;
+  newreq->network_timeout = req->network_timeout;
+  newreq->retries = req->retries;
+  newreq->sleep_time = req->sleep_time;
+  newreq->passive_transfer = req->passive_transfer;
+  newreq->maxkbs = req->maxkbs;
+  newreq->logging_function = req->logging_function;
 
-  newreq->url_prefix = NULL;
-  newreq->protocol_name = NULL;
-  newreq->sftpserv_path = NULL;
-  newreq->proxy_config = NULL;
-  newreq->proxy_hostname = NULL;
-  newreq->proxy_username = NULL;
-  newreq->proxy_password = NULL;
-  newreq->proxy_account = NULL;
-  newreq->last_ftp_response = NULL;
-  newreq->last_dir_entry = NULL;
-  newreq->sockfd = -1;
-  newreq->datafd = -1;
-  newreq->cachefd = -1;
-  newreq->hostp = NULL;
-  
-  if (req->proxy_config != NULL)
-    newreq->proxy_config = g_strdup (req->proxy_config);
+  if (req->sftpserv_path != NULL)
+    newreq->sftpserv_path = g_strdup (req->sftpserv_path);
 
   req->init (newreq);