Author: kmachalkova Date: Fri Oct 31 10:50:45 2008 New Revision: 52777 URL: http://svn.opensuse.org/viewcvs/yast?rev=52777&view=rev Log: Removed workaround for KDE4/metacity (#427044) Modified: trunk/network/src/modules/Remote.ycp Modified: trunk/network/src/modules/Remote.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Remote.ycp?rev=52777&r1=52776&r2=52777&view=diff ============================================================================== --- trunk/network/src/modules/Remote.ycp (original) +++ trunk/network/src/modules/Remote.ycp Fri Oct 31 10:50:45 2008 @@ -142,22 +142,9 @@ list<string> packages = ["xinetd", "tightvnc", "xorg-x11", "xorg-x11-Xvnc", ]; //At least one windowmanager must be installed (#427044) - //Not all windowmanagers have 'windowmanager' string in their Provides: - //(fvwm2, icewm, kdebase3, windowmaker & xfwm4 do, the rest is listed here) + //If none is, there, use fvwm2 as fallback //Package::Installed uses rpm -q --whatprovides - list <string> window_mgrs = ["windowmanager", "kdebase4", "metacity" ]; - boolean is_win_mgr_installed = false; - - foreach( string w, window_mgrs, { - if( Package::Installed( w )) - { - is_win_mgr_installed = true; - break; - } - }); - - //If no windowmanager is there, use fvwm2 as fallback - if ( !is_win_mgr_installed ) + if ( !Package::Installed("windowmanager") ) { packages = add (packages, "fvwm2" ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org