[gvfs/gnome-3-10] sftp: Retrieve the username from the secret store

[Ondrej Holy <oholy src gnome org>]

commit a01c028ae02d90c221d0e5420d85b42b3c00b49d
Author: Ross Lagerwall <rosslagerwall gmail com>
Date:   Tue Oct 21 23:18:05 2014 +0100

    sftp: Retrieve the username from the secret store
    
    Retrieve the username from the secret store rather than simply using the
    default username with the retrieved password.  Without this, the backend
    does not correctly recall the login details of a non-default user when
    the username is not specified in the URI.
    
    E.g. if my username is "ross" and I stored the login details for "john",
    logging in with a URI of sftp://host/path should use john's details
    rather than john's password with ross as a username.
    
    If the username is specified directly, e.g. sftp://john host/path, this
    already did work correctly (and should continue to).
    
    https://bugzilla.gnome.org/show_bug.cgi?id=736311

 daemon/gvfsbackendsftp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c
index 23916b1..893c45f 100644
--- a/daemon/gvfsbackendsftp.c
+++ b/daemon/gvfsbackendsftp.c
@@ -934,7 +934,7 @@ handle_login (GVfsBackend *backend,
                                              op_backend->port
                                              :
                                              0,
-                                              NULL,
+                                              &new_user,
                                               NULL,
                                               &new_password)))
             {