mirror of
https://github.com/MidnightCommander/mc
synced 2024-12-23 04:46:55 +03:00
mismerge fix: g_concat -> g_strconcat
Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
This commit is contained in:
parent
ec3d3cf913
commit
5454c05b38
@ -1805,7 +1805,7 @@ panel_operate (void *source_panel, FileOperation operation,
|
|||||||
else
|
else
|
||||||
/* add trailing separator */
|
/* add trailing separator */
|
||||||
if (*dest_dir && strcmp(&dest_dir[strlen(dest_dir)-1], PATH_SEP_STR)) {
|
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 {
|
} else {
|
||||||
dest_dir_ = g_strdup (dest_dir);
|
dest_dir_ = g_strdup (dest_dir);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user