diff options
| author | Rui Matos <tiagomatos@gmail.com> | 2015-07-02 14:39:39 +0200 |
|---|---|---|
| committer | Rui Matos <tiagomatos@gmail.com> | 2015-07-02 14:44:48 +0200 |
| commit | 5e4760f099802bc84dfbde5d851bf262ea0a3aed (patch) | |
| tree | 1118d4dd744d9e1b7ee0d0a8f410cefabec6814c | |
| parent | ac5bbbb5f1ae2f4a7230dff0a73907b81f2b3bd8 (diff) | |
| download | gnome-settings-daemon-5e4760f099802bc84dfbde5d851bf262ea0a3aed.tar.gz | |
common: Rename a couple of synaptics specific functions
No functional changes, this just makes it explicit that these
functions only work on devices driven by the X synaptics driver.
https://bugzilla.gnome.org/show_bug.cgi?id=749818
| -rw-r--r-- | plugins/common/gsd-input-helper.c | 6 | ||||
| -rw-r--r-- | plugins/common/gsd-input-helper.h | 6 | ||||
| -rw-r--r-- | plugins/mouse/gsd-mouse-manager.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/plugins/common/gsd-input-helper.c b/plugins/common/gsd-input-helper.c index e0f40154..7396d380 100644 --- a/plugins/common/gsd-input-helper.c +++ b/plugins/common/gsd-input-helper.c @@ -432,8 +432,8 @@ set_device_enabled (int device_id, } gboolean -set_touchpad_device_enabled (int device_id, - gboolean enabled) +set_synaptics_device_enabled (int device_id, + gboolean enabled) { Atom prop; guchar value; @@ -545,7 +545,7 @@ run_custom_command (GdkDevice *device, } GList * -get_disabled_touchpads (GdkDeviceManager *manager) +get_disabled_synaptics (void) { GdkDisplay *display; XDeviceInfo *device_info; diff --git a/plugins/common/gsd-input-helper.h b/plugins/common/gsd-input-helper.h index 9f548068..aadd7906 100644 --- a/plugins/common/gsd-input-helper.h +++ b/plugins/common/gsd-input-helper.h @@ -57,8 +57,8 @@ gboolean supports_xtest (void); gboolean set_device_enabled (int device_id, gboolean enabled); -gboolean set_touchpad_device_enabled (int device_id, - gboolean enabled); +gboolean set_synaptics_device_enabled (int device_id, + gboolean enabled); gboolean xdevice_is_synaptics (XDevice *xdevice); @@ -75,7 +75,7 @@ gboolean device_set_property (XDevice *xdevice, gboolean run_custom_command (GdkDevice *device, CustomCommand command); -GList * get_disabled_touchpads (GdkDeviceManager *manager); +GList * get_disabled_synaptics (void); char * xdevice_get_device_node (int deviceid); int xdevice_get_last_tool_id (int deviceid); gboolean xdevice_get_dimensions (int deviceid, diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c index 44497227..70a85075 100644 --- a/plugins/mouse/gsd-mouse-manager.c +++ b/plugins/mouse/gsd-mouse-manager.c @@ -853,7 +853,7 @@ set_touchpad_disabled (GdkDevice *device) return; } - if (set_touchpad_device_enabled (id, FALSE) == FALSE) + if (set_synaptics_device_enabled (id, FALSE) == FALSE) g_warning ("Error disabling device \"%s\" (%d)", gdk_device_get_name (device), id); else g_debug ("Disabled device \"%s\" (%d)", gdk_device_get_name (device), id); @@ -881,7 +881,7 @@ set_touchpad_enabled (int id) return; } - if (set_touchpad_device_enabled (id, TRUE) == FALSE) + if (set_synaptics_device_enabled (id, TRUE) == FALSE) g_warning ("Error enabling device \"%d\"", id); else g_debug ("Enabled device %d", id); @@ -1268,7 +1268,7 @@ ensure_touchpad_active (GsdMouseManager *manager) state = get_touchpad_enabled (manager); if (state) { - devices = get_disabled_touchpads (manager->priv->device_manager); + devices = get_disabled_synaptics (); for (l = devices; l != NULL; l = l->next) { int device_id; |