correctly fetch the current locale, fix from owen.

Sun Jan  9 13:28:36 2000  Tim Janik  <timj@gtk.org>

        * gstrfuncs.c (g_strtod): correctly fetch the current locale,
        fix from owen.

diff --git a/ChangeLog b/ChangeLog
index e43e7397a166b54e956f9ef004210eba57817378..ef72dca839a196ebc4567519f3b483eb6ab7ae1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jan  9 13:28:36 2000  Tim Janik  <timj@gtk.org>
+
+       * gstrfuncs.c (g_strtod): correctly fetch the current locale,
+       fix from owen.
+
 1999-12-16  Tor Lillqvist  <tml@iki.fi>
 
        * gmodule/gmodule-win32.c: Use FormatMessage to translate system

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e43e7397a166b54e956f9ef004210eba57817378..ef72dca839a196ebc4567519f3b483eb6ab7ae1c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sun Jan  9 13:28:36 2000  Tim Janik  <timj@gtk.org>
+
+       * gstrfuncs.c (g_strtod): correctly fetch the current locale,
+       fix from owen.
+
 1999-12-16  Tor Lillqvist  <tml@iki.fi>
 
        * gmodule/gmodule-win32.c: Use FormatMessage to translate system

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e43e7397a166b54e956f9ef004210eba57817378..ef72dca839a196ebc4567519f3b483eb6ab7ae1c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Jan  9 13:28:36 2000  Tim Janik  <timj@gtk.org>
+
+       * gstrfuncs.c (g_strtod): correctly fetch the current locale,
+       fix from owen.
+
 1999-12-16  Tor Lillqvist  <tml@iki.fi>
 
        * gmodule/gmodule-win32.c: Use FormatMessage to translate system

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index e43e7397a166b54e956f9ef004210eba57817378..ef72dca839a196ebc4567519f3b483eb6ab7ae1c 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Sun Jan  9 13:28:36 2000  Tim Janik  <timj@gtk.org>
+
+       * gstrfuncs.c (g_strtod): correctly fetch the current locale,
+       fix from owen.
+
 1999-12-16  Tor Lillqvist  <tml@iki.fi>
 
        * gmodule/gmodule-win32.c: Use FormatMessage to translate system

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e43e7397a166b54e956f9ef004210eba57817378..ef72dca839a196ebc4567519f3b483eb6ab7ae1c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sun Jan  9 13:28:36 2000  Tim Janik  <timj@gtk.org>
+
+       * gstrfuncs.c (g_strtod): correctly fetch the current locale,
+       fix from owen.
+
 1999-12-16  Tor Lillqvist  <tml@iki.fi>
 
        * gmodule/gmodule-win32.c: Use FormatMessage to translate system

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e43e7397a166b54e956f9ef004210eba57817378..ef72dca839a196ebc4567519f3b483eb6ab7ae1c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Jan  9 13:28:36 2000  Tim Janik  <timj@gtk.org>
+
+       * gstrfuncs.c (g_strtod): correctly fetch the current locale,
+       fix from owen.
+
 1999-12-16  Tor Lillqvist  <tml@iki.fi>
 
        * gmodule/gmodule-win32.c: Use FormatMessage to translate system

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e43e7397a166b54e956f9ef004210eba57817378..ef72dca839a196ebc4567519f3b483eb6ab7ae1c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Jan  9 13:28:36 2000  Tim Janik  <timj@gtk.org>
+
+       * gstrfuncs.c (g_strtod): correctly fetch the current locale,
+       fix from owen.
+
 1999-12-16  Tor Lillqvist  <tml@iki.fi>
 
        * gmodule/gmodule-win32.c: Use FormatMessage to translate system

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e43e7397a166b54e956f9ef004210eba57817378..ef72dca839a196ebc4567519f3b483eb6ab7ae1c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Jan  9 13:28:36 2000  Tim Janik  <timj@gtk.org>
+
+       * gstrfuncs.c (g_strtod): correctly fetch the current locale,
+       fix from owen.
+
 1999-12-16  Tor Lillqvist  <tml@iki.fi>
 
        * gmodule/gmodule-win32.c: Use FormatMessage to translate system

diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 99ce93ac416c141386010a4252d02bb2e677f38e..e549260d7f6d29c88c90a00c14d80a021bebe968 100644 (file)
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -200,9 +200,11 @@ g_strtod (const gchar *nptr,
     {
       gchar *old_locale;
 
-      old_locale = setlocale (LC_NUMERIC, "C");
+      old_locale = g_strdup (setlocale (LC_NUMERIC, NULL));
+      setlocale (LC_NUMERIC, "C");
       val_2 = strtod (nptr, &fail_pos_2);
       setlocale (LC_NUMERIC, old_locale);
+      g_free (old_locale);
     }
 
   if (!fail_pos_1 || fail_pos_1[0] == 0 || fail_pos_1 >= fail_pos_2)

diff --git a/gstrfuncs.c b/gstrfuncs.c
index 99ce93ac416c141386010a4252d02bb2e677f38e..e549260d7f6d29c88c90a00c14d80a021bebe968 100644 (file)
--- a/gstrfuncs.c
+++ b/gstrfuncs.c
@@ -200,9 +200,11 @@ g_strtod (const gchar *nptr,
     {
       gchar *old_locale;
 
-      old_locale = setlocale (LC_NUMERIC, "C");
+      old_locale = g_strdup (setlocale (LC_NUMERIC, NULL));
+      setlocale (LC_NUMERIC, "C");
       val_2 = strtod (nptr, &fail_pos_2);
       setlocale (LC_NUMERIC, old_locale);
+      g_free (old_locale);
     }
 
   if (!fail_pos_1 || fail_pos_1[0] == 0 || fail_pos_1 >= fail_pos_2)