summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRui Matos <tiagomatos@gmail.com>2013-01-31 23:11:23 +0100
committerRui Matos <tiagomatos@gmail.com>2013-02-01 10:16:48 +0100
commit83f2f03c252f5b1af52a0718f9233279b49cc647 (patch)
treee5fda8bfd3b31c49fa3f3f597fe15978f4e616f9
parent3e1450ba17fce90a8034cc525c67a87ff3cdd53d (diff)
downloadclutter-83f2f03c252f5b1af52a0718f9233279b49cc647.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
-rw-r--r--clutter/x11/clutter-device-manager-xi2.c4
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 616dee768..5367f0363 100644
--- a/clutter/x11/clutter-device-manager-xi2.c
+++ b/clutter/x11/clutter-device-manager-xi2.c
@@ -1345,8 +1345,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);