More libvlc_global presumed abuse

[vlc] / modules / gui / skins2 / win32 / win32_factory.cpp

diff --git a/modules/gui/skins2/win32/win32_factory.cpp b/modules/gui/skins2/win32/win32_factory.cpp
index 94e8156cf107af11678d94ba0aee1a566267e047..6fbe0e87307494ed5e569114faad2916aa0c3b9e 100644 (file)
--- a/modules/gui/skins2/win32/win32_factory.cpp
+++ b/modules/gui/skins2/win32/win32_factory.cpp
@@ -227,13 +227,13 @@ bool Win32Factory::init()
     // Initialize the resource path
     m_resourcePath.push_back( (string)getIntf()->p_libvlc->psz_homedir +
                                "\\" + CONFIG_DIR + "\\skins" );
-    m_resourcePath.push_back( (string)getIntf()->p_libvlc_global->psz_vlcpath +
+    m_resourcePath.push_back( (string)config_GetDataDir( getIntf() ) +
                               "\\skins" );
-    m_resourcePath.push_back( (string)getIntf()->p_libvlc_global->psz_vlcpath +
+    m_resourcePath.push_back( (string)config_GetDataDir( getIntf() ) +
                               "\\skins2" );
-    m_resourcePath.push_back( (string)getIntf()->p_libvlc_global->psz_vlcpath +
+    m_resourcePath.push_back( (string)config_GetDataDir( getIntf() ) +
                               "\\share\\skins" );
-    m_resourcePath.push_back( (string)getIntf()->p_libvlc_global->psz_vlcpath +
+    m_resourcePath.push_back( (string)config_GetDataDir( getIntf() ) +
                               "\\share\\skins2" );
 
     // All went well
@@ -365,13 +365,12 @@ int Win32Factory::getScreenHeight() const
 }
 
 
-Rect Win32Factory::getWorkArea() const
+SkinsRect Win32Factory::getWorkArea() const
 {
     RECT r;
     SystemParametersInfo( SPI_GETWORKAREA, 0, &r, 0 );
     // Fill a Rect object
-    Rect rect( r.left, r.top, r.right, r.bottom );
-    return rect;
+    return  SkinsRect( r.left, r.top, r.right, r.bottom );
 }