gvfs r2150 - in trunk: . daemon

[otte svn gnome org]

Author: otte
Date: Tue Dec 30 21:27:14 2008
New Revision: 2150
URL: http://svn.gnome.org/viewvc/gvfs?rev=2150&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):
	really fix this bug by not calling g_vfs_job_succeeded() on the error
	path.




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

Modified: trunk/daemon/gvfsbackendftp.c
==============================================================================
--- trunk/daemon/gvfsbackendftp.c	(original)
+++ trunk/daemon/gvfsbackendftp.c	Tue Dec 30 21:27:14 2008
@@ -1338,7 +1338,8 @@
 	    break;
 
 	  ftp_connection_clear_error (conn);
-	  ftp_connection_pop_job (conn);
+	  /* Don't call ftp_connection_pop_job () here, the job isn't done yet */
+	  conn->job = NULL;
 	  ftp_connection_free (conn);
 	  conn = NULL;
 	  g_mutex_lock (ftp->mutex);