[gnome-commander] Apply the changed return type of the renamed function gnome_cmd_file_list_to_gfile_list
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] Apply the changed return type of the renamed function gnome_cmd_file_list_to_gfile_list
- Date: Thu, 22 Jul 2021 21:38:12 +0000 (UTC)
commit 0ac1b4dadb590e8931198e4b9566d35d10ccf71b
Author: Uwe Scholz <u scholz83 gmx de>
Date: Thu Jul 22 23:34:30 2021 +0200
Apply the changed return type of the renamed function gnome_cmd_file_list_to_gfile_list
Do some minor change in that function as well.
src/gnome-cmd-xfer.cc | 4 ++--
src/utils.cc | 6 +++---
src/utils.h | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/gnome-cmd-xfer.cc b/src/gnome-cmd-xfer.cc
index fa5ef559..ad3dd291 100644
--- a/src/gnome-cmd-xfer.cc
+++ b/src/gnome-cmd-xfer.cc
@@ -452,9 +452,9 @@ gnome_cmd_xfer_start (GList *src_files,
g_return_if_fail (src_files != nullptr);
g_return_if_fail (GNOME_CMD_IS_DIR (to_dir));
- GList *src_uri_list = file_list_to_gfile_list (src_files);
+ GList *srcGFileList = gnome_cmd_file_list_to_gfile_list (src_files);
- gnome_cmd_xfer_uris_start (src_uri_list,
+ gnome_cmd_xfer_uris_start (srcGFileList,
to_dir,
src_fl,
src_files,
diff --git a/src/utils.cc b/src/utils.cc
index 67784aad..12d2c76b 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -767,9 +767,9 @@ GdkColor *gdk_color_new (gushort r, gushort g, gushort b)
}
-GList *file_list_to_gfile_list (GList *files)
+GList *gnome_cmd_file_list_to_gfile_list (GList *files)
{
- GList *gFiles = NULL;
+ GList *gFiles = nullptr;
for (; files; files = files->next)
{
@@ -777,7 +777,7 @@ GList *file_list_to_gfile_list (GList *files)
auto gFile = f->get_gfile();
if (!gFile)
- g_warning ("NULL uri!!!");
+ g_warning ("gnome_cmd_file_list_to_gfile_list: no gFile!!!");
else
gFiles = g_list_append (gFiles, gFile);
}
diff --git a/src/utils.h b/src/utils.h
index c5ee6d82..f516d23c 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -221,7 +221,7 @@ void remove_temp_download_dir ();
gchar *unix_to_unc (const gchar *path);
GdkColor *gdk_color_new (gushort r, gushort g, gushort b);
-GList *file_list_to_gfile_list (GList *files);
+GList *gnome_cmd_file_list_to_gfile_list (GList *files);
int is_dir_existing(const gchar *dpath);
gboolean create_dir_if_needed (const gchar *dpath);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]