1 files changed, 40 insertions, 34 deletions

diff --git a/noncore/applets/wirelessapplet/wireless.cpp b/noncore/applets/wirelessapplet/wireless.cpp
index 72ac380..cee789c 100644
--- a/noncore/applets/wirelessapplet/wireless.cpp
+++ b/noncore/applets/wirelessapplet/wireless.cpp
@@ -52,4 +52,4 @@
 
-#define MDEBUG
-//#undef MDEBUG
+//#define MDEBUG
+#undef MDEBUG
 
@@ -221,2 +221,3 @@ void WirelessApplet::checkInterface()
     ONetwork* net = ONetwork::instance();
+    net->synchronize();
     ONetwork::InterfaceIterator it = net->iterator();
@@ -326,10 +327,22 @@ void WirelessApplet::timerEvent( QTimerEvent* )
 {
+#ifdef MDEBUG
     qDebug( "WirelessApplet::timerEvent" );
-    OWirelessNetworkInterface* iface = interface;
-
-    if ( iface )
+#endif
+    if ( interface )
     {
+        if ( !ONetwork::instance()->isPresent( (const char*) interface->name() ) )
+        {
+#ifdef MDEBUG
+            qDebug( "WIFIAPPLET: Interface no longer present." );
+#endif
+            interface = 0L;
+            mustRepaint();
+            return;
+        }
+
         if ( mustRepaint() )
         {
+#ifdef MDEBUG
             qDebug( "WIFIAPPLET: A value has changed -> repainting." );
+#endif
             repaint();
@@ -358,4 +371,2 @@ bool WirelessApplet::mustRepaint()
 {
-    OWirelessNetworkInterface* iface = interface;
-
     // check if there are enough changes to justify a (flickering) repaint
@@ -364,6 +375,6 @@ bool WirelessApplet::mustRepaint()
 
-    if ( iface != oldiface )
+    if ( interface != oldiface )
     {
-        oldiface = iface;
-        if ( iface )
+        oldiface = interface;
+        if ( interface )
         {
@@ -393,3 +404,3 @@ bool WirelessApplet::mustRepaint()
     int noiseH = 50; // iface->noisePercent() * ( height() - 3 ) / 100;
-    int signalH = iface->signalStrength() * ( height() - 3 ) / 100;
+    int signalH = interface->signalStrength() * ( height() - 3 ) / 100;
     int qualityH = 50; // iface->qualityPercent() * ( height() - 3 ) / 100;
@@ -406,3 +417,3 @@ bool WirelessApplet::mustRepaint()
 
-    if ( rocESSID && ( oldESSID != iface->SSID() ) )
+    if ( rocESSID && ( oldESSID != interface->SSID() ) )
     {
@@ -413,3 +424,3 @@ bool WirelessApplet::mustRepaint()
     }
-    else if ( rocFREQ && ( oldFREQ != iface->frequency() ) )
+    else if ( rocFREQ && ( oldFREQ != interface->frequency() ) )
     {
@@ -420,3 +431,3 @@ bool WirelessApplet::mustRepaint()
     }
-    else if ( rocAP && ( oldAP != iface->associatedAP().toString() ) )
+    else if ( rocAP && ( oldAP != interface->associatedAP().toString() ) )
     {
@@ -427,3 +438,3 @@ bool WirelessApplet::mustRepaint()
     }
-    else if ( rocMODE && ( oldMODE != iface->mode() ) )
+    else if ( rocMODE && ( oldMODE != interface->mode() ) )
     {
@@ -435,6 +446,6 @@ bool WirelessApplet::mustRepaint()
 
-    oldESSID = iface->SSID();
-    oldMODE = iface->mode();
-    oldFREQ = iface->frequency();
-    oldAP = iface->associatedAP().toString();
+    oldESSID = interface->SSID();
+    oldMODE = interface->mode();
+    oldFREQ = interface->frequency();
+    oldAP = interface->associatedAP().toString();
 
@@ -445,4 +456,3 @@ void WirelessApplet::updatePopupWindow()
 {
-    OWirelessNetworkInterface* iface = interface;
-    int qualityH = iface->signalStrength();
+    int qualityH = interface->signalStrength();
 
@@ -452,9 +462,9 @@ void WirelessApplet::updatePopupWindow()
     QString freqString;
-    QString cell = ( iface->mode() == "Managed" ) ? "AP: " : "Cell: ";
-    freqString.sprintf( "%.3f GHz", iface->frequency() );
-    status->statusLabel->setText( "Station: " + iface->nickName() + "<br>" +
-                                  "ESSID: " + iface->SSID() + "<br>" +
-                                  "MODE: " + iface->mode() + "<br>" +
+    QString cell = ( interface->mode() == "Managed" ) ? "AP: " : "Cell: ";
+    freqString.sprintf( "%.3f GHz", interface->frequency() );
+    status->statusLabel->setText( "Station: " + interface->nickName() + "<br>" +
+                                  "ESSID: " + interface->SSID() + "<br>" +
+                                  "MODE: " + interface->mode() + "<br>" +
                                   "FREQ: " + freqString + "<br>" +
-                                  cell + " " + iface->associatedAP().toString() );
+                                  cell + " " + interface->associatedAP().toString() );
 }
@@ -463,6 +473,4 @@ const char** WirelessApplet::getQualityPixmap()
 {
-    OWirelessNetworkInterface* iface = interface;
-
-    if ( !iface ) return ( const char** ) nowireless_xpm;
-    int qualityH = iface->signalStrength();
+    if ( !interface ) return ( const char** ) nowireless_xpm;
+    int qualityH = interface->signalStrength();
     if ( qualityH < 0 ) return ( const char** ) nowireless_xpm;
@@ -484,4 +492,2 @@ void WirelessApplet::paintEvent( QPaintEvent* )
 {
-    OWirelessNetworkInterface* iface = interface;
-
     QPainter p( this );
@@ -498,3 +504,3 @@ void WirelessApplet::paintEvent( QPaintEvent* )
         int signalH = 50; // iface->signalPercent() * ( height() - 3 ) / 100;
-        int qualityH = iface->signalStrength(); // iface->qualityPercent() * ( height() - 3 ) / 100;
+        int qualityH = interface->signalStrength(); // iface->qualityPercent() * ( height() - 3 ) / 100;