Diffstat (limited to 'noncore/applets/wirelessapplet') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/applets/wirelessapplet/networkinfo.cpp | 3 | ||||
-rw-r--r-- | noncore/applets/wirelessapplet/wireless.cpp | 8 |
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 | |||
@@ -42,25 +42,26 @@ | |||
42 | 42 | ||
43 | /* estimated wireless signal strength and noise level values | 43 | /* estimated wireless signal strength and noise level values |
44 | based on experimentation with Orinoco and Prism2 cards. | 44 | based on experimentation with Orinoco and Prism2 cards. |
45 | Seem to be correct, but please inform me, if you got values | 45 | Seem to be correct, but please inform me, if you got values |
46 | outside these boundaries. :Mickey: */ | 46 | outside these boundaries. :Mickey: */ |
47 | 47 | ||
48 | #define IW_UPPER 220 | 48 | #define IW_UPPER 220 |
49 | #define IW_LOWER 140 | 49 | #define IW_LOWER 140 |
50 | 50 | ||
51 | #define PROCNETDEV "/proc/net/dev" | 51 | #define PROCNETDEV "/proc/net/dev" |
52 | #define PROCNETWIRELESS "/proc/net/wireless" | 52 | #define PROCNETWIRELESS "/proc/net/wireless" |
53 | 53 | ||
54 | #define MDEBUG 0 | 54 | //#define MDEBUG 0 |
55 | #undef MDEBUG | ||
55 | 56 | ||
56 | //--------------------------------------------------------------------------- | 57 | //--------------------------------------------------------------------------- |
57 | // class MNetworkInterface | 58 | // class MNetworkInterface |
58 | // | 59 | // |
59 | 60 | ||
60 | MNetworkInterface::MNetworkInterface( const char* name ) | 61 | MNetworkInterface::MNetworkInterface( const char* name ) |
61 | :name( name ) | 62 | :name( name ) |
62 | { | 63 | { |
63 | struct ifreq ifr; | 64 | struct ifreq ifr; |
64 | struct sockaddr_in *sin = (struct sockaddr_in *) &ifr.ifr_addr; | 65 | struct sockaddr_in *sin = (struct sockaddr_in *) &ifr.ifr_addr; |
65 | fd = socket( AF_INET, SOCK_DGRAM, 0 ); | 66 | fd = socket( AF_INET, SOCK_DGRAM, 0 ); |
66 | } | 67 | } |
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 | |||
@@ -43,25 +43,26 @@ | |||
43 | 43 | ||
44 | #include "connect0.xpm" | 44 | #include "connect0.xpm" |
45 | #include "connect1.xpm" | 45 | #include "connect1.xpm" |
46 | #include "connect2.xpm" | 46 | #include "connect2.xpm" |
47 | #include "connect3.xpm" | 47 | #include "connect3.xpm" |
48 | #include "connect4.xpm" | 48 | #include "connect4.xpm" |
49 | #include "connect5.xpm" | 49 | #include "connect5.xpm" |
50 | #include "nowireless.xpm" | 50 | #include "nowireless.xpm" |
51 | 51 | ||
52 | #define STYLE_BARS 0 | 52 | #define STYLE_BARS 0 |
53 | #define STYLE_ANTENNA 1 | 53 | #define STYLE_ANTENNA 1 |
54 | 54 | ||
55 | #define MDEBUG 0 | 55 | //#define MDEBUG 0 |
56 | #undef MDEBUG | ||
56 | 57 | ||
57 | WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name ) | 58 | WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name ) |
58 | : QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), applet( applet ) | 59 | : QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), applet( applet ) |
59 | { | 60 | { |
60 | 61 | ||
61 | readConfig(); | 62 | readConfig(); |
62 | writeConfigEntry( "UpdateFrequency", updateFrequency ); | 63 | writeConfigEntry( "UpdateFrequency", updateFrequency ); |
63 | writeConfigEntry( "DisplayStyle", displayStyle ); | 64 | writeConfigEntry( "DisplayStyle", displayStyle ); |
64 | 65 | ||
65 | setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); | 66 | setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); |
66 | QGridLayout *grid = new QGridLayout( this, 3, 2, 6, 2, "top layout" ); | 67 | QGridLayout *grid = new QGridLayout( this, 3, 2, 6, 2, "top layout" ); |
67 | 68 | ||
@@ -214,34 +215,33 @@ WirelessApplet::WirelessApplet( QWidget *parent, const char *name ) | |||
214 | setFixedHeight( 18 ); | 215 | setFixedHeight( 18 ); |
215 | setFixedWidth( 14 ); | 216 | setFixedWidth( 14 ); |
216 | network = new MWirelessNetwork(); | 217 | network = new MWirelessNetwork(); |
217 | status = new WirelessControl( this, 0, "wireless status" ); | 218 | status = new WirelessControl( this, 0, "wireless status" ); |
218 | } | 219 | } |
219 | 220 | ||
220 | void WirelessApplet::checkInterface() | 221 | void WirelessApplet::checkInterface() |
221 | { | 222 | { |
222 | interface = network->getFirstInterface(); | 223 | interface = network->getFirstInterface(); |
223 | if ( interface ) | 224 | if ( interface ) |
224 | { | 225 | { |
225 | #ifdef MDEBUG | 226 | #ifdef MDEBUG |
226 | qDebug( "WIFIAPPLET: using interface '%s'", (const char*) | 227 | qDebug( "WIFIAPPLET: using interface '%s'", (const char*) interface->getName() ); |
227 | #endif | 228 | #endif |
228 | interface->getName() ); | ||
229 | } | 229 | } |
230 | else | 230 | else |
231 | { | 231 | { |
232 | #ifdef MDEBUG | 232 | #ifdef MDEBUG |
233 | qDebug( "WIFIAPPLET: D'oh! No Wireless interface present... :(" ); | 233 | qDebug( "WIFIAPPLET: D'oh! No Wireless interface present... :(" ); |
234 | hide(); | ||
235 | #endif | 234 | #endif |
235 | hide(); | ||
236 | } | 236 | } |
237 | } | 237 | } |
238 | 238 | ||
239 | void WirelessApplet::renewDHCP() | 239 | void WirelessApplet::renewDHCP() |
240 | { | 240 | { |
241 | #ifdef MDEBUG | 241 | #ifdef MDEBUG |
242 | qDebug( "WIFIAPPLET: Going to request a DHCP configuration renew." ); | 242 | qDebug( "WIFIAPPLET: Going to request a DHCP configuration renew." ); |
243 | #endif | 243 | #endif |
244 | 244 | ||
245 | QString pidfile; | 245 | QString pidfile; |
246 | if ( !interface ) | 246 | if ( !interface ) |
247 | return; | 247 | return; |