diff options
| author | Alexander Larsson <alexl@redhat.com> | 2008-10-16 12:59:39 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2008-10-16 12:59:39 +0000 |
| commit | f35b993a7700f58062d3e97a4cda330feadd06af (patch) | |
| tree | d5a6db674a4f726864f049aa3772f59459aa382b | |
| parent | dcd101bb1baadffb552d96d67aa69eabe556ed42 (diff) | |
| download | gvfs-f35b993a7700f58062d3e97a4cda330feadd06af.tar.gz | |
Show username in auth dialog if specified in uri (#554156)
2008-10-16 Alexander Larsson <alexl@redhat.com>
* daemon/gvfsbackendftp.c:
(do_mount):
Show username in auth dialog if specified in uri (#554156)
svn path=/branches/gnome-2-24/; revision=2051
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | daemon/gvfsbackendftp.c | 12 |
2 files changed, 15 insertions, 3 deletions
@@ -1,5 +1,11 @@ 2008-10-16 Alexander Larsson <alexl@redhat.com> + * daemon/gvfsbackendftp.c: + (do_mount): + Show username in auth dialog if specified in uri (#554156) + +2008-10-16 Alexander Larsson <alexl@redhat.com> + * client/gvfsfusedaemon.c (getattr_for_file): Set st_blocks & co so that du works (#554682) Patch from Andreas Henriksson diff --git a/daemon/gvfsbackendftp.c b/daemon/gvfsbackendftp.c index fe4d02de..3a3d789e 100644 --- a/daemon/gvfsbackendftp.c +++ b/daemon/gvfsbackendftp.c @@ -1339,9 +1339,15 @@ do_mount (GVfsBackend *backend, { GAskPasswordFlags flags; if (prompt == NULL) - /* translators: %s here is the hostname */ - prompt = g_strdup_printf (_("Enter password for ftp on %s"), host); - + { + if (ftp->has_initial_user) + /* Translators: the first %s is the username, the second the host name */ + prompt = g_strdup_printf (_("Enter password for ftp as %s on %s"), ftp->user, host); + else + /* translators: %s here is the hostname */ + prompt = g_strdup_printf (_("Enter password for ftp on %s"), host); + } + flags = G_ASK_PASSWORD_NEED_PASSWORD; if (!ftp->has_initial_user) |