diff options
| author | Rui Matos <tiagomatos@gmail.com> | 2013-01-31 23:11:23 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2013-03-04 23:17:54 +0000 |
| commit | ae90fff9f8002f5ff199571646e61493eb5c5e29 (patch) | |
| tree | 479fa7c083e2381c073f742ae58405f582a6a07a | |
| parent | 3c017eaf28cff89d82f868b0c7d92399884c3c47 (diff) | |
| download | clutter-ae90fff9f8002f5ff199571646e61493eb5c5e29.tar.gz | |
x11/device-manager-xi2: Fix slave to master association
A slave is associated to a master device, not the other way around.
https://bugzilla.gnome.org/show_bug.cgi?id=692971
(cherry picked from commit 83f2f03c252f5b1af52a0718f9233279b49cc647)
Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
| -rw-r--r-- | clutter/x11/clutter-device-manager-xi2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c index 8a9910307..c4e7c5d59 100644 --- a/clutter/x11/clutter-device-manager-xi2.c +++ b/clutter/x11/clutter-device-manager-xi2.c @@ -1341,8 +1341,8 @@ relate_slaves (gpointer key, ClutterDeviceManagerXI2 *manager_xi2 = data; ClutterInputDevice *master, *slave; - master = g_hash_table_lookup (manager_xi2->devices_by_id, key); - slave = g_hash_table_lookup (manager_xi2->devices_by_id, value); + slave = g_hash_table_lookup (manager_xi2->devices_by_id, key); + master = g_hash_table_lookup (manager_xi2->devices_by_id, value); _clutter_input_device_set_associated_device (slave, master); _clutter_input_device_add_slave (master, slave); |