[vlc-commits] skins2: do not follow --x11-display anymore

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jan 18 18:45:21 2011 +0200| [0ac89c18897433ac1bde90805caea644af4f54c9] | committer: Rémi Denis-Courmont

skins2: do not follow --x11-display anymore

(Refer to the previous commit for rationale)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0ac89c18897433ac1bde90805caea644af4f54c9
---

 modules/gui/skins2/x11/x11_display.cpp |    4 +---
 modules/gui/skins2/x11/x11_display.hpp |    5 +----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/modules/gui/skins2/x11/x11_display.cpp b/modules/gui/skins2/x11/x11_display.cpp
index 239c371..48e8f3e 100644
--- a/modules/gui/skins2/x11/x11_display.cpp
+++ b/modules/gui/skins2/x11/x11_display.cpp
@@ -59,9 +59,8 @@ type X11Display::blendPixel(type v,type r, type g, type b, type a) const
 X11Display::X11Display( intf_thread_t *pIntf ): SkinObject( pIntf ),
     m_mainWindow( 0 ), m_gc( NULL ), m_colormap( 0 )
 {
-    m_psz_display = var_CreateGetNonEmptyString( pIntf, "x11-display" );
     // Open a connection to the X Server
-    m_pDisplay = XOpenDisplay( m_psz_display );
+    m_pDisplay = XOpenDisplay( NULL );
     if( m_pDisplay == NULL )
     {
         MSG_ERR( "Cannot open display" );
@@ -285,7 +284,6 @@ X11Display::X11Display( intf_thread_t *pIntf ): SkinObject( pIntf ),
 
 X11Display::~X11Display()
 {
-    free( m_psz_display );
     if( m_mainWindow ) XDestroyWindow( m_pDisplay, m_mainWindow );
     if( m_gc )         XFreeGC( m_pDisplay, m_gc );
     if( m_colormap )   XFreeColormap( m_pDisplay, m_colormap );
diff --git a/modules/gui/skins2/x11/x11_display.hpp b/modules/gui/skins2/x11/x11_display.hpp
index ce4431d..837899b 100644
--- a/modules/gui/skins2/x11/x11_display.hpp
+++ b/modules/gui/skins2/x11/x11_display.hpp
@@ -84,8 +84,7 @@ public:
     Window getMainWindow() const { return m_mainWindow; }
 
     /// Get the x11_display string (to be freed by caller)
-    char* getX11Display()
-        { return (m_psz_display ? strdup( m_psz_display ) : NULL); }
+    char* getX11Display() { return NULL; }
 
     /// EWMH spec
     Atom m_net_wm_supported;
@@ -102,8 +101,6 @@ public:
     void testEWMH();
 
 private:
-    /// x11-display (as a character string)
-    char* m_psz_display;
     /// Dummy parent window for the task bar
     Window m_mainWindow;
     /// Display parameters