brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland/keyboard: Scope variable correctly

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=771646
This commit is contained in:
Jonas Ådahl 2016-09-20 16:52:29 +08:00
parent 4a3781d7db
commit c2217373df
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wayland/meta-wayland-keyboard.c
View File

@ -832,10 +832,9 @@ meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard,
if (keyboard->focus_surface != NULL) if (keyboard->focus_surface != NULL)
{ {
struct wl_resource *resource;
if (!wl_list_empty (&keyboard->focus_resource_list)) if (!wl_list_empty (&keyboard->focus_resource_list))
{ {
struct wl_resource *resource;
uint32_t serial; uint32_t serial;
serial = meta_wayland_input_device_next_serial (input_device); serial = meta_wayland_input_device_next_serial (input_device);
@ -854,7 +853,7 @@ meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard,
if (surface != NULL) if (surface != NULL)
{ {
struct wl_resource *resource; struct wl_resource *focus_surface_resource;
keyboard->focus_surface = surface; keyboard->focus_surface = surface;
wl_resource_add_destroy_listener (keyboard->focus_surface->resource, &keyboard->focus_surface_listener); wl_resource_add_destroy_listener (keyboard->focus_surface->resource, &keyboard->focus_surface_listener);
@ -865,6 +864,8 @@ meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard,
if (!wl_list_empty (&keyboard->focus_resource_list)) if (!wl_list_empty (&keyboard->focus_resource_list))
{ {
struct wl_resource *resource;
keyboard->focus_serial = keyboard->focus_serial =
meta_wayland_input_device_next_serial (input_device); meta_wayland_input_device_next_serial (input_device);