changeset 429:1d45758e5cf5

2004-3-17 Brian Masney <masneyb@gftp.org> * lib/config_file.c lib/gftp.h lib/misc.c lib/protocols.c src/gtk/bookmarks.c (gftp_copy_local_options) - in the new options that are copied, update the the number of options that are stored.
author masneyb
date Wed, 17 Mar 2004 13:03:25 +0000
parents f882d8e205c5
children f2bf216a8091
files ChangeLog TODO lib/config_file.c lib/gftp.h lib/misc.c lib/protocols.c src/gtk/bookmarks.c
diffstat 7 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Mar 17 12:00:08 2004 +0000
+++ b/ChangeLog	Wed Mar 17 13:03:25 2004 +0000
@@ -1,4 +1,9 @@
 2004-3-17 Brian Masney <masneyb@gftp.org>
+	* lib/config_file.c lib/gftp.h lib/misc.c lib/protocols.c
+	src/gtk/bookmarks.c (gftp_copy_local_options) - in the new
+	options that are copied, update the the number of options that are
+	stored.
+
 	* lib/rfc2068.c (parse_html_line) - fix for parsing file sizes
 
 	* ChangeLog-old - updated with summary of changes since 2.0.16
@@ -2294,7 +2299,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.235 2004/03/17 11:59:25 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.236 2004/03/17 13:03:22 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
--- a/TODO	Wed Mar 17 12:00:08 2004 +0000
+++ b/TODO	Wed Mar 17 13:03:25 2004 +0000
@@ -2,9 +2,6 @@
 of gFTP. If there is something you feel should be included in a future
 version of gFTP, please email me about it.
 
-* FXP transfers segfault
-* Does not work with rssh, need to improve the SSH login sequence
-
 * If the IPV6 connection fails, automatically try a IPV4 connection.
 * I need to be able to send an event from the core library to the presentation
   layer to have it ask the user a question. I need this for the SSL layer so 
--- a/lib/config_file.c	Wed Mar 17 12:00:08 2004 +0000
+++ b/lib/config_file.c	Wed Mar 17 13:03:25 2004 +0000
@@ -1448,11 +1448,13 @@
 void
 gftp_copy_local_options (gftp_config_vars ** new_options_vars, 
                          GHashTable ** new_options_hash,
+                         int *new_num_local_options_vars,
                          gftp_config_vars * orig_options,
                          int num_local_options_vars)
 {
   int i;
 
+  *new_num_local_options_vars = num_local_options_vars;
   if (orig_options == NULL || num_local_options_vars == 0)
     {
       *new_options_vars = NULL;
--- a/lib/gftp.h	Wed Mar 17 12:00:08 2004 +0000
+++ b/lib/gftp.h	Wed Mar 17 13:03:25 2004 +0000
@@ -668,6 +668,7 @@
 
 void gftp_copy_local_options 		( gftp_config_vars ** new_options_vars, 
 					  GHashTable ** new_options_hash,
+					  int *new_num_local_options_vars,
 					  gftp_config_vars * orig_options,
 					  int num_local_options_vars );
 
--- a/lib/misc.c	Wed Mar 17 12:00:08 2004 +0000
+++ b/lib/misc.c	Wed Mar 17 13:03:25 2004 +0000
@@ -611,6 +611,7 @@
 
   gftp_copy_local_options (&newreq->local_options_vars, 
                            &newreq->local_options_hash,
+                           &newreq->num_local_options_vars,
                            req->local_options_vars,
                            req->num_local_options_vars);
 
--- a/lib/protocols.c	Wed Mar 17 12:00:08 2004 +0000
+++ b/lib/protocols.c	Wed Mar 17 13:03:25 2004 +0000
@@ -626,6 +626,7 @@
 
   gftp_copy_local_options (&request->local_options_vars,
                            &request->local_options_hash,
+                           &request->num_local_options_vars,
                            tempentry->local_options_vars,
                            tempentry->num_local_options_vars);
 
--- a/src/gtk/bookmarks.c	Wed Mar 17 12:00:08 2004 +0000
+++ b/src/gtk/bookmarks.c	Wed Mar 17 13:03:25 2004 +0000
@@ -229,6 +229,7 @@
 
       gftp_copy_local_options (&newentry->local_options_vars,
                                &newentry->local_options_hash,
+                               &newentry->num_local_options_vars,
                                tempentry->local_options_vars,
                                tempentry->num_local_options_vars);
       newentry->num_local_options_vars = tempentry->num_local_options_vars;