From 5454c05b38e848e8013aa9edbc23feb3c27a526e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 15 Feb 2009 11:53:49 +0200 Subject: [PATCH] mismerge fix: g_concat -> g_strconcat Signed-off-by: Sergei Trofimovich --- src/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/file.c b/src/file.c index efd19fd01..103930104 100644 --- a/src/file.c +++ b/src/file.c @@ -1805,7 +1805,7 @@ panel_operate (void *source_panel, FileOperation operation, else /* add trailing separator */ if (*dest_dir && strcmp(&dest_dir[strlen(dest_dir)-1], PATH_SEP_STR)) { - dest_dir_ = g_concat (dest_dir, PATH_SEP_STR); + dest_dir_ = g_strconcat (dest_dir, PATH_SEP_STR, (char*)0); } else { dest_dir_ = g_strdup (dest_dir); }