Fix segfault

12 files changed, 26 insertions, 26 deletions

diff --git a/noncore/net/networksetup/TODO b/noncore/net/networksetup/TODO
index 7a71142..d61c510 100644
--- a/noncore/net/networksetup/TODO
+++ b/noncore/net/networksetup/TODO
@@ -1,5 +1,3 @@
 WLAN needs to be re-written to not use Config
--remove WLAN Config item
--sub class out the wlan info
--check if an interface supports wireless extensions before config.
+WHERE Is DHCP info stored???
 
@@ -9,3 +7,3 @@ Write a class that parses /proc and not ifconfig
 
-Possible other modules: ipsec, bluetooth
+Possible other modules: ipsec, bluetooth, ipchains
 
diff --git a/noncore/net/networksetup/interface.cpp b/noncore/net/networksetup/interface.cpp
index a84b91f..929b3a1 100644
--- a/noncore/net/networksetup/interface.cpp
+++ b/noncore/net/networksetup/interface.cpp
@@ -8,3 +8,3 @@
 #define IFCONFIG "/sbin/ifconfig"
-#define HDCP_INFO_DIR "/etc/dhcpc"
+#define DHCP_INFO_DIR "/etc/dhcpc"
 
@@ -173,3 +173,3 @@ bool Interface::refresh(){
    
-  QString dhcpDirectory(HDCP_INFO_DIR);
+  QString dhcpDirectory(DHCP_INFO_DIR);
   QDir d(dhcpDirectory);
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index 9d81ab1..c86acdc 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -80,2 +80,3 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
 MainWindowImp::~MainWindowImp(){

+  qDebug("start Saving mainwindow");

   // Save profiles.

@@ -98,2 +99,3 @@ MainWindowImp::~MainWindowImp(){
   }

+  qDebug("done Saving mainwindow");

 }

diff --git a/noncore/net/networksetup/wlan/wextensions.cpp b/noncore/net/networksetup/wlan/wextensions.cpp
index ef4ba8f..e545bd1 100644
--- a/noncore/net/networksetup/wlan/wextensions.cpp
+++ b/noncore/net/networksetup/wlan/wextensions.cpp
@@ -159,3 +159,3 @@ bool WExtensions::stats(int &signal, int &noise, int &quality){
         qDebug( "WIFIAPPLET: Doh! Noise %d > estimated max!\n", noise );
-      qDebug(QString("q:%1, s:%2, n:%3").arg(quality).arg(signal).arg(noise).latin1());
+      //qDebug(QString("q:%1, s:%2, n:%3").arg(quality).arg(signal).arg(noise).latin1());
       signal = ( ( signal-IW_LOWER ) * 100 ) / IW_UPPER;
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index ea19207..94c7518 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -18,3 +18,3 @@
 
-WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name){
+WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name, Qt::WDestructiveClose){
   config = new Config("wireless");
diff --git a/noncore/net/networksetup/wlan/wlanmodule.cpp b/noncore/net/networksetup/wlan/wlanmodule.cpp
index 73e753c..7507c54 100644
--- a/noncore/net/networksetup/wlan/wlanmodule.cpp
+++ b/noncore/net/networksetup/wlan/wlanmodule.cpp
@@ -12,3 +12,2 @@
 WLANModule::WLANModule() : Module() {
-  // get output from iwconfig
 }
@@ -49,3 +48,2 @@ bool WLANModule::isOwner(Interface *i){
   
-  //if(i->getInterfaceName() == "eth0" || i->getInterfaceName() == "wlan0"){
     i->setHardwareName("802.11b");
@@ -53,4 +51,2 @@ bool WLANModule::isOwner(Interface *i){
     return true;
-  //}
-  //return false;
 }
@@ -78,3 +74,3 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){
   
-  WlanInfo *info = new WlanInfo(0, "wireless info");
+  WlanInfo *info = new WlanInfo(0, "wireless info", Qt::WDestructiveClose);
   (*tabWidget) = info->tabWidget;
@@ -94,2 +90,6 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){
   info->rateLabel->setText(QString("%1 Mb/s").arg(we.rate()));
+  //WlanInfo info (0, "wireless info", true);
+  //info.show();
+  //return NULL;
+  
   return info;
diff --git a/noncore/settings/networksettings/TODO b/noncore/settings/networksettings/TODO
index 7a71142..d61c510 100644
--- a/noncore/settings/networksettings/TODO
+++ b/noncore/settings/networksettings/TODO
@@ -1,5 +1,3 @@
 WLAN needs to be re-written to not use Config
--remove WLAN Config item
--sub class out the wlan info
--check if an interface supports wireless extensions before config.
+WHERE Is DHCP info stored???
 
@@ -9,3 +7,3 @@ Write a class that parses /proc and not ifconfig
 
-Possible other modules: ipsec, bluetooth
+Possible other modules: ipsec, bluetooth, ipchains
 
diff --git a/noncore/settings/networksettings/interface.cpp b/noncore/settings/networksettings/interface.cpp
index a84b91f..929b3a1 100644
--- a/noncore/settings/networksettings/interface.cpp
+++ b/noncore/settings/networksettings/interface.cpp
@@ -8,3 +8,3 @@
 #define IFCONFIG "/sbin/ifconfig"
-#define HDCP_INFO_DIR "/etc/dhcpc"
+#define DHCP_INFO_DIR "/etc/dhcpc"
 
@@ -173,3 +173,3 @@ bool Interface::refresh(){
    
-  QString dhcpDirectory(HDCP_INFO_DIR);
+  QString dhcpDirectory(DHCP_INFO_DIR);
   QDir d(dhcpDirectory);
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 9d81ab1..c86acdc 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -80,2 +80,3 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
 MainWindowImp::~MainWindowImp(){

+  qDebug("start Saving mainwindow");

   // Save profiles.

@@ -98,2 +99,3 @@ MainWindowImp::~MainWindowImp(){
   }

+  qDebug("done Saving mainwindow");

 }

diff --git a/noncore/settings/networksettings/wlan/wextensions.cpp b/noncore/settings/networksettings/wlan/wextensions.cpp
index ef4ba8f..e545bd1 100644
--- a/noncore/settings/networksettings/wlan/wextensions.cpp
+++ b/noncore/settings/networksettings/wlan/wextensions.cpp
@@ -159,3 +159,3 @@ bool WExtensions::stats(int &signal, int &noise, int &quality){
         qDebug( "WIFIAPPLET: Doh! Noise %d > estimated max!\n", noise );
-      qDebug(QString("q:%1, s:%2, n:%3").arg(quality).arg(signal).arg(noise).latin1());
+      //qDebug(QString("q:%1, s:%2, n:%3").arg(quality).arg(signal).arg(noise).latin1());
       signal = ( ( signal-IW_LOWER ) * 100 ) / IW_UPPER;
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index ea19207..94c7518 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -18,3 +18,3 @@
 
-WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name){
+WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name, Qt::WDestructiveClose){
   config = new Config("wireless");
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index 73e753c..7507c54 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -12,3 +12,2 @@
 WLANModule::WLANModule() : Module() {
-  // get output from iwconfig
 }
@@ -49,3 +48,2 @@ bool WLANModule::isOwner(Interface *i){
   
-  //if(i->getInterfaceName() == "eth0" || i->getInterfaceName() == "wlan0"){
     i->setHardwareName("802.11b");
@@ -53,4 +51,2 @@ bool WLANModule::isOwner(Interface *i){
     return true;
-  //}
-  //return false;
 }
@@ -78,3 +74,3 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){
   
-  WlanInfo *info = new WlanInfo(0, "wireless info");
+  WlanInfo *info = new WlanInfo(0, "wireless info", Qt::WDestructiveClose);
   (*tabWidget) = info->tabWidget;
@@ -94,2 +90,6 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){
   info->rateLabel->setText(QString("%1 Mb/s").arg(we.rate()));
+  //WlanInfo info (0, "wireless info", true);
+  //info.show();
+  //return NULL;
+  
   return info;