Author: jdsn Date: Thu Sep 18 16:07:18 2008 New Revision: 51286 URL: http://svn.opensuse.org/viewcvs/yast?rev=51286&view=rev Log: - temporary disable the fix for (bnc#381644) because of (bnc#427371) - set propper display size if size is undefined Modified: trunk/x11/VERSION trunk/x11/package/yast2-x11.changes trunk/x11/src/XLib.pm trunk/x11/src/proposal/x11_proposal.ycp Modified: trunk/x11/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/VERSION?rev=51286&r1=51285&r2=51286&view=diff ============================================================================== --- trunk/x11/VERSION (original) +++ trunk/x11/VERSION Thu Sep 18 16:07:18 2008 @@ -1 +1 @@ -2.17.5 +2.17.6 Modified: trunk/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?rev=51286&r1=51285&r2=51286&view=diff ============================================================================== --- trunk/x11/package/yast2-x11.changes (original) +++ trunk/x11/package/yast2-x11.changes Thu Sep 18 16:07:18 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Sep 18 16:00:19 CEST 2008 - jdsn@suse.de + +- temporary disable the fix for (bnc#381644) because of (bnc#427371) +- set propper display size if size is undefined +- 2.17.6 + +------------------------------------------------------------------- Thu Sep 11 13:13:40 CEST 2008 - jdsn@suse.de - fix for no BusID setting (bnc#381644) Modified: trunk/x11/src/XLib.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/XLib.pm?rev=51286&r1=51285&r2=51286&view=diff ============================================================================== --- trunk/x11/src/XLib.pm (original) +++ trunk/x11/src/XLib.pm Thu Sep 18 16:07:18 2008 @@ -63,7 +63,8 @@ my $sinit = new SaX::SaXInit; $ENV{HW_UPDATE} = 1; # do not set busid parameter in single chip mode, therefore try to set the primary chip (bnc#381644) - $sinit -> setPrimaryChip(); + # FIXME FIXME FIXME - temprary disabled this bugfix to workaround another issue -> tracked in (bnc#427371) + ## $sinit -> setPrimaryChip(); $sinit -> doInit(); my @importID = ( $SaX::SAX_CARD, Modified: trunk/x11/src/proposal/x11_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/proposal/x11_proposal.ycp?rev=51286&r1=51285&r2=51286&view=diff ============================================================================== --- trunk/x11/src/proposal/x11_proposal.ycp (original) +++ trunk/x11/src/proposal/x11_proposal.ycp Thu Sep 18 16:07:18 2008 @@ -299,8 +299,11 @@ if (chosenID == "sax-displaysize") { y2milestone("X11: setup displaysize..."); list<string> currentSize = XLib::getDisplaySize(); + // in case of undefined value fallback to a default + if (currentSize[0]:"undef" == "undef") + currentSize[0] = "15.0"; list<string> selectedSize = setupDisplaySize ( - currentSize[0]:"15", + currentSize[0]:"15.0", currentSize[1]:"4" + "/" + currentSize[2]:"3" ); y2milestone("X11: setup displaysize <%1>",selectedSize); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org