Author: jsuchome Date: Mon Jan 11 15:42:08 2010 New Revision: 60313 URL: http://svn.opensuse.org/viewcvs/yast?rev=60313&view=rev Log: - do not call setxkbmap if running over ssh (bnc#539218) - 2.17.41 Modified: branches/SuSE-Code-11-SP1-Branch/country/VERSION branches/SuSE-Code-11-SP1-Branch/country/keyboard/src/modules/Keyboard.ycp branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes Modified: branches/SuSE-Code-11-SP1-Branch/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/country/VERSION?rev=60313&r1=60312&r2=60313&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/country/VERSION Mon Jan 11 15:42:08 2010 @@ -1 +1 @@ -2.17.40 +2.17.41 Modified: branches/SuSE-Code-11-SP1-Branch/country/keyboard/src/modules/Keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/country/keyboard/src/modules/Keyboard.ycp?rev=60313&r1=60312&r2=60313&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/keyboard/src/modules/Keyboard.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/country/keyboard/src/modules/Keyboard.ycp Mon Jan 11 15:42:08 2010 @@ -1136,10 +1136,16 @@ map display_info = UI::GetDisplayInfo (); textmode = display_info["TextMode"]:false; } + string display = getenv ("DISPLAY"); if (textmode) { y2milestone("Not setting X keyboard due to text mode"); } + // check if we are running over ssh: bnc#539218,c4 + else if (tointeger (splitstring (display, ":")[1]:"0") >= 10) + { + y2milestone("Not setting X keyboard: running over ssh"); + } else if (size (xkb_cmd)>0) { SetKeyboard (keyboard); Modified: branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes?rev=60313&r1=60312&r2=60313&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/country/package/yast2-country.changes Mon Jan 11 15:42:08 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 11 15:29:12 CET 2010 - jsuchome@suse.cz + +- do not call setxkbmap if running over ssh (bnc#539218) +- 2.17.41 + +------------------------------------------------------------------- Thu Jan 7 14:45:07 CET 2010 - jsuchome@suse.cz - added Language::SwitchToEnglishIfNeeded to be called when it might -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org