Commit 4a45faa9 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove useless display pointer

parent 39fb462a
...@@ -278,6 +278,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -278,6 +278,7 @@ static int Open( vlc_object_t *p_this )
msg_Err( p_intf, "Could not connect to X server" ); msg_Err( p_intf, "Could not connect to X server" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
XCloseDisplay( p_display );
#endif #endif
/* Allocations of p_sys */ /* Allocations of p_sys */
...@@ -286,9 +287,6 @@ static int Open( vlc_object_t *p_this ) ...@@ -286,9 +287,6 @@ static int Open( vlc_object_t *p_this )
p_sys->p_popup_menu = NULL; p_sys->p_popup_menu = NULL;
p_sys->p_mi = NULL; p_sys->p_mi = NULL;
p_sys->p_playlist = pl_Hold( p_intf ); p_sys->p_playlist = pl_Hold( p_intf );
#ifdef Q_WS_X11
p_sys->display = p_display;
#endif
/* */ /* */
if( vlc_clone( &p_sys->thread, Thread, p_intf, VLC_THREAD_PRIORITY_LOW ) ) if( vlc_clone( &p_sys->thread, Thread, p_intf, VLC_THREAD_PRIORITY_LOW ) )
...@@ -335,9 +333,6 @@ static void Close( vlc_object_t *p_this ) ...@@ -335,9 +333,6 @@ static void Close( vlc_object_t *p_this )
QVLCApp::triggerQuit(); QVLCApp::triggerQuit();
vlc_join (p_sys->thread, NULL); vlc_join (p_sys->thread, NULL);
#ifdef Q_WS_X11
XCloseDisplay ((Display *)p_sys->display);
#endif
pl_Release (p_this); pl_Release (p_this);
delete p_sys; delete p_sys;
} }
......
...@@ -75,9 +75,6 @@ struct intf_sys_t ...@@ -75,9 +75,6 @@ struct intf_sys_t
const char *psz_filepath; /* Last path used in dialogs */ const char *psz_filepath; /* Last path used in dialogs */
QMenu * p_popup_menu; /* The right click menu */ QMenu * p_popup_menu; /* The right click menu */
#ifdef Q_WS_X11 /* WTH is this included in ALL files? :( */
void *display;
#endif
}; };
#define THEPL p_intf->p_sys->p_playlist #define THEPL p_intf->p_sys->p_playlist
......
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