summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2009-02-22 20:59:44 -0500
committerKristian Høgsberg <krh@redhat.com>2009-02-22 20:59:44 -0500
commitce5a9c10960e2a4abc8da3b5514c6587d58bae82 (patch)
treea17b4f2455a0288cc589e62ad0ffaee3a67d2181
parent2c837483ec8f509105e3afa49ab0f6fcaeb183b0 (diff)
downloadwayland-ce5a9c10960e2a4abc8da3b5514c6587d58bae82.tar.gz
wayland-ce5a9c10960e2a4abc8da3b5514c6587d58bae82.tar.xz
wayland-ce5a9c10960e2a4abc8da3b5514c6587d58bae82.zip
Remove spurious unused local variable.
-rw-r--r--wayland-system-compositor.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/wayland-system-compositor.c b/wayland-system-compositor.c
index fb0e463..d41a082 100644
--- a/wayland-system-compositor.c
+++ b/wayland-system-compositor.c
@@ -1004,7 +1004,6 @@ notify_key(struct wlsc_input_device *device,
uint32_t key, uint32_t state)
{
struct wlsc_compositor *ec = device->ec;
- struct wlsc_surface *s;
switch (key | ec->meta_state) {
case KEY_EJECTCD | META_DOWN:
@@ -1017,8 +1016,8 @@ notify_key(struct wlsc_input_device *device,
case KEY_4 | META_DOWN:
case KEY_5 | META_DOWN:
update_surface_targets(ec, key - KEY_1);
- if (device->grab == 0 && s != NULL)
- device->focus_surface = ec->primary;
+ if (device->grab == 0)
+ device->keyboard_focus = ec->primary;
return;
case KEY_LEFTMETA: