diff lib/protocols.c @ 243:b42e7233533a

2003-7-31 Brian Masney <[e-mail]> * lib/sshv2.c - fix blocking problem reading the error message from the remote server when there was an error establishing a connection * lib/misc.c (copy_fdata) - copy utf8_file variable in gftp_file structure. (fix double free that was only in development version) * lib/misc.c - added --info argument to the command line. This will call gftp_info(), which will print out some information about how gftp was compiled. * lib/protocols.c lib/bookmarks.c lib/gftp.h src/gtk/bookmarks.c - added local_request parameter to gftp_parse_bookmark(). If this is not NULL, and this bookmark specifies a local directory, it will change to it. * configure.in - increment version to 2.0.15rc2

--- a/lib/protocols.c	Wed Jul 30 04:28:12 2003 +0000
+++ b/lib/protocols.c	Fri Aug 01 01:47:54 2003 +0000
@@ -476,7 +476,8 @@
 
 
 int
-gftp_parse_bookmark (gftp_request * request, const char * bookmark)
+gftp_parse_bookmark (gftp_request * request, gftp_request * local_request, 
+                     const char * bookmark)
 {
   gftp_logging_func logging_function;
   gftp_bookmarks_var * tempentry;
@@ -518,6 +519,11 @@
   gftp_set_directory (request, tempentry->remote_dir);
   gftp_set_port (request, tempentry->port);
 
+  if (local_request != NULL &&
+      tempentry->local_dir != NULL &&
+      *tempentry->local_dir != '\0')
+    gftp_set_directory (local_request, tempentry->local_dir);
+
   for (i = 0; gftp_protocols[i].name; i++)
     {
       if (strcmp (gftp_protocols[i].name, tempentry->protocol) == 0)