gvfs r2101 - in branches/gnome-2-24: . daemon

[alexl svn gnome org]

Author: alexl
Date: Mon Nov 24 08:41:45 2008
New Revision: 2101
URL: http://svn.gnome.org/viewvc/gvfs?rev=2101&view=rev

Log:
2008-11-18  Alexander Larsson  <alexl redhat com>

        * daemon/gvfsbackendsftp.c:
	If user is specified, add to name too, so we get a unique fuse path
	This is a backport from trunk with the translation marking removed.




Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/daemon/gvfsbackendsftp.c

Modified: branches/gnome-2-24/daemon/gvfsbackendsftp.c
==============================================================================
--- branches/gnome-2-24/daemon/gvfsbackendsftp.c	(original)
+++ branches/gnome-2-24/daemon/gvfsbackendsftp.c	Mon Nov 24 08:41:45 2008
@@ -1515,8 +1515,12 @@
   g_vfs_backend_set_mount_spec (backend, sftp_mount_spec);
   g_mount_spec_unref (sftp_mount_spec);
 
-  /* Translators: This is the name of an sftp share, like "sftp on <hostname>" */
-  display_name = g_strdup_printf (_("sftp on %s"), op_backend->host);
+  if (op_backend->user_specified)
+    /* Not translated on stable branch, but needed to fix fuse dirname conflict */
+    display_name = g_strdup_printf ("sftp for %s on %s", op_backend->user, op_backend->host);
+  else
+    /* Translators: This is the name of an sftp share, like "sftp on <hostname>" */
+    display_name = g_strdup_printf (_("sftp on %s"), op_backend->host);
   g_vfs_backend_set_display_name (backend, display_name);
   g_free (display_name);
   g_vfs_backend_set_icon_name (backend, "folder-remote");