gvfs r2147 - in trunk: . daemon

[otte svn gnome org]

Author: otte
Date: Tue Dec 30 20:53:44 2008
New Revision: 2147
URL: http://svn.gnome.org/viewvc/gvfs?rev=2147&view=rev

Log:
2008-12-30  Benjamin Otte  <otte gnome org>

	Bug 565504 - limited number of connections causes commands to fail

	* daemon/gvfsbackendftp.c: (g_vfs_backend_ftp_pop_connection):
	clear connection error before popping job, so that the error isn't
	propagated to the job



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

Modified: trunk/daemon/gvfsbackendftp.c
==============================================================================
--- trunk/daemon/gvfsbackendftp.c	(original)
+++ trunk/daemon/gvfsbackendftp.c	Tue Dec 30 20:53:44 2008
@@ -1326,9 +1326,10 @@
 	  ftp_connection_prepare (conn);
 	  ftp_connection_login (conn, ftp->user, ftp->password);
 	  ftp_connection_use (conn);
-	  if (!ftp_connection_in_error (conn))
+	  if (G_LIKELY (!ftp_connection_in_error (conn)))
 	    break;
 
+	  g_clear_error (&conn->error);
 	  ftp_connection_pop_job (conn);
 	  ftp_connection_free (conn);
 	  conn = NULL;