[yast-commit] r48515 - in /trunk/x11: VERSION package/yast2-x11.changes src/XLib.pm src/autoyast/modules/AutoinstX11.ycp src/proposal/x11_proposal.ycp
Author: jdsn Date: Tue Jun 24 19:53:47 2008 New Revision: 48515 URL: http://svn.opensuse.org/viewcvs/yast?rev=48515&view=rev Log: proper type conversion in autoinstallation (bnc#307967) check for empty traversal parameter (bnc#388259) show popup message before probing display (bnc#327604) initial CODE11 release, version 2.17.0 Modified: trunk/x11/VERSION trunk/x11/package/yast2-x11.changes trunk/x11/src/XLib.pm trunk/x11/src/autoyast/modules/AutoinstX11.ycp trunk/x11/src/proposal/x11_proposal.ycp Modified: trunk/x11/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/VERSION?rev=48515&r1=48514&r2=48515&view=diff ============================================================================== --- trunk/x11/VERSION (original) +++ trunk/x11/VERSION Tue Jun 24 19:53:47 2008 @@ -1 +1 @@ -2.15.12 +2.17.0 Modified: trunk/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?rev=48515&r1=48514&r2=48515&view=diff ============================================================================== --- trunk/x11/package/yast2-x11.changes (original) +++ trunk/x11/package/yast2-x11.changes Tue Jun 24 19:53:47 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Jun 24 19:00:47 CEST 2008 - jdsn@suse.de + +- proper type conversion in autoinstallation (bnc#307967) +- check for empty traversal parameter (bnc#388259) +- show popup message before probing display (bnc#327604) +- 2.17.0 + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain@suse.cz - added categories Settings and System into desktop file Modified: trunk/x11/src/XLib.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/XLib.pm?rev=48515&r1=48514&r2=48515&view=diff ============================================================================== --- trunk/x11/src/XLib.pm (original) +++ trunk/x11/src/XLib.pm Tue Jun 24 19:53:47 2008 @@ -258,6 +258,8 @@ my $traversal = $mDesktop->getDisplayTraversal(); my @ratio = @{$mDesktop->getDisplayRatio()}; if (defined $traversal) { + # if traversal is empty, set a minimal default value (bnc#388259) + if ($traversal eq "") { $traversal = 12.2; } $traversal = sprintf ("%.1f",$traversal); if ($traversal < 12.2) { $traversal = 10.0; Modified: trunk/x11/src/autoyast/modules/AutoinstX11.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/autoyast/modules/AutoinstX11.ycp?rev=48515&r1=48514&r2=48515&view=diff ============================================================================== --- trunk/x11/src/autoyast/modules/AutoinstX11.ycp (original) +++ trunk/x11/src/autoyast/modules/AutoinstX11.ycp Tue Jun 24 19:53:47 2008 @@ -170,10 +170,10 @@ SCR::Write (.sysconfig.windowmanager.DEFAULT_WM, windowManager); SCR::Write (.sysconfig.windowmanager, nil); } - integer hstart = display["min_hsync"]:30; - integer hstop = display["max_hsync"]:60; - integer vstart = display["min_vsync"]:60; - integer vstop = display["max_vsync"]:75; + integer hstart = tointeger(display["min_hsync"]:30); + integer hstop = tointeger(display["max_hsync"]:60); + integer vstart = tointeger(display["min_vsync"]:60); + integer vstop = tointeger(display["max_vsync"]:75); y2milestone("X11-Auto: setup monitor <%1:%2>",current_vendor,current_model); XLib::setMonitorCDB ( [current_vendor,current_model] ); XLib::setHsyncRange (hstart,hstop); @@ -183,7 +183,8 @@ y2milestone("X11-Auto: setup resolution <%1>",resolution); XLib::setResolution ( resolution ); - integer colors = x11["color_depth"]:16; + // convert value to integer (bnc#307967) + integer colors = tointeger(x11["color_depth"]:16); y2milestone("X11-Auto: setup color depth <%1>",colors); XLib::setDefaultColorDepth ( tostring(colors) ); @@ -205,7 +206,7 @@ SCR::Write (.sysconfig.displaymanager.DISPLAYMANAGER_XGL_OPTS, x11["xgl_custom_options"]:"" ); } } - + } else { XLib::deactivate3D(); } Modified: trunk/x11/src/proposal/x11_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/proposal/x11_proposal.ycp?rev=48515&r1=48514&r2=48515&view=diff ============================================================================== --- trunk/x11/src/proposal/x11_proposal.ycp (original) +++ trunk/x11/src/proposal/x11_proposal.ycp Tue Jun 24 19:53:47 2008 @@ -31,6 +31,7 @@ import "XMessages"; import "XLib"; import "Package"; +import "Popup"; include "x11/x11Dialog.ycp"; @@ -97,6 +98,7 @@ //-------------------------------------- if (! (boolean)XLib::isInitialized()) { y2milestone ("Loading library cache..."); + Popup::TimedMessage(XMessage::probeWarning, 15); XLib::loadApplication(); } //====================================== -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
jdsn@svn.opensuse.org