summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-09-04 11:05:47 +0300
committerMonsta <[email protected]>2015-09-04 11:05:47 +0300
commit34274aa8258af8c41cc1b634604bf772990e120d (patch)
tree3fcd6338a6748e6e1e4e7a3776982aaf4861b1aa
parent7f42922169aed34f20233596a7657a00c14c9206 (diff)
downloadmate-settings-daemon-34274aa8258af8c41cc1b634604bf772990e120d.tar.bz2
mate-settings-daemon-34274aa8258af8c41cc1b634604bf772990e120d.tar.xz
mouse: fix memleak
adapted from https://git.gnome.org/browse/gnome-settings-daemon/commit?id=5ee48ce8aa66f6c4fdc4aa2c07bc03bdb83bcb65
-rw-r--r--plugins/mouse/msd-mouse-manager.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/plugins/mouse/msd-mouse-manager.c b/plugins/mouse/msd-mouse-manager.c
index fbb331e..a198b7c 100644
--- a/plugins/mouse/msd-mouse-manager.c
+++ b/plugins/mouse/msd-mouse-manager.c
@@ -579,6 +579,18 @@ set_middle_button (MsdMouseManager *manager,
XFreeDeviceList (device_info);
}
+static gboolean
+have_program_in_path (const char *name)
+{
+ gchar *path;
+ gboolean result;
+
+ path = g_find_program_in_path (name);
+ result = (path != NULL);
+ g_free (path);
+ return result;
+}
+
static int
set_disable_w_typing (MsdMouseManager *manager, gboolean state)
{
@@ -597,7 +609,7 @@ set_disable_w_typing (MsdMouseManager *manager, gboolean state)
args[4] = "-R";
args[5] = NULL;
- if (!g_find_program_in_path (args[0]))
+ if (!have_program_in_path (args[0]))
return 0;
g_spawn_async (g_get_home_dir (), args, NULL,