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

pointer/keyboard: fix setting focus

Browse Source 
Set focus to NULL after using the variable
This commit is contained in:
Marek Chalupa 2014-02-19 13:56:56 +01:00 committed by Jasper St. Pierre
parent c964ef4e01
commit 17462c21e8
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -507,9 +507,6 @@ meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard,
if (keyboard->focus_surface != NULL) if (keyboard->focus_surface != NULL)
{ {
wl_list_remove (&keyboard->focus_surface_listener.link);
keyboard->focus_surface = NULL;
if (keyboard->focus_resource) if (keyboard->focus_resource)
{ {
if (keyboard->focus_surface->resource) if (keyboard->focus_surface->resource)
@ -523,6 +520,9 @@ meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard,
wl_list_remove (&keyboard->focus_resource_listener.link); wl_list_remove (&keyboard->focus_resource_listener.link);
keyboard->focus_resource = NULL; keyboard->focus_resource = NULL;
} }
wl_list_remove (&keyboard->focus_surface_listener.link);
keyboard->focus_surface = NULL;
} }
if (surface != NULL) if (surface != NULL)

8
src/wayland/meta-wayland-pointer.c
View File

@ -328,9 +328,6 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
if (pointer->focus_surface) if (pointer->focus_surface)
{ {
wl_list_remove (&pointer->focus_surface_listener.link);
pointer->focus_surface = NULL;
if (pointer->focus_resource) if (pointer->focus_resource)
{ {
if (pointer->focus_surface->resource) if (pointer->focus_surface->resource)
@ -342,10 +339,11 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
} }
wl_list_remove (&pointer->focus_resource_listener.link); wl_list_remove (&pointer->focus_resource_listener.link);
pointer->focus_surface = NULL;
pointer->focus_resource = NULL; pointer->focus_resource = NULL;
} }
wl_list_remove (&pointer->focus_surface_listener.link);
pointer->focus_surface = NULL;
} }
if (surface != NULL) if (surface != NULL)