Author: jsuchome
Date: Fri Jul 4 11:50:56 2008
New Revision: 48875
URL: http://svn.opensuse.org/viewcvs/yast?rev=48875&view=rev
Log:
SCR->DBus
Modified:
branches/tmp/lslezak/workshop/country/language/src/modules/Language.ycp
Modified: branches/tmp/lslezak/workshop/country/language/src/modules/Language.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/country/language/src/modules/Language.ycp?rev=48875&r1=48874&r2=48875&view=diff
==============================================================================
--- branches/tmp/lslezak/workshop/country/language/src/modules/Language.ycp (original)
+++ branches/tmp/lslezak/workshop/country/language/src/modules/Language.ycp Fri Jul 4 11:50:56 2008
@@ -29,6 +29,7 @@
import "ProductFeatures";
import "Stage";
+import "DBus";
/**
* currently selected language
@@ -154,12 +155,12 @@
languages_directory = Directory::datadir + "/languages";
}
foreach (string file,
- (list<string>) SCR::Read (.target.dir, languages_directory, []),
+ (list<string>) DBus::ReadArgs (".target.dir", languages_directory, []),
{
if (!regexpmatch (file, "language_.+\\.ycp$"))
return;
map language_map = (map)
- eval (SCR::Read (.target.yast2, "languages/" + file));
+ eval (DBus::ReadArg (".target.yast2", "languages/" + file));
if (language_map == nil) language_map = $[];
string code = file;
foreach (string key, any val, (map) language_map, {
@@ -193,7 +194,7 @@
string file = sformat ("language_%1.ycp", lang);
if (FileUtils::Exists (languages_directory + "/" + file))
{
- ret = (map) eval (SCR::Read (.target.yast2, "languages/" + file));
+ ret = (map) eval (DBus::ReadArg (".target.yast2", "languages/" + file));
if (ret == nil)
ret = $[];
}
@@ -528,7 +529,7 @@
if (Stage::initial () && !Mode::live_installation ())
{
- string lang = (string)SCR::Read (.content.LANGUAGE);
+ string lang = (string)DBus::Read (".content.LANGUAGE");
y2milestone ("content LANGUAGE %1", lang);
preselected = Linuxrc::InstallInf ("Locale");
@@ -573,7 +574,7 @@
FillEnglishNames (local_lang);
}
}
- if (SCR::Read (.target.size, "/etc/sysconfig/language") > 0)
+ if (DBus::ReadArg (".target.size", "/etc/sysconfig/language") > 0)
{
ReadSysconfigValues ();
}
@@ -872,7 +873,7 @@
else
{
// FIXME ugly hack: see bug #47711
- string lc_mess = (string)SCR::Read(.sysconfig.language.RC_LC_MESSAGES);
+ string lc_mess = (string)DBus::Read(".sysconfig.language.RC_LC_MESSAGES");
if (find (lc_mess, "zh_TW") == 0)
{
SCR::Write (.sysconfig.language.RC_LC_MESSAGES, "");
@@ -980,7 +981,7 @@
file = "/usr/lib/YaST2/trans/" + ll + ".status";
}
- string status = (string) SCR::Read (.target.string, file);
+ string status = (string) DBus::ReadArg (".target.string", file);
if (status != nil && status != "")
{
@@ -1179,7 +1180,7 @@
*/
global void CheckLanguagesSupport (string selected_language) {
- string linguas = (string) SCR::Read (.content.LINGUAS);
+ string linguas = (string) DBus::Read (".content.LINGUAS");
if (linguas == nil) {
y2warning ("No LINGUAS tag defined in content file");
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
