[gnome-commander] Replace g_build_path by g_build_filename
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] Replace g_build_path by g_build_filename
- Date: Thu, 6 Jan 2022 22:27:53 +0000 (UTC)
commit a80504563f1cdd08e542ad6adaa7f171cdf73fc5
Author: Uwe Scholz <u scholz83 gmx de>
Date: Thu Jan 6 22:07:16 2022 +0100
Replace g_build_path by g_build_filename
src/gnome-cmd-dir.cc | 2 +-
src/gnome-cmd-plain-path.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/gnome-cmd-dir.cc b/src/gnome-cmd-dir.cc
index 13cd4850..6af97cc3 100644
--- a/src/gnome-cmd-dir.cc
+++ b/src/gnome-cmd-dir.cc
@@ -731,7 +731,7 @@ GFile *gnome_cmd_dir_get_gfile_for_con_and_filename(GnomeCmdDir *dir, const gcha
auto gUriForMount = g_uri_parse(mountUriTmp, G_URI_FLAGS_NONE, nullptr);
auto conUriPath = g_uri_get_path(gUriForMount);
auto relDirToUriPath = gnome_cmd_dir_get_relative_path_string(gnomeCmdDirPathString, conUriPath);
- auto mergedDirAndFileNameString = g_build_path(G_DIR_SEPARATOR_S, ".", relDirToUriPath, filename,
nullptr);
+ auto mergedDirAndFileNameString = g_build_filename(".", relDirToUriPath, filename, nullptr);
g_free(relDirToUriPath);
GError *error = nullptr;
diff --git a/src/gnome-cmd-plain-path.cc b/src/gnome-cmd-plain-path.cc
index c77a7dd2..a17f283b 100644
--- a/src/gnome-cmd-plain-path.cc
+++ b/src/gnome-cmd-plain-path.cc
@@ -55,7 +55,7 @@ GnomeCmdPath *GnomeCmdPlainPath::get_parent()
GnomeCmdPath *GnomeCmdPlainPath::get_child(const gchar *child)
{
g_return_val_if_fail(child != nullptr, nullptr);
- auto fullPath = g_build_path(G_DIR_SEPARATOR_S, path && path[0] != '\0' ? path : G_DIR_SEPARATOR_S,
child, nullptr);
+ auto fullPath = g_build_filename(path && path[0] != '\0' ? path : G_DIR_SEPARATOR_S, child, nullptr);
auto child_path = new GnomeCmdPlainPath(fullPath);
g_free (fullPath);
return child_path;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]