Undo LC_NUMERIC change

diff --git a/modules/gui/wxwidgets/wxwidgets.cpp b/modules/gui/wxwidgets/wxwidgets.cpp
index f31972368e3bd13c575201750fbfb86a8158ff30..b904eb0b822d9b1d1d10e9725916cc52aee4af51 100644 (file)
--- a/modules/gui/wxwidgets/wxwidgets.cpp
+++ b/modules/gui/wxwidgets/wxwidgets.cpp
@@ -332,9 +332,8 @@ bool Instance::OnInit()
     locale.Init( wxLANGUAGE_DEFAULT );
 
     /* FIXME: The stream output mrl parsing uses ',' already so we want to
-     * keep the default '.' for floating point numbers.
-     * XXX (dionoea 13/08/2005) : This breaks prefs handling for floats
-     * setlocale( LC_NUMERIC, "C" ); */
+     * keep the default '.' for floating point numbers. */
+    setlocale( LC_NUMERIC, "C" );
 
     /* Load saved window settings */
     p_intf->p_sys->p_window_settings = new WindowSettings( p_intf );

diff --git a/src/libvlc.c b/src/libvlc.c
index 27ec60b0ba4a5b8c1e8165eda124115be410980d..173910b8d6138350c4e2028145b2f0e782767f54 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -529,9 +529,6 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
     /*
      * Override default configuration with config file settings
      */
-    /* (dionoea 13/08/2005) : we need to load locale here in order to have
-     * coherent float encoding with subsequent SaveConfigFile calls */
-    setlocale( LC_NUMERIC, "" );
     config_LoadConfigFile( p_vlc, NULL );
 
     /* Hack: insert the help module here */