November 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41856 - /tags/branch-SLE-10-SP2-2_13_10/power-management/
by jsrain＠svn.opensuse.org 07 Nov '07

07 Nov '07

Author: jsrain Date: Wed Nov 7 15:49:18 2007 New Revision: 41856 URL: http://svn.opensuse.org/viewcvs/yast?rev=41856&view=rev Log: Created tag branch-SLE-10-SP2-2_13_10 for power-management Added: tags/branch-SLE-10-SP2-2_13_10/power-management/ - copied from r41855, branches/SuSE-SLE-10-SP2-Branch/power-management/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41855 - in /branches/SuSE-SLE-10-SP2-Branch/power-management: VERSION package/yast2-power-management.changes src/PowerManagement.ycp testsuite/tests/PowerManagement.ycp
by jsrain＠svn.opensuse.org 07 Nov '07

07 Nov '07

Author: jsrain Date: Wed Nov 7 15:49:12 2007 New Revision: 41855 URL: http://svn.opensuse.org/viewcvs/yast?rev=41855&view=rev Log: fix text recoding if running non-UTF-8 locale (#339423) Modified: branches/SuSE-SLE-10-SP2-Branch/power-management/VERSION branches/SuSE-SLE-10-SP2-Branch/power-management/package/yast2-power-management.changes branches/SuSE-SLE-10-SP2-Branch/power-management/src/PowerManagement.ycp branches/SuSE-SLE-10-SP2-Branch/power-management/testsuite/tests/PowerManagement.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/power-management/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/power-… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/power-management/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/power-management/VERSION Wed Nov 7 15:49:12 2007 @@ -1 +1 @@ -2.13.9 +2.13.10 Modified: branches/SuSE-SLE-10-SP2-Branch/power-management/package/yast2-power-management.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/power-… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/power-management/package/yast2-power-management.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/power-management/package/yast2-power-management.changes Wed Nov 7 15:49:12 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 7 15:38:13 CET 2007 - jsrain(a)suse.cz + +- fix text recoding if running non-UTF-8 locale (#339423) +- 2.13.10 + +------------------------------------------------------------------- Tue Mar 13 14:25:01 CET 2007 - jsrain(a)suse.cz - added the .rnc file (#253599) Modified: branches/SuSE-SLE-10-SP2-Branch/power-management/src/PowerManagement.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/power-… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/power-management/src/PowerManagement.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/power-management/src/PowerManagement.ycp Wed Nov 7 15:49:12 2007 @@ -15,6 +15,7 @@ module "PowerManagement"; textdomain "power-management"; +import "Encoding"; import "Mode"; import "PackageSystem"; import "Progress"; @@ -608,6 +609,7 @@ return text; } string translated = out["stdout"]:""; + translated = (string)UI::Recode (Encoding::console, "UTF-8", translated); return translated; } Modified: branches/SuSE-SLE-10-SP2-Branch/power-management/testsuite/tests/PowerManagement.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/power-… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/power-management/testsuite/tests/PowerManagement.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/power-management/testsuite/tests/PowerManagement.ycp Wed Nov 7 15:49:12 2007 @@ -3,7 +3,12 @@ // testedfiles: PowerManagement.ycp include "testsuite.ycp"; -TESTSUITE_INIT([], nil); +map EXEC = $[ + "target" : $[ + "bash_output" : $[], + ], +]; +TESTSUITE_INIT([$[], $[], EXEC,], nil); import "PowerManagement"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41854 - /trunk/mail/src/widgets.ycp
by varkoly＠svn.opensuse.org 07 Nov '07

07 Nov '07

