diff src/gtk/dnd.c @ 65:4b5fec7711e9

2002-11-25 Brian Masney <[e-mail]> * lib/misc.c (ssh_start_login_sequence) - fixes for when the initial SSH banner is bigger than 200 characters * lib/local.c (local_connect) - set request->hostname to local filesystem * lib/protocols.c (gftp_parse_url) - don't include 2 slashes for the directory when parsing a local URL * src/gtk/chmod_dialog.c (chmod_dialog) - allow multiple files to be selected * src/gtk/dnd.c - small fixes

--- a/src/gtk/dnd.c	Sat Nov 23 14:34:25 2002 +0000
+++ b/src/gtk/dnd.c	Tue Nov 26 14:58:13 2002 +0000
@@ -69,7 +69,9 @@
   if (other_wdata != NULL && 
       compare_request (current_ftpdata, other_wdata->request, 1))
     {
-      gftp_set_password (current_ftpdata, other_wdata->request->password);
+      if (other_wdata->request->password != NULL)
+        gftp_set_password (current_ftpdata, other_wdata->request->password);
+
       fromwdata = other_wdata;
     }
   else
@@ -152,7 +154,8 @@
         continue;
 
       oldlen = totlen;
-      if (GFTP_GET_HOSTNAME (wdata->request) == NULL)
+      if (GFTP_GET_HOSTNAME (wdata->request) == NULL || 
+          wdata->request->protonum == GFTP_LOCAL_NUM)
         {
           tempstr = g_strdup_printf ("%s://%s/%s ", 
                                  GFTP_GET_URL_PREFIX (wdata->request),
@@ -181,7 +184,7 @@
         }
 
       if ((pos = strchr (tempstr, ':')) != NULL)
-        pos += 2;
+        pos += 3;
       else
         pos = tempstr;
       remove_double_slashes (pos);