Mercurial > geeqie
diff src/ui_pathsel.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 | 651ae2be1031 |
children | aae956e84de4 |
line wrap: on
line diff
--- a/src/ui_pathsel.c Tue May 20 22:00:14 2008 +0000 +++ b/src/ui_pathsel.c Tue May 20 22:09:04 2008 +0000 @@ -231,7 +231,7 @@ } else { - filepath = concat_dir_and_file(path, list->data); + filepath = g_build_filename(path, list->data, NULL); } gtk_list_store_append(store, &iter); @@ -256,7 +256,7 @@ gchar *filepath; const gchar *name = list->data; - filepath = concat_dir_and_file(path, name); + filepath = g_build_filename(path, name, NULL); gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, 0, name, 1, filepath, -1); @@ -424,7 +424,7 @@ if (!old_path) return FALSE; buf = remove_level_from_path(old_path); - new_path = concat_dir_and_file(buf, new); + new_path = g_build_filename(buf, new, NULL); g_free(buf); if (isname(new_path)) @@ -745,7 +745,7 @@ } else { - buf = concat_dir_and_file(dd->path, _("New folder")); + buf = g_build_filename(dd->path, _("New folder"), NULL); path = unique_filename(buf, NULL, " ", FALSE); g_free(buf); }