Mercurial > gftp.yaz
changeset 368:af541d789f4c
2003-1-18 Brian Masney <masneyb@gftp.org>
* lib/gftp.h lib/misc.c src/gtk/delete_dialog.c src/gtk/transfer.c
src/gtk/view_dialog.c src/uicommon/gftpui.c - renamed all instances of
copy_request() to gftp_copy_request(). Removed second argument
(copy_local_options), the options are always copied now.
| author | masneyb |
|---|---|
| date | Sun, 18 Jan 2004 20:18:19 +0000 |
| parents | d5409bf03ff1 |
| children | c63208a1f0f1 |
| files | ChangeLog lib/gftp.h lib/misc.c src/gtk/delete_dialog.c src/gtk/transfer.c src/gtk/view_dialog.c src/uicommon/gftpui.c |
| diffstat | 7 files changed, 18 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jan 18 20:09:28 2004 +0000 +++ b/ChangeLog Sun Jan 18 20:18:19 2004 +0000 @@ -1,4 +1,9 @@ 2003-1-18 Brian Masney <masneyb@gftp.org> + * lib/gftp.h lib/misc.c src/gtk/delete_dialog.c src/gtk/transfer.c + src/gtk/view_dialog.c src/uicommon/gftpui.c - renamed all instances of + copy_request() to gftp_copy_request(). Removed second argument + (copy_local_options), the options are always copied now. + * lib/protocols.c (gftp_parse_url) - if the URL is the local filesystem, skip over the whitespace at the beginning. @@ -2004,7 +2009,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.201 2004/01/18 20:09:24 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.202 2004/01/18 20:18:17 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/lib/gftp.h Sun Jan 18 20:09:28 2004 +0000 +++ b/lib/gftp.h Sun Jan 18 20:18:19 2004 +0000 @@ -706,8 +706,7 @@ void free_tdata ( gftp_transfer * tdata ); -gftp_request * copy_request ( gftp_request * req, - int copy_local_options ); +gftp_request * gftp_copy_request ( gftp_request * req ); GList * gftp_sort_filelist ( GList * filelist, int column,
--- a/lib/misc.c Sun Jan 18 20:09:28 2004 +0000 +++ b/lib/misc.c Sun Jan 18 20:18:19 2004 +0000 @@ -586,7 +586,7 @@ gftp_request * -copy_request (gftp_request * req, int copy_local_options) +gftp_copy_request (gftp_request * req) { gftp_request * newreq; @@ -608,11 +608,10 @@ newreq->free_hostp = 0; newreq->hostp = NULL; - if (copy_local_options) - gftp_copy_local_options (&newreq->local_options_vars, - &newreq->local_options_hash, - req->local_options_vars, - req->num_local_options_vars); + gftp_copy_local_options (&newreq->local_options_vars, + &newreq->local_options_hash, + req->local_options_vars, + req->num_local_options_vars); if (req->init (newreq) < 0) {
--- a/src/gtk/delete_dialog.c Sun Jan 18 20:09:28 2004 +0000 +++ b/src/gtk/delete_dialog.c Sun Jan 18 20:18:19 2004 +0000 @@ -177,7 +177,7 @@ return; transfer = g_malloc0 (sizeof (*transfer)); - transfer->fromreq = copy_request (wdata->request, 0); + transfer->fromreq = gftp_copy_request (wdata->request); transfer->fromwdata = wdata; num = 0;
--- a/src/gtk/transfer.c Sun Jan 18 20:09:28 2004 +0000 +++ b/src/gtk/transfer.c Sun Jan 18 20:18:19 2004 +0000 @@ -105,8 +105,8 @@ return; transfer = g_malloc0 (sizeof (*transfer)); - transfer->fromreq = copy_request (fromwdata->request, 0); - transfer->toreq = copy_request (towdata->request, 0); + transfer->fromreq = gftp_copy_request (fromwdata->request); + transfer->toreq = gftp_copy_request (towdata->request); transfer->fromwdata = fromwdata; transfer->towdata = towdata;
--- a/src/gtk/view_dialog.c Sun Jan 18 20:09:28 2004 +0000 +++ b/src/gtk/view_dialog.c Sun Jan 18 20:18:19 2004 +0000 @@ -199,7 +199,7 @@ newproc->fromwdata = &window1; newproc->towdata = &window2; } - newproc->torequest = copy_request (newproc->towdata->request, 1); + newproc->torequest = gftp_copy_request (newproc->towdata->request); newproc->filename = g_strdup (filename); if (remote_filename != NULL) newproc->remote_filename = g_strdup (remote_filename);
--- a/src/uicommon/gftpui.c Sun Jan 18 20:09:28 2004 +0000 +++ b/src/uicommon/gftpui.c Sun Jan 18 20:18:19 2004 +0000 @@ -1036,8 +1036,8 @@ if (templist == NULL) { tdata = gftp_tdata_new (); - tdata->fromreq = copy_request (fromreq, 0); - tdata->toreq = copy_request (toreq, 0); + tdata->fromreq = gftp_copy_request (fromreq); + tdata->toreq = gftp_copy_request (toreq); tdata->fromwdata = fromuidata; tdata->towdata = touidata;