From 0abb35a840d29f59b4680b87b28c1f8d18b95390 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Thu, 30 Jun 2005 07:46:12 +0000
Subject: rename setlocale() as init_setlocale() since it's more meaninfull
 regarding its purpose

---
 perl-install/c/stuff.xs.pl       | 2 +-
 perl-install/interactive/newt.pm | 2 +-
 perl-install/lang.pm             | 2 +-
 perl-install/standalone.pm       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/c/stuff.xs.pl b/perl-install/c/stuff.xs.pl
index 977894a57..15c39bf04 100644
--- a/perl-install/c/stuff.xs.pl
+++ b/perl-install/c/stuff.xs.pl
@@ -236,7 +236,7 @@ get_ext2_label(device_name)
   RETVAL
 
 void
-setlocale()
+init_setlocale()
    CODE:
    setlocale(LC_ALL, "");
    setlocale(LC_NUMERIC, "C"); /* otherwise eval "1.5" returns 1 in fr_FR for example */
diff --git a/perl-install/interactive/newt.pm b/perl-install/interactive/newt.pm
index 8bc39b19f..af829b42b 100644
--- a/perl-install/interactive/newt.pm
+++ b/perl-install/interactive/newt.pm
@@ -21,7 +21,7 @@ sub new {
 	    local $ENV{LC_CTYPE} = "en_US.UTF-8";
 	    Newt::Init(1);
 	}
-	c::setlocale();
+	c::init_setlocale();
     } else {
 	Newt::Init(0);
     }
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index ce56a60c1..a2b75b463 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -1249,7 +1249,7 @@ sub bindtextdomain() {
     #- NB: not using $::isInstall to make it work more easily at install and standalone
     my $localedir = "$ENV{SHARE_PATH}/locale" . ($::prefix ? "_special" : '');
 
-    c::setlocale();
+    c::init_setlocale();
     c::bind_textdomain_codeset('libDrakX', 'UTF-8');
     $::need_utf8_i18n = 1;
     c::bindtextdomain('libDrakX', $localedir);
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index e0e0b056f..6ecb45b2e 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -15,7 +15,7 @@ $::isStandalone = 1;
 
 $ENV{SHARE_PATH} ||= "/usr/share";
 
-c::setlocale();
+c::init_setlocale();
 c::bindtextdomain('libDrakX', "/usr/share/locale");
 
 $::license = N_("This program is free software; you can redistribute it and/or modify
-- 
cgit v1.2.1