diff lib/protocols.c @ 555:7f54d0c0edbc

2004-9-17 Brian Masney <[e-mail]> * lib/misc.c lib/cache.c lib/config_file.c lib/gftp.h lib/protocols.c lib/rfc2068.c lib/sshv2.c src/gtk/bookmarks.c src/gtk/dnd.c src/gtk/gftp-gtk.c src/gtk/gtkui.c src/gtk/menu-items.c src/gtk/misc-gtk.c src/gtk/transfer.c src/uicommon/gftpui.c - added gftp_request argument to gftp_build_path() and expand_path(). Renamed expand_path() to gftp_expand_path() * lib/gftp.h - fixed compile error in gftp_need_username macro

--- a/lib/protocols.c	Tue Sep 14 10:24:01 2004 +0000
+++ b/lib/protocols.c	Fri Sep 17 23:37:47 2004 +0000
@@ -1856,14 +1856,16 @@
         fle->startsize = *newsize;
 
       if (transfer->toreq && fle->destfile == NULL)
-        fle->destfile = gftp_build_path (transfer->toreq->directory, 
+        fle->destfile = gftp_build_path (transfer->toreq,
+                                         transfer->toreq->directory, 
                                          fle->file, NULL);
 
       if (transfer->fromreq->directory != NULL &&
           *transfer->fromreq->directory != '\0' &&
           *fle->file != '/')
         {
-          newname = gftp_build_path (transfer->fromreq->directory,
+          newname = gftp_build_path (transfer->fromreq,
+                                     transfer->fromreq->directory,
                                      fle->file, NULL);
 
           g_free (fle->file);
@@ -1933,13 +1935,15 @@
         }
 
       if (transfer->toreq && curfle->destfile == NULL)
-        curfle->destfile = gftp_build_path (transfer->toreq->directory, 
+        curfle->destfile = gftp_build_path (transfer->toreq,
+                                            transfer->toreq->directory, 
                                             curfle->file, NULL);
 
       if (transfer->fromreq->directory != NULL &&
           *transfer->fromreq->directory != '\0' && *curfle->file != '/')
         {
-          newname = gftp_build_path (transfer->fromreq->directory,
+          newname = gftp_build_path (transfer->fromreq,
+                                     transfer->fromreq->directory,
                                      curfle->file, NULL);
           g_free (curfle->file);
           curfle->file = newname;
@@ -2932,7 +2936,7 @@
   gftp_lookup_request_option (request, "startup_directory", &startup_directory);
 
   if (*startup_directory != '\0' &&
-      (tempstr = expand_path (startup_directory)) != NULL)
+      (tempstr = gftp_expand_path (request, startup_directory)) != NULL)
     {
       gftp_set_directory (request, tempstr);
       g_free (tempstr);