[gnome-commander] noop: function renamed
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] noop: function renamed
- Date: Sun, 20 Jun 2021 21:58:01 +0000 (UTC)
commit c8a8ebfb78416b26b0748a5b1aa8e7d9fb3de98a
Author: Uwe Scholz <u scholz83 gmx de>
Date: Sun Jun 20 21:13:37 2021 +0200
noop: function renamed
src/dialogs/gnome-cmd-options-dialog.cc | 2 +-
src/dialogs/gnome-cmd-prepare-xfer-dialog.cc | 4 ++--
src/gnome-cmd-con-device.cc | 2 +-
src/gnome-cmd-con-device.h | 2 +-
src/gnome-cmd-data.cc | 6 +++---
5 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/dialogs/gnome-cmd-options-dialog.cc b/src/dialogs/gnome-cmd-options-dialog.cc
index 7c82e3ecf..3009710dc 100644
--- a/src/dialogs/gnome-cmd-options-dialog.cc
+++ b/src/dialogs/gnome-cmd-options-dialog.cc
@@ -1935,7 +1935,7 @@ static GtkWidget *create_device_dialog (GnomeCmdConDevice *dev, GtkSignalFunc on
entry = create_file_chooser_button (dialog, "device_entry", s);
table_add (table, entry, 1, 1, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL));
- if (dev) s = gnome_cmd_con_device_get_mountp (dev);
+ if (dev) s = gnome_cmd_con_device_get_mountp_string (dev);
entry = create_directory_chooser_button (dialog, "mountp_entry", s);
table_add (table, entry, 1, 2, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL));
diff --git a/src/dialogs/gnome-cmd-prepare-xfer-dialog.cc b/src/dialogs/gnome-cmd-prepare-xfer-dialog.cc
index 15431d11c..ba55517a4 100644
--- a/src/dialogs/gnome-cmd-prepare-xfer-dialog.cc
+++ b/src/dialogs/gnome-cmd-prepare-xfer-dialog.cc
@@ -41,7 +41,7 @@ inline gboolean con_device_has_path (FileSelectorID fsID, GnomeCmdCon *&dev, con
dev = main_win->fs(fsID)->get_connection();
return GNOME_CMD_IS_CON_DEVICE (dev) &&
- g_str_has_prefix (user_path, gnome_cmd_con_device_get_mountp (GNOME_CMD_CON_DEVICE (dev)));
+ g_str_has_prefix (user_path, gnome_cmd_con_device_get_mountp_string (GNOME_CMD_CON_DEVICE (dev)));
}
@@ -74,7 +74,7 @@ static void on_ok (GtkButton *button, GnomeCmdPrepareXferDialog *dialog)
// if LEFT or RIGHT device (connection) points to user_path than adjust user_path and set con to
the found device
if (con_device_has_path (INACTIVE, dev, user_path) || con_device_has_path (ACTIVE, dev,
user_path))
{
- dest_path = g_strdup (user_path + strlen (gnome_cmd_con_device_get_mountp
(GNOME_CMD_CON_DEVICE (dev))));
+ dest_path = g_strdup (user_path + strlen (gnome_cmd_con_device_get_mountp_string
(GNOME_CMD_CON_DEVICE (dev))));
con = dev;
}
else // otherwise connection not present in any pane, use home connection instead
diff --git a/src/gnome-cmd-con-device.cc b/src/gnome-cmd-con-device.cc
index a32e0ef50..5582a5058 100644
--- a/src/gnome-cmd-con-device.cc
+++ b/src/gnome-cmd-con-device.cc
@@ -685,7 +685,7 @@ const gchar *gnome_cmd_con_device_get_device_fn (GnomeCmdConDevice *dev)
}
-const gchar *gnome_cmd_con_device_get_mountp (GnomeCmdConDevice *dev)
+const gchar *gnome_cmd_con_device_get_mountp_string (GnomeCmdConDevice *dev)
{
g_return_val_if_fail (dev != nullptr, nullptr);
g_return_val_if_fail (dev->priv != nullptr, nullptr);
diff --git a/src/gnome-cmd-con-device.h b/src/gnome-cmd-con-device.h
index bda987990..f0dc55ea4 100644
--- a/src/gnome-cmd-con-device.h
+++ b/src/gnome-cmd-con-device.h
@@ -59,7 +59,7 @@ void gnome_cmd_con_device_set_alias (GnomeCmdConDevice *dev, const gchar *alias)
const gchar *gnome_cmd_con_device_get_device_fn (GnomeCmdConDevice *dev);
void gnome_cmd_con_device_set_device_fn (GnomeCmdConDevice *dev, const gchar *device_fn);
-const gchar *gnome_cmd_con_device_get_mountp (GnomeCmdConDevice *dev);
+const gchar *gnome_cmd_con_device_get_mountp_string (GnomeCmdConDevice *dev);
void gnome_cmd_con_device_set_mountp (GnomeCmdConDevice *dev, const gchar *mountp);
const gchar *gnome_cmd_con_device_get_icon_path (GnomeCmdConDevice *dev);
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index a026de2df..95914ec09 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -1739,7 +1739,7 @@ void GnomeCmdData::save_devices()
g_variant_builder_add (gVariantBuilder, GCMD_SETTINGS_DEVICES_FORMAT_STRING,
gnome_cmd_con_device_get_alias (device),
gnome_cmd_con_device_get_device_fn (device),
- gnome_cmd_con_device_get_mountp (device),
+ gnome_cmd_con_device_get_mountp_string (device),
icon_path);
g_free (icon_path);
}
@@ -2141,7 +2141,7 @@ static void volume_removed (GVolumeMonitor *volume_monitor, GVolume *gVolume)
remove_gvolume (gVolume);
}
-inline void set_vfs_volume_monitor ()
+inline void set_g_volume_monitor ()
{
auto monitor = g_volume_monitor_get();
@@ -3411,7 +3411,7 @@ void GnomeCmdData::load()
load_intviewer_defaults();
load_auto_load_plugins();
- set_vfs_volume_monitor ();
+ set_g_volume_monitor ();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]