diff lib/options.h @ 125:b875de05c22d

2003-4-8 Brian Masney <[e-mail]> * src/text/gftp-text.c lib/misc.c - moved r_gethostbyname() and r_getservbyname() to lib/misc.c. Now uses GMutex functions * lib/config_file.c lib/gftp.h lib/options.h - added config variable type textcombo. default_protocol uses this * lib/config_file.c (gftp_read_config_file) - when reading in the list of supported protocols, add the protocol names to the list associated with default_protocol. Also, don't try to have default_protocol fall back to FTP. The code that uses this will fall back properly * lib/gftp.h (struct gftp_transfer) - renamed node to user_data * lib/misc.c lib/gftp.h - moved parse_attribs() from src/gtk/transfer.c to misc.c. Renamed to gftp_parse_attribs() * lib/protocols.c lib/gftp.h - moved get_status() from src/gtk/transfer.c to protocols.c. Renamed to gftp_get_transfer_status(). Uses GMutex functions

--- a/lib/options.h	Tue Apr 08 01:43:33 2003 +0000
+++ b/lib/options.h	Tue Apr 08 22:28:17 2003 +0000
@@ -98,12 +98,11 @@
    gftp_option_type_float, &gftp_maxkbs, NULL, 0,
    N_("The maximum KB/s a file transfer can get. (Set to 0 to disable)"),  
    GFTP_PORT_ALL, NULL},
-/* FIXME
- {"", N_("Default Protocol"), (void *) 0x1, CONFIG_COMBO, "DP", NULL, GFTP_PORT_GTK},
-  {"default_protocol", N_("Default Protocol"), &default_protocol, 
-        CONFIG_CHARTEXT, N_("This specifies the default protocol to use"), NULL, 0},
 
-*/
+  {"default_protocol", N_("Default Protocol"),
+   gftp_option_type_textcombo, "FTP", NULL, 0,
+   N_("This specifies the default protocol to use"), GFTP_PORT_ALL, NULL},
+
   {"list_dblclk_action", "", 
    gftp_option_type_int, GINT_TO_POINTER(0), NULL, 0,
    N_("This defines what will happen when you double click a file in the file listboxes. 0=View file 1=Edit file 2=Transfer file"), 0, NULL},