Author: jdsn Date: Thu Jul 30 21:37:23 2009 New Revision: 58227 URL: http://svn.opensuse.org/viewcvs/yast?rev=58227&view=rev Log: disabled to call sax2 when GPM configuration is called in graphical mode (bnc#441404) 2.18.1 Modified: trunk/mouse/VERSION trunk/mouse/package/yast2-mouse.changes trunk/mouse/src/mouse.desktop trunk/mouse/src/mouse.ycp Modified: trunk/mouse/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/mouse/VERSION?rev=58227&r1=58226&r2=58227&view=diff ============================================================================== --- trunk/mouse/VERSION (original) +++ trunk/mouse/VERSION Thu Jul 30 21:37:23 2009 @@ -1 +1 @@ -2.18.0 +2.18.1 Modified: trunk/mouse/package/yast2-mouse.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mouse/package/yast2-mouse.changes?rev=58227&r1=58226&r2=58227&view=diff ============================================================================== --- trunk/mouse/package/yast2-mouse.changes (original) +++ trunk/mouse/package/yast2-mouse.changes Thu Jul 30 21:37:23 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jul 30 20:56:18 CEST 2009 - jdsn@suse.de + +- disabled to call sax2 when GPM configuration is called in + graphical mode (bnc#441404) +- 2.18.1 + +------------------------------------------------------------------- Fri Mar 6 09:02:25 CET 2009 - jsrain@suse.cz - fixed textdomain Modified: trunk/mouse/src/mouse.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/mouse/src/mouse.desktop?rev=58227&r1=58226&r2=58227&view=diff ============================================================================== --- trunk/mouse/src/mouse.desktop (original) +++ trunk/mouse/src/mouse.desktop Thu Jul 30 21:37:23 2009 @@ -19,7 +19,7 @@ Icon=yast-mouse Exec=/sbin/yast2 mouse -Name=Mouse Model -GenericName=Change the mouse model +Name=GPM Configuration +GenericName=Change the console mouse model X-KDE-SubstituteUID=true StartupNotify=true Modified: trunk/mouse/src/mouse.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mouse/src/mouse.ycp?rev=58227&r1=58226&r2=58227&view=diff ============================================================================== --- trunk/mouse/src/mouse.ycp (original) +++ trunk/mouse/src/mouse.ycp Thu Jul 30 21:37:23 2009 @@ -79,13 +79,15 @@ map display_info = (map) UI::GetDisplayInfo (); if (!display_info["TextMode"]:true) { - if (Confirm::MustBeRoot ()) - { - // call sax - SCR::Execute (.target.bash, "/usr/sbin/sax2 -O Mouse"); - return `finish; - } - return `cancel; + // disable mouse module in non-Textmode (bnc#441404) + y2milestone("YaST2 gpm (formerly known as 'mouse') was started in GUI mode. It is intended to configure the mouse for the console only. Mouse configuration for X is configured automatically by the X-Server."); + //if (Confirm::MustBeRoot ()) + //{ + // // call sax + // SCR::Execute (.target.bash, "/usr/sbin/sax2 -O Mouse"); + // return `finish; + //} + //return `cancel; } MouseRead (); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org