diff src/gtk/bookmarks.c @ 229:35ae2e80962e

2003-7-22 Brian Masney <[e-mail]> * lib/config_file.c lib/gftp.h - added gftp_lookup_bookmark_option() and gftp_set_bookmark_option(). Also added _gftp_set_option_value() that is used by the set functions for bookmark and request structures * src/gtk/bookmarks.c - make sure the options are copied over to the new bookmarks. Also show all of the editable toptions for this bookmark entry * src/gtk/options_dialog.c src/gtk/gftp-gtk.h lib/config_file.c lib/gftp.h - improvements to overriding options for each bookmark entry. There is still one crash that is occuring that I have to track down. For the moment, don't edit the bookmarks twice in the same session.

--- a/src/gtk/bookmarks.c	Mon Jul 21 19:54:10 2003 +0000
+++ b/src/gtk/bookmarks.c	Wed Jul 23 02:39:24 2003 +0000
@@ -220,6 +220,12 @@
 
       newentry->port = tempentry->port;
 
+      gftp_copy_local_options (&newentry->local_options_vars,
+                               &newentry->local_options_hash,
+                               tempentry->local_options_vars,
+                               tempentry->num_local_options_vars);
+      newentry->num_local_options_vars = tempentry->num_local_options_vars;
+
       if (sibling == NULL)
 	{
 	  if (preventry->children == NULL)
@@ -261,6 +267,7 @@
 	    }
 	}
     }
+
   return (new_bm);
 }
 
@@ -734,6 +741,8 @@
     g_free (entry->acct);
   entry->acct = g_strdup (str);
 
+  gftp_gtk_save_bookmark_options (entry);
+
   if (strcmp (entry->path, newpath) != 0)
     {
       tempentry = entry;
@@ -1036,7 +1045,7 @@
                     G_CALLBACK (bmedit_action), (gpointer) entry);
 #endif
 
-/* FIXME gftp_gtk_setup_bookmark_options (notebook); */
+  gftp_gtk_setup_bookmark_options (notebook, entry);
 
   gtk_widget_show (dialog);
 }