-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/wellenreiter.pro | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index e287b47..59c2a61 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp | |||
@@ -55,18 +55,18 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char | |||
55 | { | 55 | { |
56 | int devicetype(0); | 56 | int devicetype(0); |
57 | QString line; | 57 | QString line; |
58 | QTextStream modules( &m ); | 58 | QTextStream modules( &m ); |
59 | while( !modules.atEnd() && !devicetype ) | 59 | while( !modules.atEnd() && !devicetype ) |
60 | { | 60 | { |
61 | modules >> line; | 61 | modules >> line; |
62 | if ( line.contains( "cisco" ) ) devicetype = 1; | 62 | if ( line.contains( "cisco" ) ) devicetype = 1; |
63 | else if ( line.contains( "wlan" ) ) devicetype = 2; | ||
64 | else if ( line.contains( "hostap" ) ) devicetype = 3; | 63 | else if ( line.contains( "hostap" ) ) devicetype = 3; |
64 | else if ( line.contains( "prism" ) ) devicetype = 2; | ||
65 | else if ( line.contains( "orinoco" ) ) devicetype = 4; | 65 | else if ( line.contains( "orinoco" ) ) devicetype = 4; |
66 | } | 66 | } |
67 | if ( devicetype ) | 67 | if ( devicetype ) |
68 | { | 68 | { |
69 | deviceType->setCurrentItem( devicetype ); | 69 | deviceType->setCurrentItem( devicetype ); |
70 | qDebug( "Wellenreiter: guessed device type to be %d", devicetype ); | 70 | qDebug( "Wellenreiter: guessed device type to be %d", devicetype ); |
71 | } | 71 | } |
72 | } | 72 | } |
diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro index 6fe49c3..eb60c4a 100644 --- a/noncore/net/wellenreiter/wellenreiter.pro +++ b/noncore/net/wellenreiter/wellenreiter.pro | |||
@@ -1,13 +1,14 @@ | |||
1 | TEMPLATE = subdirs | 1 | TEMPLATE = subdirs |
2 | unix:SUBDIRS = lib gui | ||
3 | 2 | ||
4 | !contains( platform, x11 ) { | 3 | !contains( platform, x11 ) { |
5 | message( Configuring Wellenreiter for build on Opie ) | 4 | message( Configuring Wellenreiter for build on Opie ) |
5 | SUBDIRS = gui | ||
6 | include ( $(OPIEDIR)/include.pro ) | 6 | include ( $(OPIEDIR)/include.pro ) |
7 | } | 7 | } |
8 | 8 | ||
9 | contains( platform, x11 ) { | 9 | contains( platform, x11 ) { |
10 | message( Configuring Wellenreiter for build on Qt/X11 ) | 10 | message( Configuring Wellenreiter for build on Qt/X11 ) |
11 | SUBDIRS = lib gui | ||
11 | system( mkdir -p $OPIEDIR/lib $OPIEDIR/bin $OPIEDIR/share/pics ) | 12 | system( mkdir -p $OPIEDIR/lib $OPIEDIR/bin $OPIEDIR/share/pics ) |
12 | } | 13 | } |
13 | 14 | ||