7 files changed, 5 insertions, 53 deletions

diff --git a/ChangeLog b/ChangeLog
index d560127..04a585a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,286 +1,287 @@
         2005-??-??Opie 1.2.1
         
         
         New Features
         ------------
         * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker)
         * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly)
         * Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer)
+        * Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl)
 
         Fixed Bugs
         ----------
         * #1476 - Wrong order of application entries in the O-menu (skyhusker)
                 * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
         * #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller)
         * #1614 - Make Opie-console start in $HOME instead of / (skyhusker)
                 * n.a.- always show volume and wireless applet popups inside visible screen (deller)
         * n.a.  - scale O-Menu-Applets appropriately (mickeyl)
                 * n.a.- libopienet: fix bugs in wireless scanning and setting SSID (skyhusker)
                 * n.a.- Wellenreiter: relax WE version matching test a bit (mickeyl)
                 * n.a.- scale BluezApplet appropriately and use larger icons (mickeyl)
                 * n.a.- memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
         * n.a.  - networksettings: ignore hostap control interfaces wifi* (mickeyl)
 
         Internal
         --------
         * Make BluezApplet use OTaskbarApplet (mickeyl)
         * Rewrite OFileNotification to use the upcoming inotify interface instead of the deprecated dnotify (mickeyl)
         * libopienet: Skip hostap control interfaces 'wifi' and improve robustness in ONetworkInterface (mickeyl)
 
         2005-03-25Opie 1.2.0
 
         Fixed Bugs
         ----------
         * #1613 - AdvancedFM - scale toolbar icons appropriately (drw)
         * #1620 - OFileSelector - show the button on press and not on press on hold (alwin)
         * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke)
         * n.a.  - PackageManager - fix bug where messages show up multiple times in install dialog (drw)
                 * n.a.- make qpeglobal.h include qglobal.h (zecke)
 
         2005-03-20Opie 1.2.0-rc1
 
 
         New Features
         ------------
         * Launcher: Support a static background pixmap (mickeyl)
         * LauncherSettings: Choose whether to have a static background pixmap (mickeyl)
         * PackageManager supports the 'lists_dir' ipkg configuration option (drw)
         * Added hi-res inline images for large resolution devices (drw)
         * Improved launcher icons for consistency (ar)
         * Datebook: Added plugin system to datebook so holidays and birthdays from contacts may displayed in datebook (alwin)
 
         Fixed Bugs
         ----------
         * #1236 - VCards contained empty home and work address entries causing Palms to crash (eilers)
         * #1412 - Launcher Settings - fixed default settings for background in Edit tab dialog (drw)
         * #1472 - Opie textedit now check for unsaved changes on ESC key (ljp)
         * #1474 - Implement GUI for Scrollbars on the Left in Appearance (zecke)
         * #1482 - Fix double '/' in paths (zecke)
         * #1536 - Autosave of custom locations in opie backup (ar)
         * #1539 - Fixed displaying too long path in the delete dialog in opie-eye (zecke)
         * #1540 - Implemented deletion of DocLnks in opie-eye (zecke)
         * #1542 - Fixed Todo crash when priority < 1 or > 5 (drw)
         * #1550 - Browse for alarm sound start in QPEDIR/sounds/ (zecke)
         * #1554 - Fixed Opie-Console name in .desktop file (mickeyl)
         * #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke)
         * #1558 - Fixed opie-login breaking opie startup (mickeyl)
         * #1560 - Fixed Opie-Console picking up the wrong shell (bluelightning)
         * #1570 - Confirmation needed befor Restore a backup and overwrite local data (ar)
         * #1591 - Addressbook sortorder changed by clicking on column 0 (eilers)
         * #1599 - Security - change recommendation for opie-multiauth to opie-securityplugin (gints)
         * #1604 - Checkbook crashed on startup (drw)
         * #1608 - Addressbook crashed after search, which may caused by not initialzed member variable (eilers)
         * #1608 - QueryByExampe-Datediff on SQL database did not worked properly (eilers)
         * n.a.  - Netsystemtime - fixed UI to prevent error dialog from displaying when it shouldn't, get rid of some compiler warnings (drw)
         * n.a.  - PackageManager - fixed where last package in status file was not shown as installed when it should be (drw)
         * n.a.  - PackageManager - fixed bug where lists_dir was not being honored at startup (drw)
         * n.a.  - PackageManager - provided default value for lists_dir when none is entered in configuration dialog (drw)
         * n.a.  - OTabWidget - fixed scroll buttons, fix display position of tabs (drw)
         * n.a.  - AddressBook - fixed sorting by 'File As' name (drw)
         * n.a.  - AddressBook - fixed category handling for 'All' and 'Unfiled' (eilers)
         * n.a.  - AddressBook - fixed letter picker record selection and sort records afterwards (drw)
 
         Internal
         --------
         * Worked around bug in Qt/Embedded 2.3.10: qt_version() returns 231 (mickeyl)
         * Killed the need for weak symbols in QtE (zecke)
         * Added optional building libqpe without inline images (mickeyl)
         * OColorButton - fixed so does not emit a colorSelected signal inside of resizeEvent (drw)
 
         2005-02-03Opie 1.1.9
 
         New Features
         ------------
         * Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl)
         * Number of icon columns in Launcher is customizable through LauncherSettings (mickeyl)
         * Usability enhancements in OpieIRC (skyhusker)
 
         Fixed Bugs
         ----------
         * #1501 - Fixed bug in todo sql backend (eilers)
         * #1505 - Added more Swap sizes in memoryapplet (mickeyl)
         * #1525 - Hopefully fixed double alarms and not removing alarms set with the Clock application (zecke)
         * #1533 - Security Owner Dialog (shown in case of unsuccessfull authentiacation) wasn't able to display information in non latin1 encoding (zecke)
         * n.a. - Removed hard coded font sizes in a couple of inputmethods (mickeyl)
         * n.a. - Removed MediumDlg appearing prior to FirstUsage wizard (i.e. calibration) (mickeyl)
         * n.a. - Fixed numerous buglets in OpieIRC (skyhusker)
 
         Internal
         --------
         * Added the Qtopia 1.7 SDK macros for quick-apps to easa compilation of 3rd party apps against our headers (mickeyl)
         * You can now use the Opie build system in combination with a OpenEmbedded staging area which makes a nice cross development environment (mickeyl)
         * Made Opie compilable with Qt/Embedded 2.3.10 (ar)
         * Changed Launcher to get default orientation from ODevice w/ QWS_DISPLAY overriding (mickeyl)
         * Build tree cleanups (mickeyl)
 
         2004-11-26Opie 1.1.8
 
         New Features
         ------------
         * PackageManager supports installation of local ipkg files (drw)
         * PackageManager supports linking of applications to root (drw)
         * PackageManager supports src/gz feeds (drw,wimpie)
         * Added a syslog information tab to sysinfo (mickeyl)
         * Added new, more consistent, PIM icons + a GIMP teplate (ar)
 
         Fixed Bugs
         ----------
         * #1017 - Tetrix doesn't display correctly for high resolution screens (drw)
         * #1269 - VCards were imported into personal area if it was activated (eilers)
         * #1464 - Packagemanager dont set active filter after install a package (drw)
         * #1479 - Improved VCard-Parser to import VCards created by Evolution 2 and Apple Addressbook (eilers)
         * #1493 - Fixed one column layout bug of the launcher (hrw)
         * n.a. - PackageManager - (Minor UI tweak) in filter dialog, when option is enabled, set focus to widget that corresponds to that option (drw)
         * n.a. - PackageManager - (Minor UI tweak) fix double entry in source feed configuration when adding a new feed (drw)
         * n.a. - Battery Applet - fix sizing of battery info popup (drw,mickeyl)
 
         Internal
         --------
         * Moved libopie1 to unsupported (mickeyl)
         * Implemented generic queryByExample() with incremental searching. A lot of internal changes of the Pim2-library (eilers)
         * Added fast and full featured and incremental sorted() for SQL addressbook backend (eilers)
 
         2004-11-14Opie 1.1.7
 
         New Features
         ------------
         * libOpieDB now uses SQLite V3 instead V2. Remember to upgrade your database files! (eilers)
         * Backup now uses the busy indicator when backing up and restore (ar)
         * OpiePlayer2 gained adding of Directories to the playlist (zecke)
         * OpiePlayer2 better error handling (zecke)
         * OpiePlayer2 progress indication while streaming (zecke)
         * OpiePlayer2 ported to use libxine 1.0.0-rc6a (brad,zecke)
         * Ported brightnessapplet from Qtopia 1.7 (mickeyl)
         * Opie-Eye got a Digital Camera File Backend (alwin,zecke)
         * Support for Tuxpad1 of Tradesquare.NL (mickeyl,zecke)
         * Opie-Console use Custom Font and Size in a Profile (harlekin)
         * Opie-Console transparently log the Output and Input to a file (harlekin)
         * Added new O-menu icon to lock the PDA immediately: opie-lockapplet (clem)
         * Opie-Security now hides the plugin-based authentication tabs if no auth. plugin package is installed (clem)
         * Opie-Security gained a 'test authentication' button (clem)
         * Opie-Eye  got a more unique layout (menubar), a slideshow, user can setup some defaults
         * Opie-Mail improve the handling of POP mail boxes (alwin)
         * Both Opie-Eye and Opie-Mail were greatly improved due the hard work of Rajko Albrecht(alwin)
         * Opie IRC - backports of the 'NeIRC fork' (zecke)
 
         Fixed Bugs
         ----------
         * #501  - Pickboard is able to show 'Umlaute' (TT,zecke)
         * #608  - Make Opie usable for left handed users (zecke)
         * #957  - Import of VCards/VTodos/VEvents with BASE64 encoding (ljp,zecke)
         * #1245 - Opie-Go 'paused' (zecke)
         * #1358 - DocTab didn't show any MimeTypes (was fixed earlier) (zecke)
         * #1380 - QDateBookAccess::remove() doesn't remove entries (eilers, zecke)
         * #1395 - Build VNC Backend with gcc3.4
         * #1440 - The icon of opie-mobilemsg is missing (CoreDump)
         * #1426 - Add missing opie-bartender Icon (CoreDump)
         * #1445 - Opie-Sheet Has No Icon (CoreDump)
         * #1448 - Brightness Applet added (mickeyl)
         * #1450 - ZSame didn't clear the bonus item after winning a game (zecke)
         * #1482 - Fix OFileSelector to be able to sort by size (zecke)
         * n.a.  - Opie-mail: fixed some crasher, some layout-problems
         * n.a.  - Converted applications to not hardcode /opt/QtPalmtop but to use QPEApplication::qpeDir (zecke)
         * n.a.  - Converted usage of qpeDir() not to include a '/' as first charachter of the string (zecke)
         * n.a.  - Build system: Enable distcc and ccache when crosscompiling too, and use them everywhere we can (clem)
         * n.a.  - Build system: Fix deps in several config.in (and fix scripts/deps.pl too) to stop breaking builds, especially with make -j highNumber (clem)
         * n.a.  - Removed hardcoded icon size in a couple of applets (mickeyl)
 
         Internal
         --------
         * Opie-Qashmoney has been moved to unsupported (mickeyl)
         * Opie-Ubrowser has been moved to unsupported (mickeyl)
 
         2004-09-17Opie 1.1.6
 
         New Features
         ------------
         * Fifteen gained configurable number of items (zecke)
         * Fifteen can have custom background images (zecke)
         * Added daemonizing capabilities to QWS Server [via Qt/Embedded] (mickeyl)
         * Integrated the new security framework into libopie2 (zecke,clem)
         * Converted the launcher to use the new security framework (zecke)
         * Backup can now handle custom locations for backup and restore (ar)
         * Implemented right-on-hold feedback (wimpie,zecke)
         * Lots of new features in opie-reader (tim,pohly)
         * Build system cleanups (schurig)
 
         Fixed Bugs
         --------
         * #1005 - Fixed backup to CompactFlash (ar)
         * #1167 - Fixed Opie write crashing on more text than one page (ar)
         * #1225 - Fixed repeated light flashing on Zaurus with keyz (mickeyl)
         * #1359 - Fixed bookmarks in Gutenbrowser (ljp)
         * #1361 - Fixed auto upercase in Opie-Addressbook (eilers)
         * #1370 - Pimconverter now reacts on cancel key (eilers)
         * #1376 - Bring back the capslock/numlock display (zecke)
         * #1383 - Language settings now warns about losing open apps (Markus Litz)
         * #1393 - Fixed line wrap issues in opie-console for the default profile (mickeyl)
         * #1394 - Fixed oversized headline in opie-login (coredump)
         * #1396 - Opie-console captures the escape key and vim is working (zecke)
         * #1401 - Scrollbar is now only visible if necessary in DocTab (mickeyl)
 
         2004-07-06Opie 1.1.4
 
         New Features
         ------------
         * Added four themes courtesy Robert Griebl (http://www.softforge.de/zstyle)
         * Added Conversion tool for pim-data (eilers)
         * Introduced new OPimAccessFactory and OBackendFactory which simplyfies database access (eilers)
         * Modified the PIM API for providing generic use of OPimRecords (eilers)
         * Clicking on the application symbol now iterates over the application's top level widgets if already raised (zecke)
 
         Fixed Bugs
         --------
         * #1068 - Country Drop Down Box Off Screen
         * #1291 - Opie tinykate does not open .desktop files (ar)
         * #1291 - Opie sheet not saving correctly (ar)
         * #1294 - Opie does not know about British Summer Time
         * #1314 - Drawpad initialization (mickeyl)
         * #1317 - Packagemanager crashes on hold-down or install (chicken)
         * #1321 - Batteryapplet graphic glitch (harlekin)
         * #1324 - ZSafe not starting up (mickeyl)
         * #1328 - Personal Home Address fields is trimmed to 1char (eilers)
         * #1327 - Opie-mail ipk does not depend on libopiedb2 (chicken)
         * #1345 - Networksettingsplugin wlan plugin dependency on libpcap0 (mickeyl)
         * #1348 - Datebook dependency on libopiedb2 (chicken)
         * #1328 - Switched SQLDatabase and VCards char encoding from latin1 to unicode (eilers)
 
         2004-04-25Opie 1.1.3
 
         * Introduced first implementation of SQL-Support using SQLite (eilers)
         * Added a new Gutenberg Project reader app - opie-gutenbrowser (ljp)
         * Added a real system graffiti character set (brad)
         * Added Generic Keyconfig Widget (zecke)
         * Improved Screenshotapplet and Drawpad integration. You can now open a screenshot in drawpad and take notes (zecke)
         * Added new Bible reader app - opie-dagger (drw)
         * Added a new Image Viewer. Work is ongoing (zecke,alwin)
         * Added namespace usage in libopie2 and everywhere (zecke,alwin)
         * Enabled the possibility to pass command line arguments to applications (mickeyl)
         * Added an about applet showing some credits and information about Opie (mickeyl)
         * Added benchmarking functionality to sysinfo (mickeyl)
         * Added applet and configuration application for switching hardware keyboard layouts (alwin)
         * Ported applications from libopie1 to libopie2* (drw,ar,alwin)
         * Imported fullscreen and font improvements from the Qkonsole fork to embeddedkonsole (waspe)
         * Clean-up of package information in control files (drw)
         * Repaired mediummount which was broken since integrating the quicklauncher (alwin)
         * Improved big-screen support (zecke,ar)
         * Improved multikeyboard support, added keyboard layout switching applet (mouse)
         * Added a new mail client based on libetpan (harlekin,alwin,jgf)
         * Added new package manager - opie-packagemanager (drw)
         * Improved light-n-power for C7x0 (mickeyl)
         * Added automatic rotation support for C7x0 (treke)
         * Split libopie1 up into a set of smaller - functionally grouped - libraries (mickeyl)
         * Added scanning the wireless network neighbourhood to networksettings (mickeyl)
 
         2003-11-29Opie 1.0.3
 
         * Released as Version 1.0.3
         * Improved i18n (various contributors)
         * Reduced application startup time by integrating the TT quicklauncher (zecke,harlekin)
         * Made the Documents Tab optional (mickeyl)
         * Integrated basic support for HP iPAQ 54xx and the Jornada 5xx (chicken)
 
         2003-08-04Opie 1.0.0
 
         * Released as Version 1.0.0
         * Including a PPP module for easy dial up (tille,harlekin,zecke)
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index faedd1b..544c2af 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -1,58 +1,58 @@
 DESTDIR         = $(OPIEDIR)/bin
 TEMPLATE        = app
 CONFIG          = qt warn_on
 
 HEADERS         = wellenreiterbase.h \
                   mainwindow.h \
                   wellenreiter.h \
                   scanlist.h \
                   logwindow.h \
                   hexwindow.h \
                   statwindow.h \
                   configwindow.h \
                   graphwindow.h \
                   packetview.h \
                   protolistview.h \
                   gps.h
 
 SOURCES         = main.cpp \
                   mainwindow.cpp \
                   wellenreiterbase.cpp \
                   wellenreiter.cpp \
                   scanlist.cpp \
                   logwindow.cpp \
                   hexwindow.cpp \
                   statwindow.cpp \
                   configwindow.cpp \
                   graphwindow.cpp \
                   packetview.cpp \
                   protolistview.cpp \
                   gps.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 INTERFACES      = configbase.ui
 TARGET          = wellenreiter
-VERSION         = 1.0.5
+VERSION         = 1.0.6
 
 DEFINES         += WELLENREITER_VERSION='"$$VERSION (GPL) Opie"'
 
 !contains( platform, x11 ) {
   message( qws )
   include( $(OPIEDIR)/include.pro )
   LIBS += -lqpe -lopiecore2 -lopieui2 -lopienet2
 }
 
 contains( platform, x11 ) {
   LIBS += -L$(OPIEDIR)/output/lib -Wl,-rpath,$(OPIEDIR)/output/lib -Wl,-rpath,/usr/local/lib -lwellenreiter
   SOURCES += resource.cpp
   HEADERS += resource.h
   DESTDIR = $(OPIEDIR)/output/bin
 }
 
 !isEmpty( LIBPCAP_INC_DIR ) {
     INCLUDEPATH = $$LIBPCAP_INC_DIR $$INCLUDEPATH
 }
 !isEmpty( LIBPCAP_LIB_DIR ) {
     LIBS = -L$$LIBPCAP_LIB_DIR $$LIBS
 }
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index f24e09f..587faad 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -1,590 +1,583 @@
 /**********************************************************************
 ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Wellenreiter II.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "scanlist.h"
 #include "configwindow.h"
 #include "logwindow.h"
 
 /* OPIE */
 #ifdef QWS
 #include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #else
 #include "resource.h"
 #endif
 
 
 /* QT */
 #include <qcursor.h>
 #include <qdatetime.h>
 #include <qpopupmenu.h>
 #include <qcheckbox.h>
 
 /* STD */
 #include <assert.h>
 
 using namespace Opie::Core;
 using namespace Opie::Ui;
 using namespace Opie::Net;
 
 const int col_type = 0;
 const int col_essid = 0;
 const int col_sig = 1;
 const int col_ap = 2;
 const int col_channel = 3;
 const int col_wep = 4;
 const int col_traffic = 5;
 const int col_ip = 6;
 const int col_manuf = 7;
 const int col_firstseen = 8;
 const int col_lastseen = 9;
 const int col_location = 10;
 
 #define DEBUG
 
 MScanListView::MScanListView( QWidget* parent, const char* name )
               :OListView( parent, name )
 {
     setFrameShape( QListView::StyledPanel );
     setFrameShadow( QListView::Sunken );
 
     addColumn( tr( "Net/Station" ) );
     setColumnAlignment( col_essid, AlignLeft || AlignVCenter );
     addColumn( tr( "#" ) );
     setColumnAlignment( col_sig, AlignCenter );
     addColumn( tr( "MAC" ) );
     setColumnAlignment( col_ap, AlignCenter );
     addColumn( tr( "Chn" ) );
     setColumnAlignment( col_channel, AlignCenter );
     addColumn( tr( "W" ) );
     setColumnAlignment( col_wep, AlignCenter );
     addColumn( tr( "T" ) );
     setColumnAlignment( col_traffic, AlignCenter );
     addColumn( tr( "IP" ) );
     setColumnAlignment( col_ip, AlignCenter );
     addColumn( tr( "Manufacturer" ) );
     setColumnAlignment( col_manuf, AlignCenter );
     addColumn( tr( "First Seen" ) );
     setColumnAlignment( col_firstseen, AlignCenter );
     addColumn( tr( "Last Seen" ) );
     setColumnAlignment( col_lastseen, AlignCenter );
     addColumn( tr( "Location" ) );
     setColumnAlignment( col_location, AlignCenter );
     setRootIsDecorated( true );
     setAllColumnsShowFocus( true );
 
     connect( this, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ),
              this, SLOT( contextMenuRequested(QListViewItem*,const QPoint&,int) ) );
 
     #ifdef QWS
     QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
     #endif
 
 };
 
 
 MScanListView::~MScanListView()
 {
 };
 
 
 OListViewItem* MScanListView::childFactory()
 {
     return new MScanListItem( this );
 }
 
 
 void MScanListView::serializeTo( QDataStream& s) const
 {
     odebug << "serializing MScanListView" << oendl;
     OListView::serializeTo( s );
 }
 
 
 void MScanListView::serializeFrom( QDataStream& s)
 {
     odebug << "serializing MScanListView" << oendl;
     OListView::serializeFrom( s );
 }
 
 
 void MScanListView::addNewItem( const QString& type,
                                 const QString& essid,
                                 const OMacAddress& mac,
                                 bool wep,
                                 int channel,
                                 int signal,
                                 const GpsLocation& loc,
                                 bool probe )
 {
     QString macaddr = mac.toString(true);
 
     #ifdef DEBUG
     odebug << "MScanList::addNewItem( "  << type << " / "
            << essid << " / " << macaddr
            << " [" << channel << "]" << oendl;
     #endif
 
     // search, if we already have seen this net
 
     QString s;
     MScanListItem* network;
     MScanListItem* item = static_cast<MScanListItem*> ( firstChild() );
 
     while ( item && ( item->text( col_essid ) != essid ) )
     {
         #ifdef DEBUG
         odebug << "itemtext: " << item->text( col_essid ) << "" << oendl;
         #endif
         item = static_cast<MScanListItem*> ( item->nextSibling() );
     }
     if ( item )
     {
         // we have already seen this net, check all childs if MAC exists
 
         network = item;
 
         item = static_cast<MScanListItem*> ( item->firstChild() );
         assert( item ); // this shouldn't fail
 
         while ( item && ( item->text( col_ap ) != macaddr ) )
         {
             #ifdef DEBUG
             odebug << "subitemtext: " << item->text( col_ap ) << "" << oendl;
             #endif
             item = static_cast<MScanListItem*> ( item->nextSibling() );
         }
 
         if ( item )
         {
             // we have already seen this item, it's a dupe
             #ifdef DEBUG
             odebug << "" << macaddr << " is a dupe - ignoring..." << oendl;
             #endif
             item->receivedBeacon();
             return;
         }
     }
     else
     {
         s = QString( "(i) New network: ESSID '%1'" ).arg( essid );
         MLogWindow::logwindow()->log( s );
         network = new MScanListItem( this, "network", essid, QString::null, 0, 0, 0, probe );
     }
 
 
     // insert new station as child from network
     // no essid to reduce clutter, maybe later we have a nick or stationname to display!?
 
     #ifdef DEBUG
     odebug << "inserting new station " << macaddr << "" << oendl;
     #endif
 
     MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal );
     station->setManufacturer( mac.manufacturer() );
     station->setLocation( loc.dmsPosition() );
 
     if ( type == "managed" )
     {
         s = QString( "(i) New Access Point in '%1' [%2]" ).arg( essid ).arg( channel );
     }
     else
     {
         s = QString( "(i) New AdHoc station in '%1' [%2]" ).arg( essid ).arg( channel );
     }
     MLogWindow::logwindow()->log( s );
 }
 
 
 void MScanListView::addIfNotExisting( MScanListItem* network, const OMacAddress& addr, const QString& type )
 {
     MScanListItem* subitem = static_cast<MScanListItem*>( network->firstChild() );
 
     while ( subitem && ( subitem->text( col_ap ) != addr.toString(true) ) )
     {
         #ifdef DEBUG
         odebug << "subitemtext: " << subitem->text( col_ap ) << "" << oendl;
         #endif
         subitem = static_cast<MScanListItem*> ( subitem->nextSibling() );
     }
 
     if ( subitem )
     {
         // we have already seen this item, it's a dupe
         #ifdef DEBUG
         odebug << "" << addr.toString(true) << " is a dupe - ignoring..." << oendl;
         #endif
         subitem->receivedBeacon(); //FIXME: sent data bit
         return;
     }
 
     // Hey, it seems to be a new item :-D
     MScanListItem* station = new MScanListItem( network, type, /* network->text( col_essid ) */ "", addr.toString(true), false, -1, -1 );
     station->setManufacturer( addr.manufacturer() );
 
     QString s;
     if ( type == "station" )
     {
         s = QString( "(i) New Station in '%1' [xx]" ).arg( network->text( col_essid ) );
     }
     else
     {
         s = QString( "(i) New Wireless Station in '%1' [xx]" ).arg( network->text( col_essid ) );
     }
     MLogWindow::logwindow()->log( s );
 }
 
 
 void MScanListView::WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo )
 {
     odebug << "WDSTraffic: " << viaFrom.toString() << " and " << viaTo.toString() << " seem to form a WDS" << oendl;
     QString s;
 //    MScanListItem* network;
 
     QListViewItemIterator it( this );
     while ( it.current() &&
             it.current()->text( col_ap ) != viaFrom.toString(true) &&
             it.current()->text( col_ap ) != viaTo.toString(true) ) ++it;
 
     MScanListItem* item = static_cast<MScanListItem*>( it.current() );
 
     if ( item ) // Either viaFrom or viaTo AP has shown up yet, so just add our two new stations
     {
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from );
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), to );
     }
     else
     {
         odebug << "D'Oh! Stations without AP... ignoring for now... will handle this in 1.1 version :-D" << oendl;
         MLogWindow::logwindow()->log( "WARNING: Unhandled WSD traffic!" );
     }
 }
 
 
 void MScanListView::toDStraffic( const OMacAddress& from, const OMacAddress& /*to*/, const OMacAddress& via )
 {
     QString s;
 //    MScanListItem* network;
 
     QListViewItemIterator it( this );
     while ( it.current() && it.current()->text( col_ap ) != via.toString(true) ) ++it;
 
     MScanListItem* item = static_cast<MScanListItem*>( it.current() );
 
     if ( item ) // AP has shown up yet, so just add our new "from" - station
     {
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "adhoc" );
     }
     else
     {
         odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl;
         MLogWindow::logwindow()->log( "WARNING: Unhandled toDS traffic!" );
 
     }
 }
 
 
 void MScanListView::fromDStraffic( const OMacAddress& from, const OMacAddress& /*to*/, const OMacAddress& via )
 {
     QString s;
 //    MScanListItem* network;
 
     QListViewItemIterator it( this );
     while ( it.current() && it.current()->text( col_ap ) != via.toString(true) ) ++it;
 
     MScanListItem* item = static_cast<MScanListItem*>( it.current() );
 
     if ( item ) // AP has shown up yet, so just add our new "from" - station
     {
         addIfNotExisting( static_cast<MScanListItem*>(item->parent()), from, "station" );
     }
     else
     {
         odebug << "D'Oh! Station without AP... ignoring for now... will handle this in 1.1 :-D" << oendl;
         MLogWindow::logwindow()->log( "WARNING: Unhandled fromDS traffic!" );
     }
 }
 
 
 void MScanListView::IBSStraffic( const OMacAddress& /*from*/, const OMacAddress& /*to*/, const OMacAddress& /*via*/ )
 {
     owarn << "D'oh! Not yet implemented..." << oendl;
     MLogWindow::logwindow()->log( "WARNING: Unhandled IBSS traffic!" );
 }
 
 
 void MScanListView::identify( const OMacAddress& macaddr, const QString& ip )
 {
     odebug << "identify " << macaddr.toString() << " = " << ip << "" << oendl;
 
     QListViewItemIterator it( this );
     for ( ; it.current(); ++it )
     {
         if ( it.current()->text( col_ap ) == macaddr.toString(true) )
         {
             it.current()->setText( col_ip, ip );
             return;
         }
     }
     odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl;
     MLogWindow::logwindow()->log( QString( "WARNING: Unhandled identification %1 = %2!" )
                                   .arg( macaddr.toString() ).arg( ip ) );
 }
 
 
 void MScanListView::addService( const QString& name, const OMacAddress& macaddr, const QString& ip )
 {
     odebug << "addService '" << name << "', Server = " << macaddr.toString() << " = " << ip << "" << oendl;
 
     //TODO: Refactor that out, we need it all over the place.
     //      Best to do it in a more comfortable abstraction in OListView
     //      (Hmm, didn't I already start something in this direction?)
 
     QListViewItemIterator it( this );
     for ( ; it.current(); ++it )
     {
         if ( it.current()->text( col_ap ) == macaddr.toString(true) )
         {
 
             MScanListItem* subitem = static_cast<MScanListItem*>( it.current()->firstChild() );
 
             while ( subitem && ( subitem->text( col_essid ) != name ) )
             {
                 #ifdef DEBUG
                 odebug << "subitemtext: " << subitem->text( col_essid ) << "" << oendl;
                 #endif
                 subitem = static_cast<MScanListItem*> ( subitem->nextSibling() );
             }
 
             if ( subitem )
             {
                 // we have already seen this item, it's a dupe
                 #ifdef DEBUG
                 odebug << "" << name << " is a dupe - ignoring..." << oendl;
                 #endif
                 subitem->receivedBeacon(); //FIXME: sent data bit
                 return;
             }
 
             // never seen that - add new item
 
             MScanListItem* item = new MScanListItem( it.current(), "service", "N/A", " ", false, -1, -1 );
             item->setText( col_essid, name );
 
             return;
         }
     }
     odebug << "D'oh! Received identification, but item not yet in list... ==> Handle this!" << oendl;
     MLogWindow::logwindow()->log( QString("WARNING: Unhandled service addition %s = %s!")
                                                      .arg( macaddr.toString() ).arg( ip ) );
 }
 
 
 void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, int col )
 {
     if ( !item ) return;
 
     MScanListItem* itm = static_cast<MScanListItem*>( item );
 
     odebug << "contextMenuRequested on item '" << itm->text(0) << "' ("
            << itm->type << ") in column: '" << col << "'" << oendl;
 
-    if ( itm->type == "adhoc" || itm->type == "managed" )
-    {
-        QString entry = QString( "&Join %1 Net '%2'..." ).arg( itm->type ).arg( itm->essid() );
+    /* do something meaningful */
 
-        QPopupMenu m( this );
-        m.insertItem( entry, 37773, 0 );
-        int result = m.exec( QCursor::pos() );
-        if ( result == 37773 )
-            emit joinNetwork( itm->type, itm->essid(), itm->channel(), itm->macaddr() );
-    }
+    return;
 }
 
 //============================================================
 // MScanListItem
 //============================================================
 
 MScanListItem::MScanListItem( QListView* parent, const QString& type, const QString& essid, const QString& macaddr,
                               bool wep, int channel, int signal, bool probed )
                :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ),
                 _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ),
                 _channel( channel ), _signal( signal ), _beacons( 1 )
 {
     #ifdef DEBUG
     odebug << "creating scanlist item" << oendl;
     #endif
 
     if ( WellenreiterConfigWindow::instance() )
         WellenreiterConfigWindow::instance()->performAction( type, essid, macaddr, wep, channel, signal ); // better use signal/slot combination here
 
     decorateItem( type, essid, macaddr, wep, channel, signal, probed );
 }
 
 MScanListItem::MScanListItem( QListViewItem* parent, const QString& type, const QString& essid, const QString& macaddr,
                               bool wep, int channel, int signal )
                :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null )
 {
     #ifdef DEBUG
     odebug << "creating scanlist item" << oendl;
     #endif
     if ( WellenreiterConfigWindow::instance() )
         WellenreiterConfigWindow::instance()->performAction( type, essid, macaddr, wep, channel, signal ); // better use signal/slot combination here
 
     decorateItem( type, essid, macaddr, wep, channel, signal, false );
 }
 
 const QString& MScanListItem::essid() const
 {
     if ( type == "network" )
         return _essid;
     else
         return ( (MScanListItem*) parent() )->essid();
 }
 
 OListViewItem* MScanListItem::childFactory()
 {
     return new MScanListItem( this );
 }
 
 void MScanListItem::serializeTo( QDataStream& s ) const
 {
     #ifdef DEBUG
     odebug << "serializing MScanListItem" << oendl;
     #endif
     OListViewItem::serializeTo( s );
 
     s << _type;
     s << (Q_UINT8) ( _wep ? 'y' : 'n' );
 }
 
 void MScanListItem::serializeFrom( QDataStream& s )
 {
     #ifdef DEBUG
     odebug << "serializing MScanListItem" << oendl;
     #endif
     OListViewItem::serializeFrom( s );
 
     Q_UINT8 wep;
     s >> _type;
     s >> wep;
     _wep = (wep == 'y');
 
     QString name = QString( "wellenreiter/"+ _type );
     setPixmap( col_type, Resource::loadPixmap( name ) );
     if ( _wep )
         setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap!
     listView()->triggerUpdate();
 }
 
 void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed )
 {
     #ifdef DEBUG
     odebug << "decorating scanlist item " << type << " / "
            << essid << " / " << macaddr
            << "[" << channel << "]" << oendl;
     #endif
 
     // set icon for managed or adhoc mode
     QString name;
     name.sprintf( "wellenreiter/"+ type );
     setPixmap( col_type, Resource::loadPixmap( name ) );
 
     // special case for probed networks FIXME: This is ugly at present
     if ( type == "network" && probed )
     {
         setPixmap( col_type, Resource::loadPixmap( "wellenreiter/network-probed.png" ) );
     }
 
     // set icon for wep (wireless encryption protocol)
     if ( wep )
         setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); //FIXME: rename the pixmap!
 
     // set channel and signal text
 
     if ( signal != -1 )
         setText( col_sig, QString::number( signal ) );
     if ( channel != -1 )
         setText( col_channel, QString::number( channel ) );
 
     setText( col_firstseen, QTime::currentTime().toString() );
     //setText( col_lastseen, QTime::currentTime().toString() );
 
     listView()->triggerUpdate();
 
     this->type = type;
     _type = type;
     _essid = essid;
     _macaddr = macaddr;
     _channel = channel;
     _beacons = 1;
     _signal = 0;
 
     if ( WellenreiterConfigWindow::instance()->openTree->isChecked() )
     {
         listView()->ensureItemVisible( this );
     }
 
 }
 
 
 void MScanListItem::setManufacturer( const QString& manufacturer )
 {
     setText( col_manuf, manufacturer );
 }
 
 
 void MScanListItem::setLocation( const QString& location )
 {
     setText( col_location, location );
 }
 
 
 void MScanListItem::receivedBeacon()
 {
     _beacons++;
     #ifdef DEBUG
     odebug << "MScanListItem " << _macaddr << ": received beacon #" << _beacons << "" << oendl;
     #endif
     setText( col_sig, QString::number( _beacons ) );
     setText( col_lastseen, QTime::currentTime().toString() );
 
     MScanListItem* p = (MScanListItem*) parent();
     if ( p ) p->receivedBeacon();
 
 }
 
 QString MScanListItem::key( int id, bool b )const {
     QString str;
 
     /*
      * Pad the amount of received packages, number
      * of the channel.
      */
     switch( id ) {
     case col_sig:
         str = text(col_sig).rightJustify( 20, '0' );
         break;
     case col_channel:
         str = text(col_channel).rightJustify( 2, '0' );
         break;
     default:
         str = Opie::Ui::OListViewItem::key( id, b );
         break;
     }
 
     return str;
 }
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h
index 8b3814a..eec51af 100644
--- a/noncore/net/wellenreiter/gui/scanlist.h
+++ b/noncore/net/wellenreiter/gui/scanlist.h
@@ -1,142 +1,141 @@
 /**********************************************************************
 ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Wellenreiter II.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #ifndef SCANLIST_H
 #define SCANLIST_H
 
 #include "gps.h"
 
 /* OPIE */
 #include <opie2/olistview.h>
 #include <opie2/onetutils.h>
 
 /* QT */
 #include <qtextstream.h>
 
 class QString;
 class MScanListItem;
 
 class MScanListView: public Opie::Ui::OListView
 {
   Q_OBJECT
 
   public:
     MScanListView( QWidget* parent = 0, const char* name = 0 );
     virtual ~MScanListView();
 
     virtual Opie::Ui::OListViewItem* childFactory();
     virtual void serializeTo( QDataStream& s ) const;
     virtual void serializeFrom( QDataStream& s );
 
   public slots:
     void addNewItem( const QString& type, const QString&, const Opie::Net::OMacAddress&, bool, int, int, const GpsLocation&, bool = false );
     void addService( const QString& name, const Opie::Net::OMacAddress& macaddr, const QString& ip );
 
     void fromDStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& via );
     void toDStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& via );
     void WDStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& viaFrom, const Opie::Net::OMacAddress& viaTo );
     void IBSStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& via );
 
     void identify( const Opie::Net::OMacAddress&, const QString& ipaddr );
 
     void contextMenuRequested( QListViewItem* item, const QPoint&, int );
 
   signals:
     void rightButtonClicked(QListViewItem*,const QPoint&,int);
