diff lib/gftp.h @ 227:a85a097bbb02

2003-7-20 Brian Masney <[e-mail]> * lib/config_file.c lib/gftp.h - added compare_function to gftp_config_vars structure. (gftp_set_global_option) use the compare function to see if the value was actually changed, and if so set the gftp_configuration_changed variable * lib/misc.c lib/gftp.h - For glib 1.2, added my version of g_build_path() since it's not there * lib/misc.c - GLIB/GTK+ 1.2 fixes * lib/protocols.c (gftp_fd_open) - cleaned up some * lib/rfc959.c (rfc959_init) - if the email address is blank, get the users address here instead of in register_module. It was being blanked out when the config file was being read * lib/options.h lib/rfc2068.c lib/rfc959.c lib/sshv2.c - mark the config variables that can show up in the bookmarks editor * src/text/gftp-text.c src/gtk/options_dialog.c - use gftp_set_global_option() to set the new configuration values * src/gtk/bookmarks.c - fixed crash in bookmarks dialog. Added notebook widget to the dialog as well. The options that can be edited for this site will show up in other tabs * src/gtk/gftp-gtk.c - fixes to the calls to gftp_set_global_option() * src/gtk/options_dialog.c - added gftp_gtk_setup_bookmark_options() to display all the editable options for this bookmark

--- a/lib/gftp.h	Mon Jul 21 00:22:46 2003 +0000
+++ b/lib/gftp.h	Mon Jul 21 00:26:43 2003 +0000
@@ -274,7 +274,7 @@
 
 #define GFTP_CVARS_FLAGS_DYNMEM			(1 << 1)
 #define GFTP_CVARS_FLAGS_DYNLISTMEM		(1 << 2)
-
+#define GFTP_CVARS_FLAGS_SHOW_BOOKMARK		(1 << 3)
 
 typedef struct gftp_config_vars_tag
 {
@@ -298,6 +298,7 @@
   int (*read_function) (char *str, gftp_config_vars * cv, int line);
   int (*write_function) (gftp_config_vars * cv, FILE * fd, int to_config_file);
   void (*copy_function) (gftp_config_vars * cv, gftp_config_vars * dest_cv);
+  int (*compare_function) (gftp_config_vars * cv1, gftp_config_vars * cv2);
   void * (*ui_print_function) (gftp_config_vars * cv, void *user_data);
   void (*ui_save_function) (gftp_config_vars * cv, void *user_data);
   void (*ui_cancel_function) (gftp_config_vars * cv, void *user_data);
@@ -636,7 +637,7 @@
 					  void *value );
 
 void gftp_set_global_option 		( char * key, 
-					  void *value );
+					  const void *value );
 
 void gftp_set_request_option 		( gftp_request * request, 
 					  char * key, 
@@ -725,6 +726,14 @@
 					  GList ** list, 
 					  int *curnum );
 
+#if GLIB_MAJOR_VERSION == 1
+
+gchar * g_build_path 			( const gchar *separator, 
+					  const gchar *first_element,
+					  ... );
+
+#endif
+
 /* protocols.c */
 #define GFTP_FTP_NUM				0
 #define GFTP_HTTP_NUM				1