gvfs r2134 - in trunk: . daemon

[otte svn gnome org]

Author: otte
Date: Fri Dec 12 09:01:53 2008
New Revision: 2134
URL: http://svn.gnome.org/viewvc/gvfs?rev=2134&view=rev

Log:
* daemon/gvfsbackendftp.c:
(ftp_connection_ensure_data_connection_pasv):
Fix successful PASV connections (don't try to apply workaround).
(fixes #564027)



Modified:
   trunk/ChangeLog
   trunk/daemon/gvfsbackendftp.c

Modified: trunk/daemon/gvfsbackendftp.c
==============================================================================
--- trunk/daemon/gvfsbackendftp.c	(original)
+++ trunk/daemon/gvfsbackendftp.c	Fri Dec 12 09:01:53 2008
@@ -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: