Mercurial > gftp.yaz

diff src/gtk/menu-items.c @ 555:7f54d0c0edbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 7262851e3ae8
children 2366865be140
line wrap: on
line diff
--- a/src/gtk/menu-items.c	Tue Sep 14 10:24:01 2004 +0000
+++ b/src/gtk/menu-items.c	Fri Sep 17 23:37:47 2004 +0000
@@ -262,7 +262,7 @@
       return (0);
     }
 
-  if ((tempstr = expand_path (edttxt)) == NULL)
+  if ((tempstr = gftp_expand_path (wdata->request, edttxt)) == NULL)
     return (FALSE);
 
   if (gftpui_run_chdir (wdata, tempstr))
@@ -580,12 +580,12 @@
     {
       g_free (tempstr);
       temp1str = g_strconcat (share_dir, "/COPYING", NULL);
-      tempstr = expand_path (temp1str);
+      tempstr = gftp_expand_path (NULL, temp1str);
       g_free (temp1str);
       if (access (tempstr, F_OK) != 0)
 	{
 	  g_free (tempstr);
-          tempstr = expand_path (BASE_CONF_DIR "/COPYING");
+          tempstr = gftp_expand_path (NULL, BASE_CONF_DIR "/COPYING");
 	  if (access (tempstr, F_OK) != 0)
 	    {
 #if GTK_MAJOR_VERSION == 1