commit 006cf67c77d0587f3ead1c7551a542516cb19bf1
author Derek Foreman <derekf@osg.samsung.com> Wed Jul 15 13:00:46 2015 -0500
committer Bryce Harrington <bryce@osg.samsung.com> Fri Jul 31 15:16:03 2015 -0700
tree ddd298d07f8b2f7fe3654e65913fa61a19db1351
parent 60d97311be5492b02843c4e9d46f818d43499dae

desktop-shell: Check for device presence properly

We should be testing device counts, not pointers.  The pointers are
persistent state that never gets freed, and are an inaccurate indicator
of device presence after a release.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>

desktop-shell/shell.c

diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index d08b0d8..009e671 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -3105,20 +3105,20 @@
 
 	seat = container_of(listener, struct shell_seat, caps_changed_listener);
 
-	if (seat->seat->keyboard &&
+	if (seat->seat->keyboard_device_count &&
 	    wl_list_empty(&seat->keyboard_focus_listener.link)) {
 		wl_signal_add(&seat->seat->keyboard->focus_signal,
 			      &seat->keyboard_focus_listener);
-	} else if (!seat->seat->keyboard) {
+	} else if (!seat->seat->keyboard_device_count) {
 		wl_list_remove(&seat->keyboard_focus_listener.link);
 		wl_list_init(&seat->keyboard_focus_listener.link);
 	}
 
-	if (seat->seat->pointer &&
+	if (seat->seat->pointer_device_count &&
 	    wl_list_empty(&seat->pointer_focus_listener.link)) {
 		wl_signal_add(&seat->seat->pointer->focus_signal,
 			      &seat->pointer_focus_listener);
-	} else if (!seat->seat->pointer) {
+	} else if (!seat->seat->pointer_device_count) {
 		wl_list_remove(&seat->pointer_focus_listener.link);
 		wl_list_init(&seat->pointer_focus_listener.link);
 	}