Fix segfault

3 files changed, 12 insertions, 12 deletions

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
@@ -157,7 +157,7 @@ bool WExtensions::stats(int &signal, int &noise, int &quality){
         qDebug( "WIFIAPPLET: Doh! Strength %d > estimated max!\n", signal );
       if ( ( noise > IW_UPPER ) || ( noise < IW_LOWER ) )
         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;
       noise = ( ( noise-IW_LOWER ) * 100 ) / IW_UPPER;
       quality = ( quality*100 ) / 92;
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
@@ -16,7 +16,7 @@
 #include <qcheckbox.h>
 #include <qregexp.h>
 
-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");
   readConfig();
 }
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
@@ -10,7 +10,6 @@
  * Constructor, find all of the possible interfaces
  */ 
 WLANModule::WLANModule() : Module() {
-  // get output from iwconfig
 }
 
 /**
@@ -18,7 +17,7 @@ WLANModule::WLANModule() : Module() {
 WLANModule::~WLANModule(){
   Interface *i;
   for ( i=list.first(); i != 0; i=list.next() )
-    delete i;	  
+    delete i;
 }
 
 /**
@@ -47,12 +46,9 @@ bool WLANModule::isOwner(Interface *i){
   if(!we.doesHaveWirelessExtensions())
     return false;
   
-  //if(i->getInterfaceName() == "eth0" || i->getInterfaceName() == "wlan0"){
-    i->setHardwareName("802.11b");
-    list.append(i);
-    return true;
-  //}
-  //return false;
+  i->setHardwareName("802.11b");
+  list.append(i);
+  return true;
 }
 
 /**
@@ -75,8 +71,8 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){
   WExtensions we(i->getInterfaceName());
   if(!we.doesHaveWirelessExtensions())
     return NULL;
-  
-  WlanInfo *info = new WlanInfo(0, "wireless info");
+ 
+  WlanInfo *info = new WlanInfo(0, "wireless info", Qt::WDestructiveClose);
   (*tabWidget) = info->tabWidget;
   
   info->essidLabel->setText(we.essid());
@@ -92,6 +88,10 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){
   info->noiseProgressBar->setProgress(noise);
   info->qualityProgressBar->setProgress(quality);
   info->rateLabel->setText(QString("%1 Mb/s").arg(we.rate()));
+  //WlanInfo info (0, "wireless info", true);
+  //info.show();
+  //return NULL;
+  
   return info;
 }