summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/resource.cpp2
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp6
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiterbase.cpp8
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh21
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 @@
-#define PIXMAPPATH "/home/mickey/work/opie/pics"
+#define PIXMAPPATH "/usr/share/wellenreiter/pics/"
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()
button->setText( tr( "Start Scanning" ) );
- setCaption( tr( "Scanning in progress..." ) );
+ setCaption( tr( "Wellenreiter/Opie" ) );
@@ -244,3 +244,3 @@ void Wellenreiter::buttonClicked()
QString cmdline;
- cmdline.sprintf( "ifdown %s; ifup %s", (const char*) interface, (const char*) interface );
+ cmdline.sprintf( "iwpriv %s monitor 0; ifdown %s; ifup %s", (const char*) interface, (const char*) interface, (const char*) interface );
system( cmdline );
@@ -279,3 +279,3 @@ void Wellenreiter::buttonClicked()
button->setText( tr( "Stop Scanning" ) );
- setCaption( tr( "Wellenreiter/Opie" ) );
+ setCaption( tr( "Scanning ..." ) );
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
{
- ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) );
- ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) );
- ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) );
- ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) );
+ //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) );
+ //ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) );
+ //ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) );
+ //ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) );
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 @@
#include <linux/if.h>
+
+/* Following typedefs are needed here, because linux/wireless.h
+ includes linux/ethertool.h which is using them */
+typedef signed char s8;
+typedef unsigned char u8;
+typedef signed short s16;
+typedef unsigned short u16;
+typedef signed int s32;
+typedef unsigned int u32;
+typedef signed long long s64;
+typedef unsigned long long u64;
+
#include <linux/wireless.h>
@@ -22,3 +34,2 @@
-
extern "C"
@@ -32,6 +43,6 @@ extern "C"
#define CISCO_STATUS "/proc/driver/aironet/%s/Status"
-#define CARD_TYPE_CISCO 1
-#define CARD_TYPE_NG 2
-#define CARD_TYPE_HOSTAP 3
-#define CARD_TYPE_ORINOCCO 4
+#define CARD_TYPE_CISCO 1
+#define CARD_TYPE_NG 2
+#define CARD_TYPE_HOSTAP 3
+#define CARD_TYPE_ORINOCCO 4