| -rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 448b52b..79734a2 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp @@ -489,3 +489,3 @@ void Wellenreiter::doAction( const QString& action, const QString& protocol, OPa else if ( action == "MessageBox" ) - QMessageBox::information ( this, "Notification!", + QMessageBox::information( this, "Notification!", QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) ); @@ -495,5 +495,16 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch { - // we need the interface too: - const QString iface = "wlan0"; - qDebug( "joinNetwork() - %s, %s, %d, %s", + 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; + } + + qDebug( "joinNetwork() with Interface %s: %s, %s, %d, %s", + (const char*) iface->name(), (const char*) type, @@ -503,9 +514,7 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch - // TODO: Stop scanning here - QCopEnvelope msg( "QPE/Application/networksettings", "wlan(QString,QString,QString)" ); - msg << iface << QString("Mode") << type; - msg << iface << QString("ESSID") << essid; - msg << iface << QString("Channel") << channel; - msg << iface << QString("MacAddr") << macaddr; + msg << iface->name() << QString("Mode") << type; + msg << iface->name() << QString("ESSID") << essid; + msg << iface->name() << QString("Channel") << channel; + msg << iface->name() << QString("MacAddr") << macaddr; |