comparison lib/config_file.c @ 84:7ef60ce2bdb2

2002-12-29 Brian Masney <[e-mail]> * lib/ssh.c lib/config_file.c lib/Makefile.am lib/gftp.h lib/options.h - removed old legacy SSH protocol and option to enable this protocol * lib/gftp.h - added GFTP_ERETRYABLE and GFTP_EFATAL error codes * lib/bookmark.c lib/local.c lib/protocols.c lib/rfc959.c lib/rfc2068.c lib/sshv2.c - return new error codes instead of -1 or -2 * lib/misc.c (gftp_*_sort_function_ds) - changed return values * src/gtk/transfer.c (connect_thread) - if return value of gftp_connect() is GFTP_EFATAL, don't attempt to retry the connection

83:462de7034797

        N_("Require a username/password for SSH connections"), NULL, GFTP_PORT_ALL},
  {"ssh_use_askpass", N_("Use ssh-askpass util"), &ssh_use_askpass, CONFIG_CHECKBOX, 
        N_("Use the ssh-askpass utility to grab the users password"), NULL, GFTP_PORT_GTK},
  {"sshv2_use_sftp_subsys", N_("Use SSH2 SFTP subsys"), &sshv2_use_sftp_subsys, CONFIG_CHECKBOX, 
        N_("Call ssh with the -s sftp flag. This is helpful because you won't have to know the remote path to the remote sftp-server"), NULL, GFTP_PORT_GTK},
  {"enable_old_ssh", N_("Enable old SSH protocol"), &enable_old_ssh, CONFIG_CHECKBOX, 
        N_("Enable the old SSH protocol. You will need to download the sftp server from http:///www.xbill.org/sftp"), NULL, GFTP_PORT_ALL},

  {"list_dblclk_action", "", &listbox_dblclick_action, CONFIG_HIDEINT, 
	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"), NULL, 0},
  {"listbox_local_width", "", &listbox_local_width, CONFIG_HIDEINT, 
	N_("The default width of the local files listbox"), NULL, 0},

    {
      default_protocol = g_malloc (4);
      strcpy (default_protocol, "FTP");
    }

  if (!enable_old_ssh)
    {
      gftp_protocols[GFTP_SSH_NUM].name = NULL;
      gftp_protocols[GFTP_SSH_NUM].init = NULL;
      gftp_protocols[GFTP_SSH_NUM].url_prefix = NULL;
      gftp_protocols[GFTP_SSH_NUM].shown = 0;
    }

  if ((tempstr = expand_path (LOG_FILE)) == NULL)
    {
      printf (_("gFTP Error: Bad log file name %s\n"), LOG_FILE);
      exit (0);
    }

84:7ef60ce2bdb2

        N_("Require a username/password for SSH connections"), NULL, GFTP_PORT_ALL},
  {"ssh_use_askpass", N_("Use ssh-askpass util"), &ssh_use_askpass, CONFIG_CHECKBOX, 
        N_("Use the ssh-askpass utility to grab the users password"), NULL, GFTP_PORT_GTK},
  {"sshv2_use_sftp_subsys", N_("Use SSH2 SFTP subsys"), &sshv2_use_sftp_subsys, CONFIG_CHECKBOX, 
        N_("Call ssh with the -s sftp flag. This is helpful because you won't have to know the remote path to the remote sftp-server"), NULL, GFTP_PORT_GTK},

  {"list_dblclk_action", "", &listbox_dblclick_action, CONFIG_HIDEINT, 
	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"), NULL, 0},
  {"listbox_local_width", "", &listbox_local_width, CONFIG_HIDEINT, 
	N_("The default width of the local files listbox"), NULL, 0},

    {
      default_protocol = g_malloc (4);
      strcpy (default_protocol, "FTP");
    }

  if ((tempstr = expand_path (LOG_FILE)) == NULL)
    {
      printf (_("gFTP Error: Bad log file name %s\n"), LOG_FILE);
      exit (0);
    }