Blob Blame Raw
--- gvfs-1.1.1/daemon/gvfsbackendftp.c	2008-11-18 10:55:23.000000000 +0100
+++ gvfs-1.0.2/daemon/gvfsbackendftp.c	2008-12-11 23:55:51.000000000 +0100
@@ -937,14 +937,13 @@
       addr = soup_address_new (ip, port1 << 8 | port2);
       g_free (ip);
 
-      connected = ftp_connection_open_data_connection (conn, addr);
-      if (!connected)
-        {
-          /* set workaround flag (see below), so we don't try this again */
-          DEBUG ("Successfull PASV response but data connection failed. Enabling FTP_WORKAROUND_PASV_ADDR.\n");
-          conn->workarounds |= FTP_WORKAROUND_PASV_ADDR;
-          g_clear_error (&conn->error);
-	}
+      if (ftp_connection_open_data_connection (conn, addr))
+        return TRUE;
+         
+      /* set workaround flag (see below), so we don't try this again */
+      DEBUG ("Successfull PASV response but data connection failed. Enabling FTP_WORKAROUND_PASV_ADDR.\n");
+      conn->workarounds |= FTP_WORKAROUND_PASV_ADDR;
+      g_clear_error (&conn->error);
     }
 
   /* Workaround code: