summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--noncore/net/wellenreiter/gui/gui.pro2
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.cpp11
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.h1
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp39
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.h2
-rw-r--r--noncore/net/wellenreiter/wellenreiter.pro2
7 files changed, 5 insertions, 53 deletions
diff --git a/ChangeLog b/ChangeLog
index d560127..04a585a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,12 +3,13 @@
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)
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
@@ -30,13 +30,13 @@ SOURCES = main.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 )
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
@@ -399,22 +399,15 @@ void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, in
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
//============================================================
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
@@ -52,13 +52,12 @@ class MScanListView: public Opie::Ui::OListView
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" );
};
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
@@ -79,14 +79,12 @@ Wellenreiter::Wellenreiter( QWidget* parent )
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() ) );
@@ -725,49 +723,12 @@ void Wellenreiter::doAction( const QString& action, const QString& protocol, OPa
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() );
}
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
@@ -68,14 +68,12 @@ class Wellenreiter : public WellenreiterBase {
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* );
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,8 +1,8 @@
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 )
}