Author: jdsn
Date: Fri Nov 21 16:58:45 2008
New Revision: 53526
URL: http://svn.opensuse.org/viewcvs/yast?rev=53526&view=rev
Log:
disable manual tablet configuration in installation (bnc#447622)
2.17.9
Modified:
trunk/x11/VERSION
trunk/x11/package/yast2-x11.changes
trunk/x11/src/proposal/x11_proposal.ycp
Modified: trunk/x11/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/VERSION?rev=53526&r1=53525&r2=53526&view=diff
==============================================================================
--- trunk/x11/VERSION (original)
+++ trunk/x11/VERSION Fri Nov 21 16:58:45 2008
@@ -1 +1 @@
-2.17.8
+2.17.9
Modified: trunk/x11/package/yast2-x11.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?rev=53526&r1=53525&r2=53526&view=diff
==============================================================================
--- trunk/x11/package/yast2-x11.changes (original)
+++ trunk/x11/package/yast2-x11.changes Fri Nov 21 16:58:45 2008
@@ -1,7 +1,13 @@
-------------------------------------------------------------------
+Fri Nov 21 13:09:35 CET 2008 - jdsn@suse.de
+
+- disable manual tablet configuration in installation (bnc#447622)
+- 2.17.9
+
+-------------------------------------------------------------------
Wed Nov 19 21:49:04 CET 2008 - jdsn@suse.de
-- no x11 configuration only without a graphics device (bnc#431522)
+- no x11 configuration without a graphics device (bnc#431522)
- fix sax call to set tablet (bnc#445422)
-------------------------------------------------------------------
Modified: trunk/x11/src/proposal/x11_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/proposal/x11_proposal.ycp?rev=53526&r1=53525&r2=53526&view=diff
==============================================================================
--- trunk/x11/src/proposal/x11_proposal.ycp (original)
+++ trunk/x11/src/proposal/x11_proposal.ycp Fri Nov 21 16:58:45 2008
@@ -141,7 +141,8 @@
boolean extVGAactive= (boolean) XLib::isExternalVGAactive();
list monitorSize = (list) XLib::getDisplaySize();
string monitorInch = (string) monitorSize[0]:"undef";
- integer tabletID = (integer) XLib::getTabletID(); // (bnc#429770)
+// integer tabletID = (integer) XLib::getTabletID(); // (bnc#429770)
+ integer tabletID = 0; // disabled due to (bnc#447622)
// add more verbose logging
y2milestone("Reading libsax data finished.");
@@ -274,7 +275,7 @@
proposal = proposal
+ LI
+ XMessages::Tablet + " " + tabletStatus
- + " (" + XMessages::configure + "</a>)"
+ // + " (" + XMessages::configure + "</a>)"
+ IL;
}
//======================================
@@ -301,8 +302,8 @@
"sax-colors",
"sax-3d",
"sax-ext-vga",
- "sax-test",
- "sax-tablet"
+ "sax-test"
+ //,"sax-tablet"
]
];
return ret;
@@ -394,15 +395,16 @@
if (chosenID == "x11_conf") {
infoPopup();
}
- if (chosenID == "sax-tablet" ) {
- y2milestone("X11: setup tablet...");
- string vendor = XLib::getTabletVendor();
- string model = XLib::getTabletModel();
- map