Author: varkoly Date: Wed Nov 7 15:21:37 2007 New Revision: 41854 URL: http://svn.opensuse.org/viewcvs/yast?rev=41854&view=rev Log: #337398 - Long time bug in yast mail transfer agent module regarding relayhost port setting Modified: trunk/mail/src/widgets.ycp Modified: trunk/mail/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/widgets.ycp?rev=41854&r… ============================================================================== --- trunk/mail/src/widgets.ycp (original) +++ trunk/mail/src/widgets.ycp Wed Nov 7 15:21:37 2007 @@ -221,8 +221,16 @@ // when validating: may be enclosed in brackets (prevents mx lookups) string oms = (string) UI::QueryWidget (`id (id), `Value); // watch this: "[", no brackets, "]" - string oms_no_brackets = regexpmatch (oms, "[[][^][]*[]]") ? - regexpsub (oms, ".(.*).", "\\1") : oms; + string oms_no_brackets = regexpmatch (oms, "[[][^][]*[]]:.*") ? regexpsub (oms, ".(.*).:.*", "\\1") : oms; + + if( oms_no_brackets == oms ) + { + oms_no_brackets = regexpmatch (oms, "[[][^][]*[]]") ? regexpsub (oms, ".(.*).", "\\1") : oms; + } + if( oms_no_brackets == oms ) + { + oms_no_brackets = regexpmatch (oms, ".*:.*") ? regexpsub (oms, "(.*):.*", "\\1") : oms; + } if (oms_no_brackets != "" && ! Address::Check (oms_no_brackets) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41853 - /tags/stable-2_16_4/storage/
by locilka＠svn.opensuse.org 07 Nov '07

07 Nov '07

Author: locilka Date: Wed Nov 7 15:02:23 2007 New Revision: 41853 URL: http://svn.opensuse.org/viewcvs/yast?rev=41853&view=rev Log: Created tag stable-2_16_4 for storage Added: tags/stable-2_16_4/storage/ - copied from r41852, trunk/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41852 - /trunk/storage/package/yast2-storage.changes
by locilka＠svn.opensuse.org 07 Nov '07

07 Nov '07

Author: locilka Date: Wed Nov 7 15:01:30 2007 New Revision: 41852 URL: http://svn.opensuse.org/viewcvs/yast?rev=41852&view=rev Log: Fixed typo in changes file Modified: trunk/storage/package/yast2-storage.changes Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Nov 7 15:01:30 2007 @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Nov 7 10:52:32 CET 2007 - locilka(a)suse.cz -- Removed dependency on autoyast2-installation by movidg some +- Removed dependency on autoyast2-installation by moving some AutoinstStorage variables to AutoinstData module (yast2.rpm). - Removed dependency on yast2-installation. - version 2.16.4 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41851 - /tags/stable-2_16_4/storage/
by locilka＠svn.opensuse.org 07 Nov '07

07 Nov '07

Author: locilka Date: Wed Nov 7 15:01:11 2007 New Revision: 41851 URL: http://svn.opensuse.org/viewcvs/yast?rev=41851&view=rev Log: Typo in changes file Removed: tags/stable-2_16_4/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41850 - /branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h
by sh-sh-sh＠svn.opensuse.org 07 Nov '07

07 Nov '07

Author: sh-sh-sh Date: Wed Nov 7 14:08:17 2007 New Revision: 41850 URL: http://svn.opensuse.org/viewcvs/yast?rev=41850&view=rev Log: doc Modified: branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h Wed Nov 7 14:08:17 2007 @@ -183,14 +183,16 @@ YCPValue CloseDialog(); // TODO DECL_NIL? + // 'nil' is a valid new_value! (CheckBox tristate value -> nil) /* TYPEINFO: boolean (symbol, symbol, any) */ YCPValue ChangeWidget( const YCPSymbol & widget_id, const YCPSymbol & property, const YCPValue & new_value ); // TODO DECL_NIL? + // 'nil' is a valid new_value! (CheckBox tristate value -> nil) /* TYPEINFO: boolean (term, symbol, any) */ YCPValue ChangeWidget( const YCPTerm & widget_id, const YCPSymbol & property, const YCPValue & new_value ); - // TODO DECL_NIL? + // No 'nil' permitted for new_value here /* TYPEINFO: boolean (term, term, any) */ YCPValue ChangeWidget( const YCPTerm & widget_id, const YCPTerm & property, const YCPValue & new_value ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41849 - in /branches/tmp/sh/mod-ui/core/libyui/src: UIBuiltinCalls.h UIBuiltinTable.h Y2UINamespace.h
by sh-sh-sh＠svn.opensuse.org 07 Nov '07

07 Nov '07

