gvfs r1436 - in trunk: . daemon

[otte svn gnome org]

Author: otte
Date: Thu Feb 28 21:55:19 2008
New Revision: 1436
URL: http://svn.gnome.org/viewvc/gvfs?rev=1436&view=rev

Log:
2008-02-28  Benjamin Otte  <otte gnome org>

	* daemon/gvfsbackendftp.c: (do_mount):
	really check for errors correctly. I need to go to bed.



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

Modified: trunk/daemon/gvfsbackendftp.c
==============================================================================
--- trunk/daemon/gvfsbackendftp.c	(original)
+++ trunk/daemon/gvfsbackendftp.c	Thu Feb 28 21:55:19 2008
@@ -783,14 +783,18 @@
 		        NULL,
 		        &password_save) ||
 	  aborted) 
-	goto fail;
+	{
+	  g_set_error (&error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED,
+		       "%s", _("Password dialog cancelled"));
+	  goto fail;
+	}
 
 try_login:
       g_free (ftp->user);
       ftp->user = username;
       g_free (ftp->password);
       ftp->password = password;
-      if (ftp_connection_login (conn, username, password, &error) == 0)
+      if (ftp_connection_login (conn, username, password, &error) != 0)
 	break;
       if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED))
 	goto fail;