7 files changed, 5 insertions, 53 deletions

diff --git a/ChangeLog b/ChangeLog
index d560127..04a585a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,104 +1,105 @@
         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)
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
@@ -309,202 +309,195 @@ void MScanListView::fromDStraffic( const OMacAddress& from, const OMacAddress& /
 
     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" ) );
     }
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,182 +1,180 @@
 /**********************************************************************
 ** 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 );
@@ -635,145 +633,108 @@ void Wellenreiter::startClicked()
         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 )
 }