[gnome-commander] Makes global function a local one
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] Makes global function a local one
- Date: Fri, 28 Apr 2017 21:39:11 +0000 (UTC)
commit 3fa29c3b8004ff36bb0739bfa89a8801e7185ce4
Author: Uwe Scholz <uwescholz src gnome org>
Date: Sat Apr 22 17:01:27 2017 +0200
Makes global function a local one
src/gnome-cmd-data.cc | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index 6f2752d..1f90963 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -49,7 +49,6 @@ using namespace std;
#define DEFAULT_GUI_UPDATE_RATE 100
GnomeCmdData gnome_cmd_data;
-GnomeVFSVolumeMonitor *monitor = NULL;
struct GnomeCmdData::Private
{
@@ -1838,11 +1837,11 @@ inline gboolean load_connections (const gchar *fname)
case 'B':
if (server)
{
- gchar name[256], path[256];
- gint ret = sscanf (line, "B: %256s %256s\n", name, path);
+ gchar name[256], new_path[256];
+ gint ret = sscanf (line, "B: %256s %256s\n", name, new_path);
if (ret == 2)
- gnome_cmd_con_add_bookmark (GNOME_CMD_CON (server), gnome_vfs_unescape_string
(name, NULL), gnome_vfs_unescape_string (path, NULL));
+ gnome_cmd_con_add_bookmark (GNOME_CMD_CON (server), gnome_vfs_unescape_string
(name, NULL), gnome_vfs_unescape_string (new_path, NULL));
}
break;
@@ -2079,7 +2078,7 @@ static void drive_disconnected (GnomeVFSVolumeMonitor *volume_monitor, GnomeVFSD
inline void set_vfs_volume_monitor ()
{
- monitor = gnome_vfs_get_volume_monitor ();
+ GnomeVFSVolumeMonitor *monitor = gnome_vfs_get_volume_monitor ();
g_signal_connect (monitor, "volume-mounted", G_CALLBACK (volume_mounted), NULL);
g_signal_connect (monitor, "volume-unmounted", G_CALLBACK (volume_unmounted), NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]