summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Lefebvre <[email protected]>2015-09-04 09:41:56 +0100
committerClement Lefebvre <[email protected]>2015-09-04 09:41:56 +0100
commit82bd2ce081611afdc6a01696c5207761d4252941 (patch)
tree3fcd6338a6748e6e1e4e7a3776982aaf4861b1aa
parent831864565477ca67cce653e6b15c758776260f4e (diff)
parent34274aa8258af8c41cc1b634604bf772990e120d (diff)
downloadmate-settings-daemon-82bd2ce081611afdc6a01696c5207761d4252941.tar.bz2
mate-settings-daemon-82bd2ce081611afdc6a01696c5207761d4252941.tar.xz
Merge pull request #115 from monsta/fixes
a couple of fixes from upstream
-rw-r--r--plugins/mouse/msd-mouse-manager.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/plugins/mouse/msd-mouse-manager.c b/plugins/mouse/msd-mouse-manager.c
index 95b0073..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)
{
@@ -593,11 +605,11 @@ set_disable_w_typing (MsdMouseManager *manager, gboolean state)
args[0] = "syndaemon";
args[1] = "-i";
args[2] = "0.5";
- args[3] = "-k";
+ args[3] = "-K";
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,