Diffstat (limited to 'noncore/settings/networksettings2/network') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/network/network_NN.h | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings2/network/networkrun.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/noncore/settings/networksettings2/network/network_NN.h b/noncore/settings/networksettings2/network/network_NN.h index 3b0cd64..220e00f 100644 --- a/noncore/settings/networksettings2/network/network_NN.h +++ b/noncore/settings/networksettings2/network/network_NN.h | |||
@@ -6,25 +6,25 @@ | |||
6 | class ANetwork; | 6 | class ANetwork; |
7 | 7 | ||
8 | class NetworkNetNode : public ANetNode{ | 8 | class NetworkNetNode : public ANetNode{ |
9 | 9 | ||
10 | Q_OBJECT | 10 | Q_OBJECT |
11 | 11 | ||
12 | public: | 12 | public: |
13 | 13 | ||
14 | NetworkNetNode(); | 14 | NetworkNetNode(); |
15 | virtual ~NetworkNetNode(); | 15 | virtual ~NetworkNetNode(); |
16 | 16 | ||
17 | virtual const QString pixmapName() | 17 | virtual const QString pixmapName() |
18 | { return "tcpip"; } | 18 | { return "Devices/tcpip"; } |
19 | 19 | ||
20 | virtual const QString nodeName() | 20 | virtual const QString nodeName() |
21 | { return tr("IP Configuration"); } | 21 | { return tr("IP Configuration"); } |
22 | 22 | ||
23 | virtual const QString nodeDescription() ; | 23 | virtual const QString nodeDescription() ; |
24 | 24 | ||
25 | virtual ANetNodeInstance * createInstance( void ); | 25 | virtual ANetNodeInstance * createInstance( void ); |
26 | 26 | ||
27 | virtual const char ** needs( void ); | 27 | virtual const char ** needs( void ); |
28 | virtual const char * provides( void ); | 28 | virtual const char * provides( void ); |
29 | 29 | ||
30 | virtual bool generateProperFilesFor( ANetNodeInstance * NNI ); | 30 | virtual bool generateProperFilesFor( ANetNodeInstance * NNI ); |
diff --git a/noncore/settings/networksettings2/network/networkrun.cpp b/noncore/settings/networksettings2/network/networkrun.cpp index e732bfa..8deca14 100644 --- a/noncore/settings/networksettings2/network/networkrun.cpp +++ b/noncore/settings/networksettings2/network/networkrun.cpp | |||
@@ -17,25 +17,25 @@ void NetworkRun::detectState( NodeCollection * NC ) { | |||
17 | } | 17 | } |
18 | 18 | ||
19 | bool NetworkRun::setState( NodeCollection * NC, Action_t A ) { | 19 | bool NetworkRun::setState( NodeCollection * NC, Action_t A ) { |
20 | // we handle UP and DOWN | 20 | // we handle UP and DOWN |
21 | RuntimeInfo * RI = netNode()->nextNode()->runtime(); | 21 | RuntimeInfo * RI = netNode()->nextNode()->runtime(); |
22 | AsDevice * Next = RI->asDevice(); | 22 | AsDevice * Next = RI->asDevice(); |
23 | InterfaceInfo * II = Next->assignedInterface(); | 23 | InterfaceInfo * II = Next->assignedInterface(); |
24 | 24 | ||
25 | if( A == Up ) { | 25 | if( A == Up ) { |
26 | // we can bring UP if lower level is available | 26 | // we can bring UP if lower level is available |
27 | if( NC->currentState() == Available ) { | 27 | if( NC->currentState() == Available ) { |
28 | QString S; | 28 | QString S; |
29 | S.sprintf( "ifup %s=manual", II->Name.latin1() ); | 29 | S.sprintf( "ifup %s", II->Name.latin1() ); |
30 | NSResources->system().execute( S ); | 30 | NSResources->system().execute( S ); |
31 | NC->setCurrentState( IsUp ); | 31 | NC->setCurrentState( IsUp ); |
32 | } | 32 | } |
33 | return 1; | 33 | return 1; |
34 | } else if( A == Down ) { | 34 | } else if( A == Down ) { |
35 | if( NC->currentState() == IsUp ) { | 35 | if( NC->currentState() == IsUp ) { |
36 | QString S; | 36 | QString S; |
37 | S.sprintf( "ifdown %s", II->Name.latin1() ); | 37 | S.sprintf( "ifdown %s", II->Name.latin1() ); |
38 | NSResources->system().execute( S ); | 38 | NSResources->system().execute( S ); |
39 | NC->setCurrentState( Available ); | 39 | NC->setCurrentState( Available ); |
40 | } | 40 | } |
41 | return 1; | 41 | return 1; |