-    void joinNetwork( const QString&, const QString&, int, const QString& );
 
   protected:
     void addIfNotExisting( MScanListItem* parent, const Opie::Net::OMacAddress& addr, const QString& type = "station" );
 
 };
 
 //****************************** MScanListItem ****************************************************************
 
 class MScanListItem: public Opie::Ui::OListViewItem
 {
   public:
     MScanListItem::MScanListItem( QListView* parent,
                                   const QString& type = "unknown",
                                   const QString& essid = "unknown",
                                   const QString& macaddr = "unknown",
                                   bool wep = false,
                                   int channel = 0,
                                   int signal = 0,
                                   bool probed = false );
 
     MScanListItem::MScanListItem( QListViewItem* parent,
                                   const QString& type = "unknown",
                                   const QString& essid = "unknown",
                                   const QString& macaddr = "unknown",
                                   bool wep = false,
                                   int channel = 0,
                                   int signal = 0 );
 
 
   protected:
     virtual void decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed );
 
   public:
     QString type;
 
   public:
     //const QString& type() { return _type; };
     const QString& essid() const;
     const QString& macaddr() { return _macaddr; };
     bool wep() { return _wep; };
     int channel() { return _channel; };
     int signal() { return _signal; };
     int beacons() { return _beacons; };
 
     void setSignal( int signal ) { /* TODO */ };
     void receivedBeacon();
 
     void setManufacturer( const QString& manufacturer );
     void setLocation( const QString& location );
 
     virtual Opie::Ui::OListViewItem* childFactory();
     virtual void serializeTo( QDataStream& s ) const;
     virtual void serializeFrom( QDataStream& s );
 
     virtual QString key( int id, bool )const;
 
   private:
     QString _type;
     QString _essid;
     QString _macaddr;
     bool _wep;
     int _channel;
     int _signal;
     int _beacons;
 
 };
 
 //****************************** MScanListViewFactory ****************************************************************
 
 /*
 
 class MScanListViewFactory : public Opie::Ui::OListViewFactory
 {
 public:
     virtual QListView* listViewFactory();
     virtual QListViewItem* listViewItemFactory( QListView* lv );
     virtual QListViewItem* listViewItemFactory( QListViewItem* lvi );
     virtual void setColumnText( int depth, QListViewItem* lvi, int column, const QString& text );
     virtual void setCustomData( int depth, QListViewItem* lvi, const QString& text );
 }
 */
 
 #endif
 
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 8cabf0d..c4e6f02 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -1,779 +1,740 @@
 /**********************************************************************
 ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ***********************************************************************/
 
 #include "gps.h"
 #include "wellenreiter.h"
 #include "scanlist.h"
 #include "logwindow.h"
 #include "packetview.h"
 #include "configwindow.h"
 #include "statwindow.h"
 #include "graphwindow.h"
 #include "protolistview.h"
 
 /* OPIE */
 #ifdef QWS
 #include <opie2/oapplication.h>
 #include <opie2/odebug.h>
 #include <opie2/odevice.h>
 #else
 #include <qapplication.h>
 #endif
 #include <opie2/omanufacturerdb.h>
 #include <opie2/onetwork.h>
 #include <opie2/opcap.h>
 #include <qpe/qcopenvelope_qws.h>
 
 /* QT */
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qdatetime.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qmessagebox.h>
 #include <qobjectlist.h>
 #include <qregexp.h>
 #include <qspinbox.h>
 #include <qtimer.h>
 #include <qtoolbutton.h>
 #include <qmainwindow.h>
 
 /* STD */
 #include <assert.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <signal.h>
 
 
 using namespace Opie::Core;
 using namespace Opie::Net;
 using namespace Opie::Ui;
 
 Wellenreiter* Wellenreiter::instance = 0;
 
 Wellenreiter::Wellenreiter( QWidget* parent )
     : WellenreiterBase( parent, 0, 0 ),
       sniffing( false ), iface( 0 ), configwindow( 0 )
 {
 
     logwindow->log( "(i) Wellenreiter has been started." );
 
     //
     // detect operating system
     //
 
     #ifdef QWS
     QString sys = QString( "(i) Running on '%1'.").arg( ODevice::inst()->systemString() );
     _system = ODevice::inst()->system();
     logwindow->log( sys );
     #endif
 
     netview->setColumnWidthMode( 1, QListView::Manual );
-    connect( netview, SIGNAL( joinNetwork(const QString&,const QString&,int,const QString&) ),
-             this, SLOT( joinNetwork(const QString&,const QString&,int,const QString&) ) );
     pcap = new OPacketCapturer();
     pcap->setAutoDelete( false );
 
     gps = new GPS( this );
 
     QTimer::singleShot( 1000, this, SLOT( initialTimer() ) );
 
     registerSignalHandler();
 }
 
 
 Wellenreiter::~Wellenreiter()
 {
     delete pcap;
     //unregisterSignalHandler();
 }
 
 
 void Wellenreiter::initialTimer()
 {
     odebug << "preloading manufacturer database..." << oendl;
     OManufacturerDB::instance();
 }
 
 
 void Wellenreiter::signalHandler( int sig )
 {
     Q_UNUSED( sig )
     oerr << "Aye! Received SIGSEGV or SIGBUS! Trying to exit gracefully..." << oendl;
     if ( Wellenreiter::instance->sniffing )
     {
         Wellenreiter::instance->pcap->closeDumpFile();
         Wellenreiter::instance->pcap->close();
         Wellenreiter::instance->stopClicked();
     }
     oerr << "Phew. Seemed to work." << oendl;
     ::exit( -1 );
 }
 
 
 void Wellenreiter::registerSignalHandler()
 {
     Wellenreiter::instance = this;
     struct sigaction action;
 
     action.sa_handler = Wellenreiter::signalHandler;
     if (sigemptyset(&action.sa_mask))
         oerr << "sigemptyset() failure:" << strerror( errno ) << oendl;
     if (sigaction(SIGSEGV, &action, NULL))
         oerr << "can't set up a signal handler for SIGSEGV:" << strerror( errno ) << oendl;
     if (sigaction(SIGBUS, &action, NULL))
         oerr << "can't set up a signal handler for SIGBUS:" << strerror( errno ) << oendl;
     odebug << "signal handlers setup." << oendl;
 }
 
 
 void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw )
 {
     configwindow = cw;
 }
 
 
 void Wellenreiter::channelHopped(int c)
 {
     QString title = "Wellenreiter II -scan- [";
     QString left;
     if ( c > 1 ) left.fill( '.', c-1 );
     title.append( left );
     title.append( '|' );
     if ( c < iface->channels() )
     {
         QString right;
         right.fill( '.', iface->channels()-c );
         title.append( right );
     }
     title.append( "]" );
     //title.append( QString().sprintf( " %02d", c ) );
     assert( parent() );
     ( (QMainWindow*) parent() )->setCaption( title );
 }
 
 
 void Wellenreiter::handleNotification( OPacket* p )
 {
     QObjectList* l = p->queryList();
     QObjectListIt it( *l );
     QObject* o;
 
     while ( (o = it.current()) != 0 )
     {
         QString name = it.current()->name();
         if ( configwindow->parsePackets->isProtocolChecked( name ) )
         {
             QString action = configwindow->parsePackets->protocolAction( name );
             odebug << "parsePacket-action for '" << name << "' seems to be '" << action << "'" << oendl;
             doAction( action, name, p );
         }
         else
         {
             odebug << "protocol '" << name << "' not checked in parsePackets." << oendl;
         }
     ++it;
     }
 }
 
 
 void Wellenreiter::handleManagementFrame( OPacket* p, OWaveLanManagementPacket* manage )
 {
     if ( manage->managementType() == "Beacon" ) handleManagementFrameBeacon( p, manage );
     else if ( manage->managementType() == "ProbeRequest" ) handleManagementFrameProbeRequest( p, manage );
     else if ( manage->managementType() == "ProbeResponse" ) handleManagementFrameProbeResponse( p, manage );
     else owarn << "Wellenreiter::handleManagementFrame(): '" << manage->managementType() << "' - please handle me!" << oendl;
 }
 
 
 void Wellenreiter::handleManagementFrameProbeRequest( OPacket* p, OWaveLanManagementPacket* /* request */ )
 {
     OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
     QString essid = ssid ? ssid->ID( true /* decloak */ ) : QString("<unknown>");
 //    OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) );
 //    int channel = ds ? ds->channel() : -1;
     OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
 
     GpsLocation loc( -111, -111 );
     if ( configwindow->enableGPS->isChecked() )
     {
         // TODO: add check if GPS is working!?
         odebug << "Wellenreiter::gathering GPS data..." << oendl;
         loc = gps->position();
         odebug << "Wellenreiter::GPS data received is ( " << loc.latitude() << " , " << loc.longitude() << " ) - dms string = '" << loc.dmsPosition().latin1() << "'" << oendl;
     }
 
     if ( essid.length() )
         netView()->addNewItem( "adhoc", essid, header->macAddress2(), false /* should check FrameControl field */, -1, 0, loc, true /* only probed */ );
     odebug << "Wellenreiter::invalid frame [possibly noise] detected!" << oendl;
 }
 
 
 void Wellenreiter::handleManagementFrameProbeResponse( OPacket* /* p */, OWaveLanManagementPacket* /* response */ )
 {
 }
 
 
 void Wellenreiter::handleManagementFrameBeacon( OPacket* p, OWaveLanManagementPacket* beacon  )
 {
     QString type;
     if ( beacon->canIBSS() )
     {
         type = "adhoc";
     }
     else if ( beacon->canESS() )
     {
         type = "managed";
     }
     else
     {
         owarn << "Wellenreiter::invalid frame [possibly noise] detected!" << oendl;
         return;
     }
 
     OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) );
     QString essid = ssid ? ssid->ID( true /* decloak */ ) : QString("<unknown>");
     OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) );
     int channel = ds ? ds->channel() : -1;
 
     OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
 
     GpsLocation loc( -111, -111 );
     if ( configwindow->enableGPS->isChecked() )
     {
         // TODO: add check if GPS is working!?
         odebug << "Wellenreiter::gathering GPS data..." << oendl;
         loc = gps->position();
         odebug << "Wellenreiter::GPS data received is ( " << loc.latitude() << " , " << loc.longitude() << " ) - dms string = '" << loc.dmsPosition().latin1() << "'" << oendl;
     }
 
     netView()->addNewItem( type, essid, header->macAddress2(), beacon->canPrivacy(), channel, 0, loc );
 
     // update graph window
     if ( ds )
     {
         OPrismHeaderPacket* prism = static_cast<OPrismHeaderPacket*>( p->child( "Prism" ) );
         if ( prism )
             graphwindow->traffic( ds->channel(), prism->signalStrength() );
         else
             graphwindow->traffic( ds->channel(), 95 );
     }
 }
 
 
 void Wellenreiter::handleControlFrame( OPacket* p, OWaveLanControlPacket* control )
 {
     OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) );
 
     if ( control->controlType() == "Acknowledge" )
     {
         netView()->addNewItem( "adhoc", "<unknown>", header->macAddress1(), false, -1, 0, GpsLocation( -111, -111 ) );
     }
     else
     {
         odebug << "Wellenreiter::handleControlFrame - please handle " << control->controlType() << " in a future version! :D" << oendl;
     }
 }
 
 
 void Wellenreiter::handleWlanData( OPacket* p, OWaveLanDataPacket* /* data */ , OMacAddress& from, OMacAddress& to )
 {
     OWaveLanPacket* wlan = (OWaveLanPacket*) p->child( "802.11" );
     if ( wlan->fromDS() && !wlan->toDS() )
     {
         netView()->fromDStraffic( wlan->macAddress3(), wlan->macAddress1(), wlan->macAddress2() );
         from = wlan->macAddress3();
         to = wlan->macAddress2();
     }
     else if ( !wlan->fromDS() && wlan->toDS() )
     {
         netView()->toDStraffic( wlan->macAddress2(), wlan->macAddress3(), wlan->macAddress1() );
         from = wlan->macAddress2();
         to = wlan->macAddress3();
     }
     else if ( wlan->fromDS() && wlan->toDS() )
     {
         netView()->WDStraffic( wlan->macAddress4(), wlan->macAddress3(), wlan->macAddress1(), wlan->macAddress2() );
         from = wlan->macAddress4();
         to = wlan->macAddress3();
     }
     else
     {
         netView()->IBSStraffic( wlan->macAddress2(), wlan->macAddress1(), wlan->macAddress3() );
         from = wlan->macAddress2();
         to = wlan->macAddress1();
     }
 }
 
 
 void Wellenreiter::handleEthernetData( OPacket* /* p */, OEthernetPacket* data, OMacAddress& from, OMacAddress& to )
 {
     from = data->sourceAddress();
     to = data->destinationAddress();
 
     netView()->addNewItem( "station", "<wired>", from, false, -1, 0, GpsLocation( -111, -111 ) );
 }
 
 
 void Wellenreiter::handleARPData( OPacket* p, OARPPacket*, OMacAddress& /* source */, OMacAddress& /* dest */ )
 {
     OARPPacket* arp = (OARPPacket*) p->child( "ARP" );
     if ( arp )
     {
         odebug << "Received ARP traffic (type '" << arp->type() << "'): " << oendl;
         if ( arp->type() == "REQUEST" )
         {
             netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() );
         }
         else if ( arp->type() == "REPLY" )
         {
             netView()->identify( arp->senderMacAddress(), arp->senderIPV4Address().toString() );
             netView()->identify( arp->targetMacAddress(), arp->targetIPV4Address().toString() );
         }
     }
 }
 
 
 void Wellenreiter::handleIPData( OPacket* p, OIPPacket* /* ip */, OMacAddress& source, OMacAddress& /* dest */ )
 {
     //TODO: Implement more IP based protocols
 
     ODHCPPacket* dhcp = (ODHCPPacket*) p->child( "DHCP" );
     if ( dhcp )
     {
         odebug << "Received DHCP '" << dhcp->type() << "' packet" << oendl;
         if ( dhcp->type() == "OFFER" )
         {
             odebug << "DHCP: '" << source.toString() << "' ('" << dhcp->serverAddress().toString() << "') seems to be a DHCP server." << oendl;
             netView()->identify( source, dhcp->serverAddress().toString() );
             netView()->addService( "DHCP", source, dhcp->serverAddress().toString() );
         }
         else if ( dhcp->type() == "ACK" )
         {
             odebug << "DHCP: '" << dhcp->clientMacAddress().toString() << "' ('" << dhcp->yourAddress().toString() << "') accepted the offered DHCP address." << oendl;
             netView()->identify( dhcp->clientMacAddress(), dhcp->yourAddress().toString() );
         }
     }
 }
 
 
 QObject* Wellenreiter::childIfToParse( OPacket* p, const QString& protocol )
 {
     if ( configwindow->parsePackets->isProtocolChecked( protocol ) )
         if ( configwindow->parsePackets->protocolAction( protocol ) == "Discard!" )
             return 0;
 
     return p->child( protocol );
 }
 
 
 bool Wellenreiter::checkDumpPacket( OPacket* p )
 {
     // go through all child packets and see if one is inside the child hierarchy for p
     // if so, do what the user requested (protocolAction), e.g. pass or discard
     if ( !configwindow->writeCaptureFile->isChecked() )
         return true; // semantic change - we're logging anyway now to /tmp/wellenreiter
 
     QObjectList* l = p->queryList();
     QObjectListIt it( *l );
     QObject* o;
 
     while ( (o = it.current()) != 0 )
     {
         QString name = it.current()->name();
         if ( configwindow->capturePackets->isProtocolChecked( name ) )
         {
             QString action = configwindow->capturePackets->protocolAction( name );
             odebug << "capturePackets-action for '" << name << "' seems to be '" << action << "'" << oendl;
             if ( action == "Discard" )
             {
                 logwindow->log( QString("(i) dump-discarding of '%1' packet requested." ).arg( name ) );
                 return false;
             }
         }
         else
         {
             odebug << "protocol '" << name << "' not checked in capturePackets." << oendl;
         }
     ++it;
     }
     return true;
 }
 
 
 void Wellenreiter::receivePacket( OPacket* p )
 {
     hexWindow()->add( p, configwindow->hexViewBuffer() );
 
     if ( checkDumpPacket( p ) )
     {
         pcap->dump( p );
     }
 
     // check for a management frame
     OWaveLanManagementPacket* manage = static_cast<OWaveLanManagementPacket*>( childIfToParse( p, "802.11 Management" ) );
     if ( manage )
     {
         handleManagementFrame( p, manage );
         return;
     }
 
     // check for a control frame
     OWaveLanControlPacket* control = static_cast<OWaveLanControlPacket*>( childIfToParse( p, "802.11 Control" ) );
     if ( control )
     {
         handleControlFrame( p, control );
         return;
     }
 
     OMacAddress source;
     OMacAddress dest;
 
     //TODO: WEP check here
 
     // check for a wireless data frame
     OWaveLanDataPacket* wlan = static_cast<OWaveLanDataPacket*>( childIfToParse( p, "802.11 Data" ) );
     if ( wlan )
     {
         handleWlanData( p, wlan, source, dest );
     }
 
     // check for a wired data frame
     OEthernetPacket* eth = static_cast<OEthernetPacket*>( childIfToParse( p, "Ethernet" ) );
     if ( eth )
     {
         handleEthernetData( p, eth, source, dest );
     }
 
     // check for an arp frame since arp frames come in two flavours:
     // 802.11 encapsulates ARP data within IP packets while wired ethernet doesn't.
     OARPPacket* arp = static_cast<OARPPacket*>( childIfToParse( p, "ARP" ) );
     if ( arp )
     {
         handleARPData( p, arp, source, dest );
     }
 
     // check for a ip frame
     OIPPacket* ip = static_cast<OIPPacket*>( childIfToParse( p, "IP" ) );
     if ( ip )
     {
         handleIPData( p, ip, source, dest );
     }
 
     //handleNotification( p );
 
 }
 
 
 void Wellenreiter::stopClicked()
 {
     if ( iface )
     {
         disconnect( SIGNAL( receivedPacket(Opie::Net::OPacket*) ), this, SLOT( receivePacket(Opie::Net::OPacket*) ) );
         disconnect( SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) );
         iface->setChannelHopping(); // stop hopping channels
     }
     else
         killTimers();
 
     pcap->close();
     sniffing = false;
 
     if ( iface )
     {
         // switch off monitor mode
         iface->setMode( "managed" );
         // switch off promisc flag
         iface->setPromiscuousMode( false );
 
         system( "cardctl reset; sleep 1" ); //FIXME: Use OProcess
     }
 
     logwindow->log( "(i) Stopped Scanning." );
     assert( parent() );
     ( (QMainWindow*) parent() )->setCaption( "Wellenreiter II" );
 
     // message the user
     QMessageBox::information( this, "Wellenreiter II",
                               tr( "Your wireless card\nshould now be usable again." ) );
 
     sniffing = false;
     emit( stoppedSniffing() );
 
     #ifdef QWS
     if ( WellenreiterConfigWindow::instance()->disablePM->isChecked() )
     {
         QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
     }
     #else
         #warning FIXME: setScreenSaverMode is not operational on the X11 build
     #endif
 
     updateStatistics();
 }
 
 
 void Wellenreiter::startClicked()
 {
     // get configuration from config window
 
     const QString& interface = configwindow->interfaceName->currentText();
     const int cardtype = configwindow->driverType();
 //    const int interval = configwindow->hoppingInterval();
 
     if ( ( interface == "" ) || ( cardtype == 0 ) )
     {
         QMessageBox::information( this, "Wellenreiter II",
                                   tr( "No device configured.\nPlease reconfigure!" ) );
         return;
     }
 
     // configure device
     ONetwork* net = ONetwork::instance();
 
     // TODO: check if interface is wireless and support sniffing for non-wireless interfaces
 
     if ( cardtype != DEVTYPE_FILE )
     {
 
         if ( !net->isPresent( interface ) )
         {
             QMessageBox::information( this, "Wellenreiter II",
                                     tr( "The configured device (%1)\nis not available on this system\n. Please reconfigure!" ).arg( interface ) );
             return;
         }
 
         iface = static_cast<OWirelessNetworkInterface*>(net->interface( interface )); // fails if network is not wireless!
         assert( iface );
 
         // bring device UP
         iface->setUp( true );
         if ( !iface->isUp() )
         {
             QMessageBox::warning( this, "Wellenreiter II",
                                 tr( "Can't bring interface '%1' up:\n" ).arg( iface->name() ) + strerror( errno ) );
             return;
         }
 
         // check if wireless extension version matches
         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() ) )
                                     .arg( QString::number( iface->wirelessExtensionDriverVersion() ) ) );
             return;
         }
     }
     // set monitor mode
     bool usePrism = configwindow->usePrismHeader();
 
     switch ( cardtype )
     {
         case DEVTYPE_CISCO: iface->setMonitoring( new OCiscoMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_WLAN_NG: iface->setMonitoring( new OWlanNGMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_HOSTAP: iface->setMonitoring( new OHostAPMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface, usePrism ) ); break;
         case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", tr( "Bring your device into\nmonitor mode now." ) ); break;
         case DEVTYPE_FILE: odebug << "Wellenreiter: Capturing from file '" << interface << "'" << oendl;  break;
         default: assert( 0 ); // shouldn't reach this
     }
 
     // switch device into monitor mode
     if ( cardtype < DEVTYPE_FILE )
     {
         if ( cardtype != DEVTYPE_MANUAL )
             iface->setMode( "monitor" );
         if ( iface->mode() != "monitor" )
         {
             if ( QMessageBox::warning( this, "Wellenreiter II",
                                   tr( "Can't set interface '%1'\ninto monitor mode:\n" ).arg( iface->name() ) + strerror( errno ) +
                                   tr( "\nContinue with limited functionality?" ), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No )
                 return;
         }
     }
 
     // open GPS device
     if ( configwindow->enableGPS->isChecked() )
     {
         odebug << "Wellenreiter:GPS enabled @ " << configwindow->gpsdHost->currentText() << ":" << configwindow->gpsdPort->value() << "" << oendl;
         gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
     }
 
     // open pcap and start sniffing
 
     if ( configwindow->writeCaptureFile->isChecked() ) // write to a user specified capture file?
     {
         dumpname = configwindow->captureFileName->text();
         if ( dumpname.isEmpty() ) dumpname = "captureFile";
         dumpname.append( '-' );
         dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) );
         dumpname.append( ".wellenreiter" );
     }
 
     if ( cardtype != DEVTYPE_FILE )
         pcap->open( interface );
     else
         pcap->openCaptureFile( interface );
 
     if ( configwindow->writeCaptureFile->isChecked() )
     {
         odebug << "Wellenreiter:: dumping to " << dumpname << oendl;
         pcap->openDumpFile( dumpname );
     }
 
     if ( !pcap->isOpen() )
     {
         QMessageBox::warning( this, "Wellenreiter II", tr( "Can't open packet capturer for\n'%1':\n" ).arg(
                               cardtype == DEVTYPE_FILE ? (const char*) interface : iface->name() ) + QString(strerror( errno ) ));
         return;
     }
 
     // set capturer to non-blocking mode
     pcap->setBlocking( false );
 
     // start channel hopper
     if ( cardtype != DEVTYPE_FILE )
     {
         logwindow->log( QString().sprintf( "(i) Starting channel hopper (d=%d ms)", configwindow->hopInterval->value() ) );
         iface->setChannelHopping( configwindow->hopInterval->value() ); //use interval from config window
     }
 
     if ( cardtype != DEVTYPE_FILE )
     {
         // connect socket notifier and start channel hopper
         connect( pcap, SIGNAL( receivedPacket(Opie::Net::OPacket*) ), this, SLOT( receivePacket(Opie::Net::OPacket*) ) );
         connect( iface->channelHopper(), SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) );
     }
     else
     {
         // start timer for reading packets
         startTimer( 100 );
     }
 
     logwindow->log( "(i) Started Scanning." );
     sniffing = true;
 
     #ifdef QWS
     if ( WellenreiterConfigWindow::instance()->disablePM->isChecked() )
     {
         QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Disable;
     }
     #else
         #warning FIXME: setScreenSaverMode is not operational on the X11 build
     #endif
 
     emit( startedSniffing() );
     if ( cardtype != DEVTYPE_FILE ) channelHopped( 6 ); // set title
     else
     {
         assert( parent() );
         ( (QMainWindow*) parent() )->setCaption( tr( "Wellenreiter II - replaying capture file..." ) );
     }
 }
 
 
 void Wellenreiter::timerEvent( QTimerEvent* )
 {
     odebug << "Wellenreiter::timerEvent()" << oendl;
     OPacket* p = pcap->next();
     if ( !p ) // no more packets available
     {
         stopClicked();
     }
     else
     {
         receivePacket( p );
         // We no longer delete packets here. Ownership of the packets is
         // transferred to the PacketView.
         //delete p;
     }
 }
 
 
 void Wellenreiter::doAction( const QString& action, const QString& protocol, OPacket* /* p */ )
 {
     #ifdef QWS
     if ( action == "TouchSound" )
         ODevice::inst()->playTouchSound();
     else if ( action == "AlarmSound" )
         ODevice::inst()->playAlarmSound();
     else if ( action == "KeySound" )
         ODevice::inst()->playKeySound();
     else if ( action == "LedOn" )
         ODevice::inst()->setLedState( Led_Mail, Led_On );
     else if ( action == "LedOff" )
         ODevice::inst()->setLedState( Led_Mail, Led_Off );
     else if ( action == "LogMessage" )
         logwindow->log( QString(tr("Got packet with protocol '%1'","Protocol Name" ) ).arg( protocol ) );
     else if ( action == "MessageBox" )
         QMessageBox::information( this, "Notification!",
         QString(tr( "Got packet with protocol '%1'", "Protocol Name" ) ).arg( protocol ) );
     #else
     #warning Actions do not work with Qt/X11 yet
     #endif
 }
 
