summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-10-26 16:42:09 +0300
committermonsta <[email protected]>2016-10-26 16:42:09 +0300
commitac150a1950d2db358b42d1e26cb59e2a76cf65b5 (patch)
tree3e0ea2201be29f29b6c416718fd5ed69ba20a37b
parentaa8b1bbe1becaec01ece9db08d33545707bb18b3 (diff)
downloadmate-settings-daemon-ac150a1950d2db358b42d1e26cb59e2a76cf65b5.tar.bz2
mate-settings-daemon-ac150a1950d2db358b42d1e26cb59e2a76cf65b5.tar.xz
mouse: remove duplicate function
-rw-r--r--plugins/common/msd-input-helper.c2
-rw-r--r--plugins/common/msd-input-helper.h5
-rw-r--r--plugins/mouse/msd-mouse-manager.c12
3 files changed, 4 insertions, 15 deletions
diff --git a/plugins/common/msd-input-helper.c b/plugins/common/msd-input-helper.c
index d663afe..b8e87a3 100644
--- a/plugins/common/msd-input-helper.c
+++ b/plugins/common/msd-input-helper.c
@@ -29,7 +29,7 @@
#include "msd-input-helper.h"
-static gboolean
+gboolean
supports_xinput_devices (void)
{
gint op_code, event, error;
diff --git a/plugins/common/msd-input-helper.h b/plugins/common/msd-input-helper.h
index 2a971ae..a95d6a8 100644
--- a/plugins/common/msd-input-helper.h
+++ b/plugins/common/msd-input-helper.h
@@ -27,8 +27,9 @@ G_BEGIN_DECLS
#include <X11/extensions/XInput.h>
#include <X11/extensions/XIproto.h>
-XDevice * device_is_touchpad (XDeviceInfo deviceinfo);
-gboolean touchpad_is_present (void);
+gboolean supports_xinput_devices (void);
+XDevice *device_is_touchpad (XDeviceInfo deviceinfo);
+gboolean touchpad_is_present (void);
G_END_DECLS
diff --git a/plugins/mouse/msd-mouse-manager.c b/plugins/mouse/msd-mouse-manager.c
index 642d1ab..4399a51 100644
--- a/plugins/mouse/msd-mouse-manager.c
+++ b/plugins/mouse/msd-mouse-manager.c
@@ -115,18 +115,6 @@ msd_mouse_manager_class_init (MsdMouseManagerClass *klass)
g_type_class_add_private (klass, sizeof (MsdMouseManagerPrivate));
}
-static gboolean
-supports_xinput_devices (void)
-{
- gint op_code, event, error;
-
- return XQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
- "XInputExtension",
- &op_code,
- &event,
- &error);
-}
-
static void
configure_button_layout (guchar *buttons,
gint n_buttons,