summaryrefslogtreecommitdiff
path: root/noncore/settings/networksettings2/network/networkedit.cpp
Unidiff
Diffstat (limited to 'noncore/settings/networksettings2/network/networkedit.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings2/network/networkedit.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/noncore/settings/networksettings2/network/networkedit.cpp b/noncore/settings/networksettings2/network/networkedit.cpp
index b17d745..182213b 100644
--- a/noncore/settings/networksettings2/network/networkedit.cpp
+++ b/noncore/settings/networksettings2/network/networkedit.cpp
@@ -43,31 +43,31 @@ QString NetworkEdit::acceptable( void ) {
43 if( Broadcast_LE->text().isEmpty() ) 43 if( Broadcast_LE->text().isEmpty() )
44 return tr("Broadcast needed"); 44 return tr("Broadcast needed");
45 if( SubnetMask_LE->text().isEmpty() ) 45 if( SubnetMask_LE->text().isEmpty() )
46 return tr("Subnet mask needed"); 46 return tr("Subnet mask needed");
47 47
48 // valid IP ? 48 // valid IP ?
49 if( ! validIP( IPAddress_LE->text() ) ) 49 if( ! validIP( IPAddress_LE->text() ) )
50 return tr("IPAddress not valid"); 50 return tr("IPAddress not valid");
51 if( ! validIP( SubnetMask_LE->text() ) ) 51 if( ! validIP( SubnetMask_LE->text() ) )
52 return tr("Subnet mask not valid"); 52 return tr("Subnet mask not valid");
53 if( ! validIP( Broadcast_LE->text() ) ) 53 if( ! validIP( Broadcast_LE->text() ) )
54 return tr("Broadcast address not valid"); 54 return tr("Broadcast address not valid");
55 if( Gateway_LE->text().isEmpty() && 55 if( Gateway_LE->text().isEmpty() ||
56 ! validIP( Gateway_LE->text() ) ) 56 ! validIP( Gateway_LE->text() ) )
57 return tr("Gateway address not valid"); 57 return tr("Gateway address not valid");
58 if( DNS1_LE->text().isEmpty() && 58 if( ! DNS1_LE->text().isEmpty() &&
59 ! validIP( DNS1_LE->text() ) ) 59 ! validIP( DNS1_LE->text() ) )
60 return tr("DNS1 address not valid"); 60 return tr("DNS1 address not valid");
61 if( DNS2_LE->text().isEmpty() && 61 if( ! DNS2_LE->text().isEmpty() &&
62 ! validIP( DNS2_LE->text() ) ) 62 ! validIP( DNS2_LE->text() ) )
63 return tr("DNS2 address not valid"); 63 return tr("DNS2 address not valid");
64 return QString(); 64 return QString();
65} 65}
66 66
67bool NetworkEdit::commit( NetworkData_t & Data ) { 67bool NetworkEdit::commit( NetworkData_t & Data ) {
68 bool SM = 0; 68 bool SM = 0;
69 CBM( Data.UseDHCP, DHCP_CB, SM ); 69 CBM( Data.UseDHCP, DHCP_CB, SM );
70 TXTM( Data.IPAddress, IPAddress_LE, SM ); 70 TXTM( Data.IPAddress, IPAddress_LE, SM );
71 CBM( Data.SendHostname, SendHostname_CB, SM ); 71 CBM( Data.SendHostname, SendHostname_CB, SM );
72 TXTM( Data.Hostname, Hostname_LE, SM ); 72 TXTM( Data.Hostname, Hostname_LE, SM );
73 TXTM( Data.Gateway, Gateway_LE, SM ); 73 TXTM( Data.Gateway, Gateway_LE, SM );