comparison src/gtk/dnd.c @ 173:4c288d05b26a

2003-6-8 Brian Masney <[e-mail]> * lib/bookmark.c lib/gftp.h lib/https.c lib/local.c lib/misc.c lib/protocols.c lib/rfc2068.c lib/rfc959.c lib/sshv2.c src/text/gftp-text.c src/gtk/gftp-gtk.c - made the init function for all the protocols return an integer instead of nothing. If there was an error setting up the protocol, GFTP_EFATAL should be returned and the connection should be aborted. The HTTPS protocol uses this to return if SSL support was not compiled in * lib/protocols.c src/text/gftp-text.c src/gtk/dnd.c src/gtk/gftp-gtk.c src/gtk/menu-items.c - have gftp_parse_url() log the error messages to the user. This shouldn't have been done in the individual ports * lib/https.c - only initialize the SSL engine the first time a SSL connection is made.

172:9273b56e7529

  if (gftp_parse_url (current_ftpdata, url) != 0 ||
      current_ftpdata->directory == NULL ||
      (pos = strrchr (current_ftpdata->directory, '/')) == NULL) 
    {
      ftp_log (gftp_logging_misc, NULL, 
               _("Drag-N-Drop: Ignoring url %s: Not a valid url\n"), url);
      gftp_request_destroy (current_ftpdata, 1);
      free_fdata (newfle);
      return (0);
    }

        {
          if (GFTP_IS_CONNECTED (current_wdata->request))
            disconnect (current_wdata);

          ftp_connect (current_wdata, current_wdata->request, 1);
        }
      else
        {
          ftp_log (gftp_logging_misc, NULL, _("Could not parse URL %s\n"), 
                   selection_data->data);
        }
    }
}

173:4c288d05b26a

  if (gftp_parse_url (current_ftpdata, url) != 0 ||
      current_ftpdata->directory == NULL ||
      (pos = strrchr (current_ftpdata->directory, '/')) == NULL) 
    {
      gftp_request_destroy (current_ftpdata, 1);
      free_fdata (newfle);
      return (0);
    }

        {
          if (GFTP_IS_CONNECTED (current_wdata->request))
            disconnect (current_wdata);

          ftp_connect (current_wdata, current_wdata->request, 1);
        }
    }
}