4 files changed, 24 insertions, 13 deletions
diff --git a/noncore/net/wellenreiter/gui/resource.cpp b/noncore/net/wellenreiter/gui/resource.cpp index 58c6bed..fb0966a 100644 --- a/noncore/net/wellenreiter/gui/resource.cpp +++ b/noncore/net/wellenreiter/gui/resource.cpp | |||
@@ -17,3 +17,3 @@ | |||
17 | 17 | ||
18 | #define PIXMAPPATH "/home/mickey/work/opie/pics" | 18 | #define PIXMAPPATH "/usr/share/wellenreiter/pics/" |
19 | 19 | ||
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index c1aae86..4c53028 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -231,3 +231,3 @@ void Wellenreiter::buttonClicked() | |||
231 | button->setText( tr( "Start Scanning" ) ); | 231 | button->setText( tr( "Start Scanning" ) ); |
232 | setCaption( tr( "Scanning in progress..." ) ); | 232 | setCaption( tr( "Wellenreiter/Opie" ) ); |
233 | 233 | ||
@@ -244,3 +244,3 @@ void Wellenreiter::buttonClicked() | |||
244 | QString cmdline; | 244 | QString cmdline; |
245 | cmdline.sprintf( "ifdown %s; ifup %s", (const char*) interface, (const char*) interface ); | 245 | cmdline.sprintf( "iwpriv %s monitor 0; ifdown %s; ifup %s", (const char*) interface, (const char*) interface, (const char*) interface ); |
246 | system( cmdline ); | 246 | system( cmdline ); |
@@ -279,3 +279,3 @@ void Wellenreiter::buttonClicked() | |||
279 | button->setText( tr( "Stop Scanning" ) ); | 279 | button->setText( tr( "Stop Scanning" ) ); |
280 | setCaption( tr( "Wellenreiter/Opie" ) ); | 280 | setCaption( tr( "Scanning ..." ) ); |
281 | 281 | ||
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp index a93c684..da12f2b 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp | |||
@@ -50,6 +50,6 @@ WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags f | |||
50 | { | 50 | { |
51 | ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) ); | 51 | //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) ); |
52 | ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) ); | 52 | //ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) ); |
53 | ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) ); | 53 | //ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) ); |
54 | ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) ); | 54 | //ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) ); |
55 | 55 | ||
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh index 652b3ed..58e99ac 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh +++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh | |||
@@ -16,2 +16,14 @@ | |||
16 | #include <linux/if.h> | 16 | #include <linux/if.h> |
17 | |||
18 | /* Following typedefs are needed here, because linux/wireless.h | ||
19 | includes linux/ethertool.h which is using them */ | ||
20 | typedef signed char s8; | ||
21 | typedef unsigned char u8; | ||
22 | typedef signed short s16; | ||
23 | typedef unsigned short u16; | ||
24 | typedef signed int s32; | ||
25 | typedef unsigned int u32; | ||
26 | typedef signed long long s64; | ||
27 | typedef unsigned long long u64; | ||
28 | |||
17 | #include <linux/wireless.h> | 29 | #include <linux/wireless.h> |
@@ -22,3 +34,2 @@ | |||
22 | 34 | ||
23 | |||
24 | extern "C" | 35 | extern "C" |
@@ -32,6 +43,6 @@ extern "C" | |||
32 | #define CISCO_STATUS "/proc/driver/aironet/%s/Status" | 43 | #define CISCO_STATUS "/proc/driver/aironet/%s/Status" |
33 | #define CARD_TYPE_CISCO 1 | 44 | #define CARD_TYPE_CISCO 1 |
34 | #define CARD_TYPE_NG 2 | 45 | #define CARD_TYPE_NG 2 |
35 | #define CARD_TYPE_HOSTAP3 | 46 | #define CARD_TYPE_HOSTAP 3 |
36 | #define CARD_TYPE_ORINOCCO 4 | 47 | #define CARD_TYPE_ORINOCCO 4 |
37 | 48 | ||