3 files changed, 6 insertions, 4 deletions

diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index 4ebac84..faedd1b 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -32,8 +32,11 @@ SOURCES         = main.cpp \
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 INTERFACES      = configbase.ui
 TARGET          = wellenreiter
+VERSION         = 1.0.5
+
+DEFINES         += WELLENREITER_VERSION='"$$VERSION (GPL) Opie"'
 
 !contains( platform, x11 ) {
   message( qws )
   include( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 9fe463a..8cabf0d 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -568,9 +568,10 @@ void Wellenreiter::startClicked()
             return;
         }
 
         // check if wireless extension version matches
-        if ( ONetwork::wirelessExtensionCompileVersion() != iface->wirelessExtensionDriverVersion() )
+        if ( ONetwork::wirelessExtensionCompileVersion() != iface->wirelessExtensionDriverVersion()
+             && ( ONetwork::wirelessExtensionCompileVersion() <= 15 || iface->wirelessExtensionDriverVersion() <= 15 ) )
         {
             QMessageBox::critical( this, "Wellenreiter II", tr( "<p>The Wireless Extension Versions<br>do not match!<p>"
                                     "  Wellenreiter II : WE V%1<br>Interface driver: WE V%2" )
                                     .arg( QString::number( ONetwork::wirelessExtensionCompileVersion() ) )
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
index 0ca0bd7..1d5bd1b 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
@@ -32,10 +32,8 @@ using namespace Opie;
 #include "resource.h"
 #include <qtabwidget.h>
 #endif
 
-#define WELLENREITER_VERSION "V1.0.3 (unofficial)"
-
 /*
  *  Constructs a WellenreiterBase which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
  */
@@ -110,9 +108,9 @@ WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags f
     QPixmap logo = Resource::loadPixmap( "wellenreiter/logo" );
     QPainter draw( &logo );
     draw.setPen( Qt::black );
     draw.setFont( QFont( "Fixed", 8 ) );
-    draw.drawText( 30, 10, WELLENREITER_VERSION );
+    draw.drawText( 5, 10, WELLENREITER_VERSION );
 
     PixmapLabel1_3_2->setPixmap( logo );
     PixmapLabel1_3_2->setScaledContents( TRUE );
     PixmapLabel1_3_2->setAlignment( int( QLabel::AlignCenter ) );