Author: mzugec Date: Wed Oct 10 18:20:08 2007 New Revision: 41342 URL: http://svn.opensuse.org/viewcvs/yast?rev=41342&view=rev Log: fixed displayed name for network device (#330994) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/LanItems.ycp trunk/network/src/routines/routines.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=41342&r1=41341&r2=41342&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Oct 10 18:20:08 2007 @@ -1 +1 @@ -2.16.2 +2.16.3 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=41342&r1=41341&r2=41342&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Oct 10 18:20:08 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 10 18:19:37 CEST 2007 - mzugec@suse.cz + +- fixed displayed name for network device (#330994) +- 2.16.3 + +------------------------------------------------------------------- Wed Oct 10 10:39:47 CEST 2007 - kmachalkova@suse.cz - Escape backslashes in usernames also in .curlrc (#331038) Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp?rev=41342&r1=41341&r2=41342&view=diff ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Wed Oct 10 18:20:08 2007 @@ -325,7 +325,7 @@ foreach(integer key, (list<integer>)Map::Keys(Items), { string rich = ""; string ip = _("Not configured"); - string descr = HardwareName (Hardware, Items[key, "hwinfo", "dev_name"]:""); + string descr = Items[key, "hwinfo", "name"]:""; type = Items[key, "hwinfo", "type"]:""; descr = CheckEmptyName (type, descr); list <string> bullets = []; Modified: trunk/network/src/routines/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/routines.ycp?rev=41342&r1=41341&r2=41342&view=diff ============================================================================== --- trunk/network/src/routines/routines.ycp (original) +++ trunk/network/src/routines/routines.ycp Wed Oct 10 18:20:08 2007 @@ -428,6 +428,8 @@ string vendor = ""; string dev = ""; + if (hasAnyValue(hwdevice["device"]:"")) return hwdevice["device"]:""; + model = hwdevice["model"]:""; if(model != "" && model != nil) return model; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org