Author: kmachalkova Date: Fri Nov 21 14:24:58 2008 New Revision: 53512 URL: http://svn.opensuse.org/viewcvs/yast?rev=53512&view=rev Log: Removed workaround for installing the right NM frontend - this is handled by NM itself now (#445643) Modified: trunk/network/src/modules/Lan.ycp trunk/network/src/routines/routines.ycp Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=53512&r1=53511&r2=53512&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Fri Nov 21 14:24:58 2008 @@ -516,7 +516,7 @@ } if (!network) Popup::Error(_("No network running")); } - if(!CheckNetworkManagerPlugin()) return false; + /* Final progress step */ ProgressNextStage(_("Finished")); sleep(sl); Modified: trunk/network/src/routines/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/routines.ycp?rev=53512&r1=53511&r2=53512&view=diff ============================================================================== --- trunk/network/src/routines/routines.ycp (original) +++ trunk/network/src/routines/routines.ycp Fri Nov 21 14:24:58 2008 @@ -21,7 +21,6 @@ import "Arch"; import "Confirm"; import "Map"; -import "DefaultDesktop"; import "Netmask"; import "Mode"; @@ -378,20 +377,6 @@ return hardware; } -boolean CheckNetworkManagerPlugin(){ - if (NetworkService::IsManaged()){ - list<string> nmp = []; - y2milestone("Check what packages are needed to configure NetworkManager"); -// string nmp = ((string)SCR::Read(.sysconfig.windowmanager.DEFAULT_WM)=="kde")?"NetworkManager-kde":"NetworkManager-gnome"; - list<string> desktops = DefaultDesktop::SelectedDesktops(); - if (contains(desktops, "kde3")) nmp = add(nmp, "NetworkManager-kde"); - if (contains(desktops, "gnome")) nmp = add(nmp, "NetworkManager-gnome"); - y2milestone("Test for %1 if installed", nmp); - PackageSystem::CheckAndInstallPackages(nmp); - } - return true; -} - string getIfcName(string devicename){ string ifcfg=""; string interfacetype = NetworkInterfaces::device_type( devicename ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org