minor bugfixes - major overhaul coming after public alpha

4 files changed, 20 insertions, 9 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
@@ -15,7 +15,7 @@
 
 #include "resource.h"
 
-#define PIXMAPPATH "/home/mickey/work/opie/pics"
+#define PIXMAPPATH "/usr/share/wellenreiter/pics/"
 
 namespace Resource
 {
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
@@ -229,7 +229,7 @@ void Wellenreiter::buttonClicked()
 
         logwindow->log( "(i) Daemon has been stopped." );
         button->setText( tr( "Start Scanning" ) );
-        setCaption( tr( "Scanning in progress..." ) );
+        setCaption( tr( "Wellenreiter/Opie" ) );
 
         // Stop daemon - ugly for now... later better
 
@@ -242,7 +242,7 @@ void Wellenreiter::buttonClicked()
         // reset the interface trying to get it into a usable state again
 
         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 );
 
         // message the user
@@ -277,7 +277,7 @@ void Wellenreiter::buttonClicked()
         logwindow->log( "(i) Daemon has been started." );
         daemonRunning = true;
         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
@@ -48,10 +48,10 @@
 WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags fl )
     : QWidget( parent, name, fl )
 {
-    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" ) );
     
     if ( !name )
         setName( "WellenreiterBase" );
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
@@ -14,13 +14,24 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 #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>
 
 #ifndef SIOCIWFIRSTPRIV
 #define SIOCIWFIRSTPRIV SIOCDEVPRIVATE
 #endif
 
-
 extern "C"
 {
 #include <net/bpf.h>