summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@gnome.org>2008-03-02 22:51:34 +0000
committerBenjamin Otte <otte@src.gnome.org>2008-03-02 22:51:34 +0000
commit46dcd0650df62c2feba43146c415b867b85a9935 (patch)
tree38559c6426b447c7121eb4d312218a73c263b513
parent7c4e382ff3e1d940e2f6e31f98a4c43dbd46eaa6 (diff)
downloadgvfs-46dcd0650df62c2feba43146c415b867b85a9935.tar.gz
use g_build_path() to not get excess slashes in paths
2008-03-02 Benjamin Otte <otte@gnome.org> * daemon/gvfsbackendftp.c: (ftp_filename_construct): use g_build_path() to not get excess slashes in paths svn path=/trunk/; revision=1489
-rw-r--r--ChangeLog5
-rw-r--r--daemon/gvfsbackendftp.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d463227..0f6c32cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-03-02 Benjamin Otte <otte@gnome.org>
+ * daemon/gvfsbackendftp.c: (ftp_filename_construct):
+ use g_build_path() to not get excess slashes in paths
+
+2008-03-02 Benjamin Otte <otte@gnome.org>
+
* daemon/gvfsbackendftp.c: (ftp_connection_try_cd), (process_line),
(do_query_info), (do_move), (g_vfs_backend_ftp_class_init):
implement move vfunc
diff --git a/daemon/gvfsbackendftp.c b/daemon/gvfsbackendftp.c
index ba9ff8a0..244a2f6e 100644
--- a/daemon/gvfsbackendftp.c
+++ b/daemon/gvfsbackendftp.c
@@ -724,7 +724,7 @@ ftp_filename_construct (FtpConnection *conn, const FtpFile *dirname, const char
if (strpbrk (basename, "/\r\n"))
return NULL;
- return (FtpFile *) g_strconcat ((char *) dirname, "/", basename, NULL);
+ return (FtpFile *) g_build_path ("/", (char *) dirname, basename, NULL);
}
/*** COMMON FUNCTIONS WITH SPECIAL HANDLING ***/