From 02a3d2aaef1e3a65ff4f82b7bfb7776de11f22e9 Mon Sep 17 00:00:00 2001 From: gixxpunk Date: Sun, 13 Nov 2011 15:42:29 +0000 Subject: [PATCH] allow to change hostname in both cases (dhcp and static ip) git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1844 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a5181e49dfc0baadc0b9b68705084b37c8b138a1 Author: gixxpunk Date: 2011-11-13 (Sun, 13 Nov 2011) Origin message was: ------------------ - allow to change hostname in both cases (dhcp and static ip) git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1844 e54a6e83-5905-42d5-8d5c-058d10e6a962 ------------------ This commit was generated by Migit --- src/gui/network_setup.cpp | 3 +-- src/gui/network_setup.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index ef89b23ee..0a467931e 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -236,14 +236,13 @@ void CNetworkSetup::showNetworkSetup() CMenuForwarder *m3 = new CMenuForwarder(LOCALE_NETWORKMENU_BROADCAST , networkConfig->inet_static, network_broadcast , networkSettings_Broadcast ); CMenuForwarder *m4 = new CMenuForwarder(LOCALE_NETWORKMENU_GATEWAY , networkConfig->inet_static, network_gateway , networkSettings_Gateway ); CMenuForwarder *m5 = new CMenuForwarder(LOCALE_NETWORKMENU_NAMESERVER, networkConfig->inet_static, network_nameserver, networkSettings_NameServer); - CMenuForwarder *m8 = new CMenuForwarder(LOCALE_NETWORKMENU_HOSTNAME , networkConfig->inet_static, network_hostname , networkSettings_Hostname ); + CMenuForwarder *m8 = new CMenuForwarder(LOCALE_NETWORKMENU_HOSTNAME , true , network_hostname , networkSettings_Hostname ); dhcpDisable[0] = m1; dhcpDisable[1] = m2; dhcpDisable[2] = m3; dhcpDisable[3] = m4; dhcpDisable[4] = m5; - dhcpDisable[5] = m8; CMenuOptionChooser* o2 = new CMenuOptionChooser(LOCALE_NETWORKMENU_DHCP, &network_dhcp, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this); diff --git a/src/gui/network_setup.h b/src/gui/network_setup.h index d20761621..299900b33 100644 --- a/src/gui/network_setup.h +++ b/src/gui/network_setup.h @@ -75,7 +75,7 @@ class CNetworkSetup : public CMenuTarget, CChangeObserver std::string old_mac_addr; - CMenuForwarder* dhcpDisable[6]; + CMenuForwarder* dhcpDisable[5]; CMenuForwarder* wlanEnable[2]; void restoreNetworkSettings();