Commit 35850e00 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

XCB/window: pass display string to window owner

parent 249986fc
...@@ -216,7 +216,6 @@ static int Open (vlc_object_t *obj) ...@@ -216,7 +216,6 @@ static int Open (vlc_object_t *obj)
int snum; int snum;
xcb_connection_t *conn = xcb_connect (display, &snum); xcb_connection_t *conn = xcb_connect (display, &snum);
free (display);
if (xcb_connection_has_error (conn) /*== NULL*/) if (xcb_connection_has_error (conn) /*== NULL*/)
goto error; goto error;
...@@ -262,6 +261,7 @@ static int Open (vlc_object_t *obj) ...@@ -262,6 +261,7 @@ static int Open (vlc_object_t *obj)
} }
wnd->xid = window; wnd->xid = window;
wnd->x11_display = display;
wnd->control = Control; wnd->control = Control;
wnd->sys = p_sys; wnd->sys = p_sys;
...@@ -342,6 +342,7 @@ static int Open (vlc_object_t *obj) ...@@ -342,6 +342,7 @@ static int Open (vlc_object_t *obj)
error: error:
xcb_disconnect (conn); xcb_disconnect (conn);
free (display);
free (p_sys); free (p_sys);
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -363,6 +364,7 @@ static void Close (vlc_object_t *obj) ...@@ -363,6 +364,7 @@ static void Close (vlc_object_t *obj)
DestroyKeyHandler (p_sys->keys); DestroyKeyHandler (p_sys->keys);
} }
xcb_disconnect (conn); xcb_disconnect (conn);
free (wnd->x11_display);
free (p_sys); free (p_sys);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment