Mercurial > geeqie.yaz
comparison src/view_dir.c @ 702:e07895754e65
Drop concat_dir_and_file() and use g_build_filename() instead.
author | zas_ |
---|---|
date | Tue, 20 May 2008 22:09:04 +0000 |
parents | 905688aa2317 |
children | eda074e91ddd |
comparison
equal
deleted
inserted
replaced
701:28af4b6dd9ef | 702:e07895754e65 |
---|---|
216 if (!fd) return FALSE; | 216 if (!fd) return FALSE; |
217 | 217 |
218 old_path = g_strdup(fd->path); | 218 old_path = g_strdup(fd->path); |
219 | 219 |
220 base = remove_level_from_path(old_path); | 220 base = remove_level_from_path(old_path); |
221 new_path = concat_dir_and_file(base, new); | 221 new_path = g_build_filename(base, new, NULL); |
222 g_free(base); | 222 g_free(base); |
223 | 223 |
224 if (file_util_rename_dir(fd, new_path, vd->view)) | 224 if (file_util_rename_dir(fd, new_path, vd->view)) |
225 { | 225 { |
226 | 226 |
497 path = vd->click_fd->path; | 497 path = vd->click_fd->path; |
498 }; | 498 }; |
499 break; | 499 break; |
500 } | 500 } |
501 | 501 |
502 buf = concat_dir_and_file(path, _("new_folder")); | 502 buf = g_build_filename(path, _("new_folder"), NULL); |
503 new_path = unique_filename(buf, NULL, NULL, FALSE); | 503 new_path = unique_filename(buf, NULL, NULL, FALSE); |
504 g_free(buf); | 504 g_free(buf); |
505 if (!new_path) return; | 505 if (!new_path) return; |
506 | 506 |
507 if (!mkdir_utf8(new_path, 0755)) | 507 if (!mkdir_utf8(new_path, 0755)) |