xwayland/window-manager.c: Use container_of to get the wm pointer since window may...
authorScott Moreau <oreaus@gmail.com>
Mon, 21 May 2012 21:49:13 +0000 (15:49 -0600)
committerKristian Høgsberg <krh@bitplanet.net>
Tue, 22 May 2012 15:34:34 +0000 (11:34 -0400)
src/xwayland/window-manager.c

index 182c836..1f6035a 100644 (file)
@@ -445,7 +445,7 @@ weston_wm_window_activate(struct wl_listener *listener, void *data)
 {
        struct weston_surface *surface = data;
        struct weston_wm_window *window = get_wm_window(surface);
-       struct weston_wm *wm = window->wm;
+       struct weston_wm *wm = container_of(listener, struct weston_wm, activate_listener);
 
        if (window)
                weston_wm_activate(wm, window, XCB_TIME_CURRENT_TIME);