diff src/gtk/bookmarks.c @ 555:7f54d0c0edbc

2004-9-17 Brian Masney <masneyb@gftp.org> * 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
author masneyb
date Fri, 17 Sep 2004 23:37:47 +0000
parents 79908ac335d2
children 447f40a61ee8
line wrap: on
line diff
--- a/src/gtk/bookmarks.c	Tue Sep 14 10:24:01 2004 +0000
+++ b/src/gtk/bookmarks.c	Fri Sep 17 23:37:47 2004 +0000
@@ -691,7 +691,7 @@
       *pos = '\0';
     }
 
-  origpath = newpath = gftp_build_path (entry->path, gtk_entry_get_text (GTK_ENTRY (bm_pathedit)), NULL);
+  origpath = newpath = gftp_build_path (NULL, entry->path,gtk_entry_get_text (GTK_ENTRY (bm_pathedit)), NULL);
   *pos = tempchar;
 
   str = gtk_entry_get_text (GTK_ENTRY (bm_hostedit));
@@ -757,7 +757,8 @@
           if (*(tempentry->path + oldpathlen) == '\0')
 	    tempstr = g_strdup (newpath);
           else
-	    tempstr = gftp_build_path (newpath, tempentry->path + oldpathlen, NULL);
+	    tempstr = gftp_build_path (NULL, newpath,
+                                       tempentry->path + oldpathlen, NULL);
 
 	  g_free (tempentry->path);
 	  tempentry->path = tempstr;