Learned a lesson about the C preprocessor *ugh*.

2 files changed, 6 insertions, 5 deletions

diff --git a/noncore/applets/wirelessapplet/networkinfo.cpp b/noncore/applets/wirelessapplet/networkinfo.cpp
index 8531fd5..2274d99 100644
--- a/noncore/applets/wirelessapplet/networkinfo.cpp
+++ b/noncore/applets/wirelessapplet/networkinfo.cpp
@@ -30,49 +30,50 @@
 #include <linux/wireless.h>
 
 #include <unistd.h>
 #include <math.h>
 #include <errno.h>
 #include <string.h>
 
 #include <stdlib.h>
 
 #include <qstring.h>
 #include <qfile.h>
 #include <qtextstream.h>
 
 /* estimated wireless signal strength and noise level values
    based on experimentation with Orinoco and Prism2 cards.
    Seem to be correct, but please inform me, if you got values
    outside these boundaries. :Mickey: */
 
 #define IW_UPPER 220
 #define IW_LOWER 140
 
 #define PROCNETDEV "/proc/net/dev"
 #define PROCNETWIRELESS "/proc/net/wireless"
 
-#define MDEBUG 0
+//#define MDEBUG 0
+#undef MDEBUG
 
 //---------------------------------------------------------------------------
 // class MNetworkInterface
 //
 
 MNetworkInterface::MNetworkInterface( const char* name )
                   :name( name )
 {
     struct ifreq ifr;
     struct sockaddr_in *sin = (struct sockaddr_in *) &ifr.ifr_addr;
     fd = socket( AF_INET, SOCK_DGRAM, 0 );
 }
 
 MNetworkInterface::~MNetworkInterface()
 {
     if ( fd != -1 )
         close( fd );
 }
 
 bool MNetworkInterface::updateStatistics()
 {
     return true;
 }
 
diff --git a/noncore/applets/wirelessapplet/wireless.cpp b/noncore/applets/wirelessapplet/wireless.cpp
index a5aabb0..649cf20 100644
--- a/noncore/applets/wirelessapplet/wireless.cpp
+++ b/noncore/applets/wirelessapplet/wireless.cpp
@@ -31,49 +31,50 @@
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qfile.h>
 #include <qtextstream.h>
 
 #include <sys/types.h>
 #include <signal.h>
 
 #include "networkinfo.h"
 #include "mgraph.h"
 
 #include "advancedconfig.h"
 
 #include "connect0.xpm"
 #include "connect1.xpm"
 #include "connect2.xpm"
 #include "connect3.xpm"
 #include "connect4.xpm"
 #include "connect5.xpm"
 #include "nowireless.xpm"
 
 #define STYLE_BARS 0
 #define STYLE_ANTENNA 1
 
-#define MDEBUG 0
+//#define MDEBUG 0
+#undef MDEBUG
 
 WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name )
     : QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), applet( applet )
 {
 
     readConfig();
     writeConfigEntry( "UpdateFrequency", updateFrequency );
     writeConfigEntry( "DisplayStyle", displayStyle );
     
     setFrameStyle( QFrame::PopupPanel | QFrame::Raised );    
     QGridLayout *grid = new QGridLayout( this, 3, 2, 6, 2, "top layout" );  
     
     /* status label */
     
     statusLabel = new QLabel( this, "statuslabel" );
     QString text( "Wireless Status:<br>"
 	                "*** Unknown ***<br>"
                     "Card not inserted ?<br>"
                     "Or Sharp ROM ?<br>"
                     "CELL: 00:00:00:00:00:00" );
 /*    QString text( "Station: Unknown<br>"
 	                "ESSID: Unknown<br>"
                     "MODE: Unknown<br>"
                     "FREQ: Unknown<br>"
@@ -202,58 +203,57 @@ void WirelessControl::writeConfigEntry( const char *entry, int val )
     Config cfg( "qpe" );
     cfg.setGroup( "Wireless" );
     cfg.writeEntry( entry, val );
 }
   
 //===========================================================================
 
 WirelessApplet::WirelessApplet( QWidget *parent, const char *name )
     : QWidget( parent, name ), visualStyle( STYLE_ANTENNA ),
       timer( 0 ), interface( 0 ),
       rocESSID( false ), rocFREQ( false ), rocAP( false ), rocMODE( false )
 {
     setFixedHeight( 18 );
     setFixedWidth( 14 );
     network = new MWirelessNetwork();
     status = new WirelessControl( this, 0, "wireless status" );
 }
 
 void WirelessApplet::checkInterface()
 {
     interface = network->getFirstInterface();
     if ( interface )
     {
 #ifdef MDEBUG
-        qDebug( "WIFIAPPLET: using interface '%s'", (const char*)
+        qDebug( "WIFIAPPLET: using interface '%s'", (const char*) interface->getName() );
 #endif
-                 interface->getName() );
     }
     else
     {
 #ifdef MDEBUG
         qDebug( "WIFIAPPLET: D'oh! No Wireless interface present... :(" );
-        hide();
 #endif
+        hide();
     }   
 }    
 
 void WirelessApplet::renewDHCP()
 {
 #ifdef MDEBUG
     qDebug( "WIFIAPPLET: Going to request a DHCP configuration renew." );
 #endif
 
     QString pidfile;
     if ( !interface )
         return;
     QString ifacename( interface->getName() );
     pidfile.sprintf( "/var/run/dhcpcd-%s.pid", (const char* ) ifacename );
 #ifdef MDEBUG
     qDebug( "WIFIAPPLET: pidfile is '%s'", (const char*) pidfile );
 #endif
     int pid;
     QFile pfile( pidfile );
     bool hasFile = pfile.open( IO_ReadOnly );
     QTextStream s( &pfile );
     if ( hasFile )
         s >> pid;
 #ifdef MDEBUG