Author: sh-sh-sh Date: Wed Nov 7 14:05:30 2007 New Revision: 41849 URL: http://svn.opensuse.org/viewcvs/yast?rev=41849&view=rev Log: coding style Modified: branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinCalls.h branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinTable.h branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinCalls.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinCalls.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinCalls.h Wed Nov 7 14:05:30 2007 @@ -1,8 +1,3 @@ -// -// Generated by generateYCPWrappers -// -// DO NOT CHANGE! -// case 0: if (m_param1->isVoid()) {y2error("ERROR: Parameter 1 is nil, String is required"); return YCPVoid();} return m_instance->SetLanguage (m_param1->asString()); case 1: if (m_param1->isVoid()) {y2error("ERROR: Parameter 1 is nil, String is required"); return YCPVoid();} if (m_param2->isVoid()) {y2error("ERROR: Parameter 2 is nil, String is required"); return YCPVoid();} return m_instance->SetLanguage (m_param1->asString(), m_param2->asString()); case 2: return m_instance->GetProductName (); Modified: branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinTable.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinTable.h Wed Nov 7 14:05:30 2007 @@ -1,10 +1,4 @@ -// -// Generated by generateYCPWrappers -// -// DO NOT CHANGE! -// - - enterSymbol (new SymbolEntry (this, 0, "SetLanguage", SymbolEntry::c_function, Type::fromSignature ("void (string)") ) ); + enterSymbol (new SymbolEntry (this, 0, "SetLanguage", SymbolEntry::c_function, Type::fromSignature ("void (string)") ) ); _registered_functions.push_back ("SetLanguage"); enterSymbol (new SymbolEntry (this, 1, "SetLanguage", SymbolEntry::c_function, Type::fromSignature ("void (string, string)") ) ); _registered_functions.push_back ("SetLanguage"); Modified: branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h Wed Nov 7 14:05:30 2007 @@ -138,16 +138,16 @@ /* TYPEINFO: void (string) */ - YCPValue SetLanguage ( const YCPString & language ); + YCPValue SetLanguage( const YCPString & language ); /* TYPEINFO: void (string, string) */ - YCPValue SetLanguage ( const YCPString & language, const YCPString & encoding ); + YCPValue SetLanguage( const YCPString & language, const YCPString & encoding ); /* TYPEINFO: string () */ YCPValue GetProductName(); /* TYPEINFO: void (string) */ - YCPValue SetProductName ( const YCPString & name ); + YCPValue SetProductName( const YCPString & name ); /* TYPEINFO: void (string, string, string, string, string) */ YCPValue SetConsoleFont ( const YCPString & console_magic, const YCPString & font, const YCPString & screen_map, const YCPString & unicode_map, const YCPString & encoding ); @@ -156,7 +156,7 @@ YCPValue SetKeyboard(); /* TYPEINFO: string (boolean) */ - YCPValue GetLanguage ( const YCPBoolean & strip ); + YCPValue GetLanguage( const YCPBoolean & strip ); /* TYPEINFO: any() */ YCPValue UserInput(); @@ -165,7 +165,7 @@ YCPValue PollInput(); /* TYPEINFO: any (integer) */ - YCPValue TimeoutUserInput ( const YCPInteger& timeout ); + YCPValue TimeoutUserInput( const YCPInteger& timeout ); /* TYPEINFO: map<string,any> () */ YCPValue WaitForEvent(); @@ -184,42 +184,42 @@ // TODO DECL_NIL? /* TYPEINFO: boolean (symbol, symbol, any) */ - YCPValue ChangeWidget ( const YCPSymbol & widget_id, const YCPSymbol & property, const YCPValue & new_value ); + YCPValue ChangeWidget( const YCPSymbol & widget_id, const YCPSymbol & property, const YCPValue & new_value ); // TODO DECL_NIL? /* TYPEINFO: boolean (term, symbol, any) */ - YCPValue ChangeWidget ( const YCPTerm & widget_id, const YCPSymbol & property, const YCPValue & new_value ); + YCPValue ChangeWidget( const YCPTerm & widget_id, const YCPSymbol & property, const YCPValue & new_value ); // TODO DECL_NIL? /* TYPEINFO: boolean (term, term, any) */ - YCPValue ChangeWidget ( const YCPTerm & widget_id, const YCPTerm & property, const YCPValue & new_value ); + YCPValue ChangeWidget( const YCPTerm & widget_id, const YCPTerm & property, const YCPValue & new_value ); /* TYPEINFO: any (symbol, symbol) */ - YCPValue QueryWidget ( const YCPSymbol & widget_id, const YCPSymbol & property ); + YCPValue QueryWidget( const YCPSymbol & widget_id, const YCPSymbol & property ); /* TYPEINFO: any (symbol, term) */ - YCPValue QueryWidget ( const YCPSymbol & widget_id, const YCPTerm & property ); + YCPValue QueryWidget( const YCPSymbol & widget_id, const YCPTerm & property ); /* TYPEINFO: any (term, symbol) */ - YCPValue QueryWidget ( const YCPTerm & widget_id, const YCPSymbol & property ); + YCPValue QueryWidget( const YCPTerm & widget_id, const YCPSymbol & property ); /* TYPEINFO: any (term, term) */ - YCPValue QueryWidget ( const YCPTerm & widget_id, const YCPTerm & property ); + YCPValue QueryWidget( const YCPTerm & widget_id, const YCPTerm & property ); /* TYPEINFO: boolean (symbol, term) */ - YCPValue ReplaceWidget ( const YCPSymbol & widget_id, const YCPTerm & new_widget ); + YCPValue ReplaceWidget( const YCPSymbol & widget_id, const YCPTerm & new_widget ); /* TYPEINFO: boolean (term, term) */ - YCPValue ReplaceWidget ( const YCPTerm & widget_id, const YCPTerm & new_widget ); + YCPValue ReplaceWidget( const YCPTerm & widget_id, const YCPTerm & new_widget ); /* TYPEINFO: boolean (symbol) */ - YCPValue SetFocus ( const YCPSymbol & widget_id ); + YCPValue SetFocus( const YCPSymbol & widget_id ); /* TYPEINFO: boolean (term) */ - YCPValue SetFocus ( const YCPTerm & widget_id ); + YCPValue SetFocus( const YCPTerm & widget_id ); /* TYPEINFO: integer (string) */ - YCPValue RunInTerminal ( const YCPString & command ); + YCPValue RunInTerminal( const YCPString & command ); /* TYPEINFO: void () */ YCPValue BusyCursor(); @@ -231,7 +231,7 @@ YCPValue NormalCursor(); /* TYPEINFO: void (string) */ - YCPValue MakeScreenShot ( const YCPString & filename ); + YCPValue MakeScreenShot( const YCPString & filename ); /* TYPEINFO: void () */ YCPValue MakeScreenShot(); @@ -243,22 +243,22 @@ YCPValue Beep(); /* TYPEINFO: void (string) */ - YCPValue RecordMacro ( const YCPString & filename ); + YCPValue RecordMacro( const YCPString & filename ); /* TYPEINFO: void () */ YCPValue StopRecordMacro(); /* TYPEINFO: void (string) */ - YCPValue PlayMacro ( const YCPString & filename ); + YCPValue PlayMacro( const YCPString & filename ); /* TYPEINFO: void () */ YCPValue FakeUserInput(); /* TYPEINFO: void (any) */ - YCPValue FakeUserInput ( const YCPValue & next_input ); + YCPValue FakeUserInput( const YCPValue & next_input ); /* TYPEINFO: string (symbol) */ - YCPValue Glyph ( const YCPSymbol & glyphSym ); + YCPValue Glyph( const YCPSymbol & glyphSym ); /* TYPEINFO: map<string,any> () */ YCPValue GetDisplayInfo(); @@ -273,37 +273,37 @@ YCPValue CheckShortcuts(); /* TYPEINFO: boolean (symbol) */ - YCPValue WidgetExists ( const YCPSymbol & widget_id ); + YCPValue WidgetExists( const YCPSymbol & widget_id ); /* TYPEINFO: boolean (term) */ - YCPValue WidgetExists ( const YCPTerm & widget_id ); + YCPValue WidgetExists( const YCPTerm & widget_id ); /* TYPEINFO: any (term) */ - YCPValue RunPkgSelection ( const YCPValue & widget_id ); + YCPValue RunPkgSelection( const YCPValue & widget_id ); /* TYPEINFO: string (string, string) */ - YCPValue AskForExistingDirectory ( const YCPString & startDir, const YCPString & headline ); + YCPValue AskForExistingDirectory( const YCPString & startDir, const YCPString & headline ); /* TYPEINFO: string (string, string, string) */ - YCPValue AskForExistingFile ( const YCPString & startWith, const YCPString & filter, const YCPString & headline ); + YCPValue AskForExistingFile( const YCPString & startWith, const YCPString & filter, const YCPString & headline ); /* TYPEINFO: string (string, string, string) */ - YCPValue AskForSaveFileName ( const YCPString & startWith, const YCPString & filter, const YCPString & headline ); + YCPValue AskForSaveFileName( const YCPString & startWith, const YCPString & filter, const YCPString & headline ); /* TYPEINFO: void (map<string,integer>) */ - YCPValue SetFunctionKeys ( const YCPMap & new_fkeys ); + YCPValue SetFunctionKeys( const YCPMap & new_fkeys ); /* TYPEINFO: any (string, string, string) */ - YCPValue Recode ( const YCPString & from, const YCPString & to, const YCPString & text ); + YCPValue Recode( const YCPString & from, const YCPString & to, const YCPString & text ); /* TYPEINFO: void (string) */ - YCPValue SetModulename ( const YCPString & name ); + YCPValue SetModulename( const YCPString & name ); /* TYPEINFO: boolean (symbol) */ - YCPValue HasSpecialWidget ( const YCPSymbol & widget ); + YCPValue HasSpecialWidget( const YCPSymbol & widget ); /* TYPEINFO: boolean (term) */ - YCPValue WizardCommand ( const YCPTerm & command ); + YCPValue WizardCommand( const YCPTerm & command ); YCPValue -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41848 - in /branches/tmp/sh/mod-ui/core/libyui/src: UIBuiltinCalls.h UIBuiltinTable.h Y2UINamespace.cc
by sh-sh-sh＠svn.opensuse.org 07 Nov '07