-void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int channel, const QString& macaddr)
-{
-    #ifdef QWS
-    if ( !iface )
-    {
-        QMessageBox::warning( this, tr( "Can't do that!" ), tr( "No wireless\ninterface available." ) );
-        return;
-    }
-
-    if ( sniffing )
-    {
-        QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Stop sniffing before\njoining a net." ) );
-        return;
-    }
-
-    odebug << "joinNetwork() with Interface " << iface->name()
-           << ": " << type << ", " << essid
-           << ", " << channel << ", " << macaddr << oendl;
-
-    QCopEnvelope msg( "QPE/Application/networksettings", "wlan(QString,QString,QString)" );
-    int count = 3;
-    odebug << "sending " << count << " messages" << oendl;
-    msg << QString("count") << QString::number(count);
-    odebug << "msg >" << iface->name() << "< Mode >" << type.latin1() << "<" << oendl;
-    msg << QString(iface->name()) << QString("Mode") << type;
-    odebug << "msg >" << iface->name() << "< essid >" << essid.latin1() << "<" << oendl;
-    msg << QString(iface->name()) << QString("ESSID") << essid;
-    odebug << "msg >" << iface->name() << "< channel >" << channel << "<" << oendl;
-    msg << QString(iface->name()) << QString("Channel") << channel;
-//    odebug << "msg >" << iface->name() << "< mac >" << macaddr << "<" << oendl;
-//    msg << QString(iface->name()) << QString("MacAddr") << macaddr;
-    #else
-    QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Function only available on Embedded build" ) );
-    #endif
-
-}
-
 void Wellenreiter::updateStatistics()
 {
     // print out statistics
     for( QMap<QString,int>::ConstIterator it = pcap->statistics().begin(); it != pcap->statistics().end(); ++it )
        statwindow->updateCounter( it.key(), it.data() );
 }
 
 void Wellenreiter::slotTabChanged( QWidget* wid )
 {
     if ( wid == statwindow )
         updateStatistics();
 }
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index 5ac389e..1c9633d 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -1,117 +1,115 @@
 /**********************************************************************
 ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #ifndef WELLENREITER_H
 #define WELLENREITER_H
 
 #include "wellenreiterbase.h"
 
 #ifdef QWS
 #include <opie2/odevice.h>
 #endif
 
 #include <signal.h>
 
 class QTimerEvent;
 class QPixmap;
 namespace Opie {namespace Net {class OPacket;}}
 namespace Opie {namespace Net {class OWaveLanManagementPacket;}}
 namespace Opie {namespace Net {class OWaveLanControlPacket;}}
 namespace Opie {namespace Net {class OWaveLanDataPacket;}}
 namespace Opie {namespace Net {class OEthernetPacket;}}
 namespace Opie {namespace Net {class OARPPacket;}}
 namespace Opie {namespace Net {class OMacAddress;}}
 namespace Opie {namespace Net {class OIPPacket;}}
 namespace Opie {namespace Net {class OPacket;}}
 namespace Opie {namespace Net {class OWirelessNetworkInterface;}}
 namespace Opie {namespace Net {class OPacketCapturer;}}
 class PacketView;
 class WellenreiterConfigWindow;
 class MLogWindow;
 class GPS;
 
 class Wellenreiter : public WellenreiterBase {
     Q_OBJECT
 
   public:
     Wellenreiter( QWidget* parent = 0 );
     ~Wellenreiter();
 
     void setConfigWindow( WellenreiterConfigWindow* cw );
     MScanListView* netView() const { return netview; };
     MLogWindow* logWindow() const { return logwindow; };
     PacketView* hexWindow() const { return hexwindow; };
     bool isDaemonRunning() const { return sniffing; };
     QString captureFileName() const { return dumpname; };
 
   public:
     QString dumpname;
     bool sniffing;
     static Wellenreiter* instance;
     static void signalHandler( int sig );
 
   protected:
     virtual void timerEvent( QTimerEvent* );
 
   public slots:
     void initialTimer();
 
     void channelHopped(int);
     void receivePacket(Opie::Net::OPacket*);
     void startClicked();
     void stopClicked();
 
-    void joinNetwork(const QString&,const QString&,int,const QString&);
-
   signals:
     void startedSniffing();
     void stoppedSniffing();
 
   private:
     void handleManagementFrame( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* );
     void handleManagementFrameBeacon( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* );
     void handleManagementFrameProbeRequest( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* );
     void handleManagementFrameProbeResponse( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* );
     void handleControlFrame( Opie::Net::OPacket* p, Opie::Net::OWaveLanControlPacket* control );
     void handleWlanData( Opie::Net::OPacket* p, Opie::Net::OWaveLanDataPacket* data, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to );
     void handleEthernetData( Opie::Net::OPacket* p, Opie::Net::OEthernetPacket* data, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to );
     void handleARPData( Opie::Net::OPacket* p, Opie::Net::OARPPacket* arp, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to );
     void handleIPData( Opie::Net::OPacket* p, Opie::Net::OIPPacket* ip, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to );
     void handleNotification( Opie::Net::OPacket* p );
     void doAction( const QString& action, const QString& protocol, Opie::Net::OPacket* p );
     QObject* childIfToParse( Opie::Net::OPacket* p, const QString& protocol );
     bool checkDumpPacket( Opie::Net::OPacket* p );
     void registerSignalHandler();
 
   private slots:
     void slotTabChanged( QWidget* );
 
   private:
     void updateStatistics();
 
     #ifdef QWS
     Opie::Core::OSystem _system;                // Opie Operating System identifier
     #endif
 
     Opie::Net::OWirelessNetworkInterface* iface;
     Opie::Net::OPacketCapturer* pcap;
     WellenreiterConfigWindow* configwindow;
     GPS* gps;
 
     //void readConfig();
     //void writeConfig();
 };
 
 
 
 #endif
diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro
index e995db9..673868f 100644
--- a/noncore/net/wellenreiter/wellenreiter.pro
+++ b/noncore/net/wellenreiter/wellenreiter.pro
@@ -1,15 +1,15 @@
 TEMPLATE        = subdirs
-VERSION         = 1.0.3-cvs
+VERSION         = 1.0.5-cvs
 
 !contains( platform, x11 ) {
   message( Configuring Wellenreiter for build on Opie )
   SUBDIRS = gui
   include( $(OPIEDIR)/include.pro )
 }
 
 contains( platform, x11 ) {
   message( Configuring Wellenreiter for build on Qt/X11 )
   SUBDIRS = lib gui
   system( mkdir -p $OPIEDIR/lib $OPIEDIR/bin $OPIEDIR/share/pics )
 }