commit 60d97311be5492b02843c4e9d46f818d43499dae
author Derek Foreman <derekf@osg.samsung.com> Wed Jul 15 13:00:45 2015 -0500
committer Bryce Harrington <bryce@osg.samsung.com> Fri Jul 31 15:15:59 2015 -0700
tree 9fb829a5e474baae73aaa0f038c5d80b0f7ecf5f
parent 30ce607682975420d5405bd3f4fbf33ca2163fb0

desktop-shell: Don't call wl_list_init() in the middle of a list

seat->keyboard_focus_listener.link isn't a head, it's just sometimes a
member of the focus signal list.  Calling wl_list_init() on it puts
a loop in the list.

Instead, we remove the item then init it.  That way we can call remove on
it again later even if it hasn't been re-added to a list.

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 dec9169..d08b0d8 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -3110,6 +3110,7 @@
 		wl_signal_add(&seat->seat->keyboard->focus_signal,
 			      &seat->keyboard_focus_listener);
 	} else if (!seat->seat->keyboard) {
+		wl_list_remove(&seat->keyboard_focus_listener.link);
 		wl_list_init(&seat->keyboard_focus_listener.link);
 	}
 
@@ -3118,6 +3119,7 @@
 		wl_signal_add(&seat->seat->pointer->focus_signal,
 			      &seat->pointer_focus_listener);
 	} else if (!seat->seat->pointer) {
+		wl_list_remove(&seat->pointer_focus_listener.link);
 		wl_list_init(&seat->pointer_focus_listener.link);
 	}
 }