07 Nov '07

Author: sh-sh-sh Date: Wed Nov 7 13:59:16 2007 New Revision: 41848 URL: http://svn.opensuse.org/viewcvs/yast?rev=41848&view=rev Log: generated code notice Modified: branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinCalls.h branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinTable.h branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinCalls.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinCalls.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinCalls.h Wed Nov 7 13:59:16 2007 @@ -1,3 +1,8 @@ +// +// Generated by generateYCPWrappers +// +// DO NOT CHANGE! +// case 0: if (m_param1->isVoid()) {y2error("ERROR: Parameter 1 is nil, String is required"); return YCPVoid();} return m_instance->SetLanguage (m_param1->asString()); case 1: if (m_param1->isVoid()) {y2error("ERROR: Parameter 1 is nil, String is required"); return YCPVoid();} if (m_param2->isVoid()) {y2error("ERROR: Parameter 2 is nil, String is required"); return YCPVoid();} return m_instance->SetLanguage (m_param1->asString(), m_param2->asString()); case 2: return m_instance->GetProductName (); Modified: branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinTable.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinTable.h Wed Nov 7 13:59:16 2007 @@ -1,4 +1,10 @@ - enterSymbol (new SymbolEntry (this, 0, "SetLanguage", SymbolEntry::c_function, Type::fromSignature ("void (string)") ) ); +// +// Generated by generateYCPWrappers +// +// DO NOT CHANGE! +// + + enterSymbol (new SymbolEntry (this, 0, "SetLanguage", SymbolEntry::c_function, Type::fromSignature ("void (string)") ) ); _registered_functions.push_back ("SetLanguage"); enterSymbol (new SymbolEntry (this, 1, "SetLanguage", SymbolEntry::c_function, Type::fromSignature ("void (string, string)") ) ); _registered_functions.push_back ("SetLanguage"); Modified: branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.cc Wed Nov 7 13:59:16 2007 @@ -618,11 +618,11 @@ { switch (position) { - case 0: m_param1 = arg; break; - case 1: m_param2 = arg; break; - case 2: m_param3 = arg; break; - case 3: m_param4 = arg; break; - case 4: m_param5 = arg; break; + case 0: m_param1 = arg; break; + case 1: m_param2 = arg; break; + case 2: m_param3 = arg; break; + case 3: m_param4 = arg; break; + case 4: m_param5 = arg; break; default: return false; } @@ -751,32 +751,38 @@ } -Y2UIOverloadedFunction::Y2UIOverloadedFunction ( - Y2UINamespace* instance, YUIComponent* comp, - unsigned pos_offset, - vector<SymbolEntryPtr>::iterator candidates_b, - vector<SymbolEntryPtr>::iterator candidates_e, - bool play_macro_blocks) : - Y2UIFunction (instance, comp, pos_offset, play_macro_blocks), - m_candidates_b (candidates_b), - m_candidates_e (candidates_e) +Y2UIOverloadedFunction::Y2UIOverloadedFunction ( Y2UINamespace* instance, YUIComponent* comp, + unsigned pos_offset, + vector<SymbolEntryPtr>::iterator candidates_b, + vector<SymbolEntryPtr>::iterator candidates_e, + bool play_macro_blocks ) + : Y2UIFunction (instance, comp, pos_offset, play_macro_blocks) + , m_candidates_b (candidates_b) + , m_candidates_e (candidates_e) { // still to do: m_position is just the first candidate } -bool Y2UIOverloadedFunction::finishParameters() + +bool +Y2UIOverloadedFunction::finishParameters() { FunctionTypePtr real_tp = new FunctionType (Type::Unspec); //return type - if (!m_param1.isNull()) { + if (!m_param1.isNull()) + { real_tp->concat (Type::vt2type (m_param1->valuetype())); - if (!m_param2.isNull()) { + if (!m_param2.isNull()) + { real_tp->concat (Type::vt2type (m_param2->valuetype())); - if (!m_param3.isNull()) { + if (!m_param3.isNull()) + { real_tp->concat (Type::vt2type (m_param3->valuetype())); - if (!m_param4.isNull()) { + if (!m_param4.isNull()) + { real_tp->concat (Type::vt2type (m_param4->valuetype())); - if (!m_param5.isNull()) { + if (!m_param5.isNull()) + { real_tp->concat (Type::vt2type (m_param5->valuetype())); } } @@ -784,48 +790,50 @@ } } y2debug ("Actual type: %s", real_tp->toString().c_str()); - + vector<SymbolEntryPtr>::iterator b = m_candidates_b, e = m_candidates_e, it; - for (it = b; it != e; ++it) { + for (it = b; it != e; ++it) + { SymbolEntryPtr se_p = *it; constFunctionTypePtr cand_type = se_p->type(); int m = real_tp->match (cand_type); - y2debug ("Candidate: %s MATCH: %d", - se_p->toString().c_str(), m); + y2debug ("Candidate: %s MATCH: %d", se_p->toString().c_str(), m); + if (m == 0) break; } - if (it == e) { + if (it == e) + { // any candidate has a good name. report actual used signature. no_match ((*b)->name(), real_tp, b, e); return false; } + // found m_position += (it - b); return true; } -/** - * Constructor. - */ + Y2UINamespace::Y2UINamespace (YUIComponent* comp) { m_comp = comp; registerFunctions(); } -/** - * Destructor. - */ + Y2UINamespace::~Y2UINamespace() -{} +{ + // NOP +} + -Y2Function* Y2UINamespace::createFunctionCall (const string name, constFunctionTypePtr type) +Y2Function* Y2UINamespace::createFunctionCall( const string name, constFunctionTypePtr type ) { #if VERBOSE_UI_CALLS y2debug ("Creating function call for %s", name.c_str()); @@ -840,31 +848,37 @@ it = b; SymbolEntryPtr p; - // 1: find start of range of overloaded functions - for ( ; it != e; it++) + // + // 1: Find start of range of overloaded functions + // + + for ( ; it != e; it++ ) { p = (*it); if ( p->name() == name ) break; } - if (it == e) + if ( it == e ) { y2error ("No such function %s", name.c_str()); return NULL; } bool play_macro_blocks = (name == "UserInput" || name == "TimeoutUserInput" || name == "WaitForEvent"); - + symbols_t::iterator rb = it; // 2: find end of range of overloaded functions or the exact match - for ( ; it != e; it++) + + for ( ; it != e; it++ ) { - p = (*it); + p = (*it); if ( p->name() != name ) break; + // type comparison, ugh, use match - if (type && p->type() == type) + + if ( type && p->type() == type ) { // found exact match // BTW, p->position() may change as we go, don't get confused. @@ -875,10 +889,11 @@ return new Y2UIFunction (this, m_comp, it - b, play_macro_blocks); } } + symbols_t::iterator re = it; // [rb, re) have matching name - if (type) + if ( type ) { // we have exhausted the candidates without finding a match y2error ("Incompatible yast2-core?"); @@ -890,6 +905,7 @@ return new Y2UIOverloadedFunction (this, m_comp, rb - b, rb, re, play_macro_blocks); } + void Y2UINamespace::registerFunctions() { #include "UIBuiltinTable.h" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41847 - /tags/stable-2_16_4/storage/
by locilka＠svn.opensuse.org 07 Nov '07

07 Nov '07

Author: locilka Date: Wed Nov 7 13:52:16 2007 New Revision: 41847 URL: http://svn.opensuse.org/viewcvs/yast?rev=41847&view=rev Log: Created tag stable-2_16_4 for storage Added: tags/stable-2_16_4/storage/ - copied from r41846, trunk/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0