Hello community, here is the log from the commit of package yast2-x11 checked in at Wed Apr 5 18:00:10 CEST 2006. -------- --- yast2-x11/yast2-x11.changes 2006-03-28 13:39:40.000000000 +0200 +++ yast2-x11/yast2-x11.changes 2006-04-05 15:28:06.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 5 15:26:18 CEST 2006 - ms@suse.de + +- fixed information shown if the DisplaySize is unknown (#163749) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-x11.spec ++++++ --- /var/tmp/diff_new_pack.eg4zMh/_old 2006-04-05 18:00:01.000000000 +0200 +++ /var/tmp/diff_new_pack.eg4zMh/_new 2006-04-05 18:00:01.000000000 +0200 @@ -12,7 +12,7 @@ Name: yast2-x11 Version: 2.13.6 -Release: 30 +Release: 31 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -81,6 +81,8 @@ %doc %{prefix}/share/doc/packages/yast2-x11 %changelog -n yast2-x11 +* Wed Apr 05 2006 - ms@suse.de +- fixed information shown if the DisplaySize is unknown (#163749) * Tue Mar 28 2006 - ms@suse.de - add display- / windowmanger setup to AutoinstX11.ycp (#153852) * Mon Mar 13 2006 - ms@suse.de ++++++ yast2-x11-2.13.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.13.6/src/XLib.pm new/yast2-x11-2.13.6/src/XLib.pm --- old/yast2-x11-2.13.6/src/XLib.pm 2006-03-13 17:32:14.000000000 +0100 +++ new/yast2-x11-2.13.6/src/XLib.pm 2006-04-05 15:01:58.000000000 +0200 @@ -207,7 +207,7 @@ my $mDesktop = new SaX::SaXManipulateDesktop ( $section{Desktop},$section{Card},$section{Path} ); - my @result = ("15","4","3"); + my @result = ("undef"); my $traversal = $mDesktop->getDisplayTraversal(); my @ratio = @{$mDesktop->getDisplayRatio()}; if (defined $traversal) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-x11-2.13.6/src/proposal/x11_proposal.ycp new/yast2-x11-2.13.6/src/proposal/x11_proposal.ycp --- old/yast2-x11-2.13.6/src/proposal/x11_proposal.ycp 2006-03-08 16:19:46.000000000 +0100 +++ new/yast2-x11-2.13.6/src/proposal/x11_proposal.ycp 2006-04-05 15:11:17.000000000 +0200 @@ -87,6 +87,7 @@ boolean isNoteBookHW= (boolean) XLib::isNoteBookHardware(); boolean extVGAactive= (boolean) XLib::isExternalVGAactive(); list monitorSize = (list) XLib::getDisplaySize(); + string monitorInch = (string) monitorSize[0]:"undef"; //====================================== // Prepare proposal @@ -126,15 +127,25 @@ //====================================== // Monitor name and resolution... //-------------------------------------- - proposal = proposal - + LI - + XMessages::monitor + "" - + monitorName + "</a> " + "(" - + monitorSize[0]:"" + " " + XMessages::Inches + ", " - + XMessages::Aspect + " " + monitorSize[1]:"" + ":" - + monitorSize[2]:"" + "</a>)" + " - (" - + resolution + "</a>)" - + IL; + if (monitorInch == "undef") { + proposal = proposal + + LI + + XMessages::monitor + "" + + monitorName + "</a> " + "(" + + XMessages::Aspect + " " + XMessages::unconfigured + "</a>)" + + " - (" + resolution + "</a>)" + + IL; + } else { + proposal = proposal + + LI + + XMessages::monitor + "" + + monitorName + "</a> " + "(" + + monitorSize[0]:"" + " " + XMessages::Inches + ", " + + XMessages::Aspect + " " + monitorSize[1]:"" + ":" + + monitorSize[2]:"" + "</a>)" + " - (" + + resolution + "</a>)" + + IL; + } //====================================== // Colordepth and number of colors... //-------------------------------------- @@ -231,7 +242,7 @@ list<string> currentSize = XLib::getDisplaySize(); list<string> selectedSize = setupDisplaySize ( currentSize[0]:"15", - currentSize[1]:"5" + "/" + currentSize[2]:"4" + currentSize[1]:"4" + "/" + currentSize[2]:"3" ); y2milestone("X11: setup displaysize <%1>",selectedSize); XLib::setDisplaySize ( selectedSize ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...