projects
/
platform
/
upstream
/
weston.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6cf9b01
)
tablet-shell: Avoid infinite loop when unlocking
author
Rob Bradford
<rob@linux.intel.com>
Tue, 9 Jul 2013 11:12:50 +0000
(12:12 +0100)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Tue, 9 Jul 2013 21:11:31 +0000
(17:11 -0400)
weston_compositor_wake will fire the signal that the unlock handler is
setup as the listener for. Instead lets change the state to HOME which
unlocks.
src/tablet-shell.c
patch
|
blob
|
history
diff --git
a/src/tablet-shell.c
b/src/tablet-shell.c
index
192abc7
..
ca63b97
100644
(file)
--- a/
src/tablet-shell.c
+++ b/
src/tablet-shell.c
@@
-417,7
+417,7
@@
tablet_shell_unlock(struct wl_listener *listener, void *data)
struct tablet_shell *shell =
container_of(listener, struct tablet_shell, unlock_listener);
-
weston_compositor_wake(shell->compositor
);
+
tablet_shell_set_state(shell, STATE_HOME
);
}
static void