diff options
| author | Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com> | 2012-04-21 19:19:56 +0200 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@redhat.com> | 2012-04-27 10:33:26 +0200 |
| commit | 00bc42e150dc24e47cb296b8d1cf3e5c40421f56 (patch) | |
| tree | cca4ef0343b887a2b7316bf88ba0a6fc726a73a3 | |
| parent | c082899363662f494c6dae422094d814dd2d040e (diff) | |
| download | gvfs-00bc42e150dc24e47cb296b8d1cf3e5c40421f56.tar.gz | |
afp: use the UTF-8 server name for password dialogs when it's available
https://bugzilla.gnome.org/show_bug.cgi?id=674528
| -rw-r--r-- | daemon/gvfsafpserver.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/daemon/gvfsafpserver.c b/daemon/gvfsafpserver.c index 8dbd3077..c5330ba6 100644 --- a/daemon/gvfsafpserver.c +++ b/daemon/gvfsafpserver.c @@ -928,6 +928,7 @@ g_vfs_afp_server_login (GVfsAfpServer *server, gboolean res; char *user, *olduser; char *password; + char *server_name; gboolean anonymous; GPasswordSave password_save; char *prompt = NULL; @@ -968,6 +969,9 @@ g_vfs_afp_server_login (GVfsAfpServer *server, } } + /* Use utf8_server_name if it exists */ + server_name = server->utf8_server_name ? server->utf8_server_name : server->server_name; + while (TRUE) { GString *str; @@ -987,10 +991,10 @@ g_vfs_afp_server_login (GVfsAfpServer *server, /* create prompt */ if (initial_user) /* Translators: the first %s is the username, the second the host name */ - g_string_append_printf (str, _("Enter password for afp as %s on %s"), initial_user, server->server_name); + g_string_append_printf (str, _("Enter password for afp as %s on %s"), initial_user, server_name); else /* translators: %s here is the hostname */ - g_string_append_printf (str, _("Enter password for afp on %s"), server->server_name); + g_string_append_printf (str, _("Enter password for afp on %s"), server_name); prompt = g_string_free (str, FALSE); |