author | benmeyer <benmeyer> | 2002-10-17 16:44:30 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-10-17 16:44:30 (UTC) |
commit | 8511273d7122d50ffea27f78ba13ab72af60326d (patch) (unidiff) | |
tree | ab7fae876ce1af5665a882b1a53b5f3e240cf4ab | |
parent | 18cc7321db186865629a5c4702074211e42b92fd (diff) | |
download | opie-8511273d7122d50ffea27f78ba13ab72af60326d.zip opie-8511273d7122d50ffea27f78ba13ab72af60326d.tar.gz opie-8511273d7122d50ffea27f78ba13ab72af60326d.tar.bz2 |
fix interface name bug
-rw-r--r-- | noncore/net/networksetup/interface.cpp | 16 | ||||
-rw-r--r-- | noncore/net/networksetup/interface.h | 4 | ||||
-rw-r--r-- | noncore/net/networksetup/mainwindowimp.cpp | 3 | ||||
-rw-r--r-- | noncore/settings/networksettings/interface.cpp | 16 | ||||
-rw-r--r-- | noncore/settings/networksettings/interface.h | 4 | ||||
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 3 |
6 files changed, 22 insertions, 24 deletions
diff --git a/noncore/net/networksetup/interface.cpp b/noncore/net/networksetup/interface.cpp index 1e01da4..a84b91f 100644 --- a/noncore/net/networksetup/interface.cpp +++ b/noncore/net/networksetup/interface.cpp | |||
@@ -13,3 +13,3 @@ | |||
13 | 13 | ||
14 | Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){ | 14 | Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardwareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){ |
15 | refresh(); | 15 | refresh(); |
@@ -45,3 +45,3 @@ void Interface::setAttached(bool isAttached){ | |||
45 | void Interface::setHardwareName(QString name){ | 45 | void Interface::setHardwareName(QString name){ |
46 | hardareName = name; | 46 | hardwareName = name; |
47 | emit(updateInterface(this)); | 47 | emit(updateInterface(this)); |
@@ -68,3 +68,3 @@ void Interface::start(){ | |||
68 | 68 | ||
69 | int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(interfaceName).latin1()); | 69 | int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(this->name()).latin1()); |
70 | // See if it was successfull... | 70 | // See if it was successfull... |
@@ -85,3 +85,3 @@ void Interface::stop(){ | |||
85 | 85 | ||
86 | int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(interfaceName).latin1()); | 86 | int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(this->name()).latin1()); |
87 | if(ret != 0) | 87 | if(ret != 0) |
@@ -121,4 +121,4 @@ bool Interface::refresh(){ | |||
121 | 121 | ||
122 | QString fileName = QString("/tmp/%1_ifconfig_info").arg(interfaceName); | 122 | QString fileName = QString("/tmp/%1_ifconfig_info").arg(this->name()); |
123 | int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(interfaceName).arg(fileName).latin1()); | 123 | int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(this->name()).arg(fileName).latin1()); |
124 | if(ret != 0){ | 124 | if(ret != 0){ |
@@ -179,3 +179,3 @@ bool Interface::refresh(){ | |||
179 | // See if we have | 179 | // See if we have |
180 | QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(interfaceName)); | 180 | QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(this->name())); |
181 | // If there is no DHCP information then exit now with no errors. | 181 | // If there is no DHCP information then exit now with no errors. |
@@ -211,3 +211,3 @@ bool Interface::refresh(){ | |||
211 | // Get the pid of the deamond | 211 | // Get the pid of the deamond |
212 | dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(interfaceName)); | 212 | dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(this->name())); |
213 | file.setName(dhcpFile); | 213 | file.setName(dhcpFile); |
diff --git a/noncore/net/networksetup/interface.h b/noncore/net/networksetup/interface.h index 980171a..7943fd6 100644 --- a/noncore/net/networksetup/interface.h +++ b/noncore/net/networksetup/interface.h | |||
@@ -26,3 +26,3 @@ public: | |||
26 | 26 | ||
27 | virtual QString getHardwareName(){ return hardareName; }; | 27 | virtual QString getHardwareName(){ return hardwareName; }; |
28 | virtual void setHardwareName(QString name="Unknown"); | 28 | virtual void setHardwareName(QString name="Unknown"); |
@@ -53,3 +53,3 @@ private: | |||
53 | QString interfaceName; | 53 | QString interfaceName; |
54 | QString hardareName; | 54 | QString hardwareName; |
55 | Module *moduleOwner; | 55 | Module *moduleOwner; |
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp index 117bac1..a446d29 100644 --- a/noncore/net/networksetup/mainwindowimp.cpp +++ b/noncore/net/networksetup/mainwindowimp.cpp | |||
@@ -330,5 +330,4 @@ void MainWindowImp::jobDone(KProcess *process){ | |||
330 | else{ | 330 | else{ |
331 | i = interfaceNames[interfaceName]; | ||
332 | if(fileName != TEMP_ALL) | 331 | if(fileName != TEMP_ALL) |
333 | i->setStatus(true); | 332 | (interfaceNames[interfaceName])->setStatus(true); |
334 | } | 333 | } |
diff --git a/noncore/settings/networksettings/interface.cpp b/noncore/settings/networksettings/interface.cpp index 1e01da4..a84b91f 100644 --- a/noncore/settings/networksettings/interface.cpp +++ b/noncore/settings/networksettings/interface.cpp | |||
@@ -13,3 +13,3 @@ | |||
13 | 13 | ||
14 | Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){ | 14 | Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardwareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){ |
15 | refresh(); | 15 | refresh(); |
@@ -45,3 +45,3 @@ void Interface::setAttached(bool isAttached){ | |||
45 | void Interface::setHardwareName(QString name){ | 45 | void Interface::setHardwareName(QString name){ |
46 | hardareName = name; | 46 | hardwareName = name; |
47 | emit(updateInterface(this)); | 47 | emit(updateInterface(this)); |
@@ -68,3 +68,3 @@ void Interface::start(){ | |||
68 | 68 | ||
69 | int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(interfaceName).latin1()); | 69 | int ret = system(QString("%1 %2 up").arg(IFCONFIG).arg(this->name()).latin1()); |
70 | // See if it was successfull... | 70 | // See if it was successfull... |
@@ -85,3 +85,3 @@ void Interface::stop(){ | |||
85 | 85 | ||
86 | int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(interfaceName).latin1()); | 86 | int ret = system(QString("%1 %2 down").arg(IFCONFIG).arg(this->name()).latin1()); |
87 | if(ret != 0) | 87 | if(ret != 0) |
@@ -121,4 +121,4 @@ bool Interface::refresh(){ | |||
121 | 121 | ||
122 | QString fileName = QString("/tmp/%1_ifconfig_info").arg(interfaceName); | 122 | QString fileName = QString("/tmp/%1_ifconfig_info").arg(this->name()); |
123 | int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(interfaceName).arg(fileName).latin1()); | 123 | int ret = system(QString("%1 %2 > %3").arg(IFCONFIG).arg(this->name()).arg(fileName).latin1()); |
124 | if(ret != 0){ | 124 | if(ret != 0){ |
@@ -179,3 +179,3 @@ bool Interface::refresh(){ | |||
179 | // See if we have | 179 | // See if we have |
180 | QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(interfaceName)); | 180 | QString dhcpFile(QString(dhcpDirectory+"/dhcpcd-%1.info").arg(this->name())); |
181 | // If there is no DHCP information then exit now with no errors. | 181 | // If there is no DHCP information then exit now with no errors. |
@@ -211,3 +211,3 @@ bool Interface::refresh(){ | |||
211 | // Get the pid of the deamond | 211 | // Get the pid of the deamond |
212 | dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(interfaceName)); | 212 | dhcpFile = (QString(dhcpDirectory+"/dhcpcd-%1.pid").arg(this->name())); |
213 | file.setName(dhcpFile); | 213 | file.setName(dhcpFile); |
diff --git a/noncore/settings/networksettings/interface.h b/noncore/settings/networksettings/interface.h index 980171a..7943fd6 100644 --- a/noncore/settings/networksettings/interface.h +++ b/noncore/settings/networksettings/interface.h | |||
@@ -26,3 +26,3 @@ public: | |||
26 | 26 | ||
27 | virtual QString getHardwareName(){ return hardareName; }; | 27 | virtual QString getHardwareName(){ return hardwareName; }; |
28 | virtual void setHardwareName(QString name="Unknown"); | 28 | virtual void setHardwareName(QString name="Unknown"); |
@@ -53,3 +53,3 @@ private: | |||
53 | QString interfaceName; | 53 | QString interfaceName; |
54 | QString hardareName; | 54 | QString hardwareName; |
55 | Module *moduleOwner; | 55 | Module *moduleOwner; |
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index 117bac1..a446d29 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp | |||
@@ -330,5 +330,4 @@ void MainWindowImp::jobDone(KProcess *process){ | |||
330 | else{ | 330 | else{ |
331 | i = interfaceNames[interfaceName]; | ||
332 | if(fileName != TEMP_ALL) | 331 | if(fileName != TEMP_ALL) |
333 | i->setStatus(true); | 332 | (interfaceNames[interfaceName])->setStatus(true); |
334 | } | 333 | } |