s/$1/%1/

3 files changed, 8 insertions, 4 deletions

diff --git a/noncore/net/wellenreiter/TODO b/noncore/net/wellenreiter/TODO
index b6ec617..01e731f 100644
--- a/noncore/net/wellenreiter/TODO
+++ b/noncore/net/wellenreiter/TODO
@@ -40,21 +40,23 @@ ENGINE
 
 - distinguish wireless bridges (WDS traffic)
 
 - expand/collapse all
 
 - add configuration for scrollback buffer in hex window and log window
 
 - revamp hex window, make it more sophisticated than just a QMultiLineEdit
   - tree view
 
 - beep over headphone / customizable
 
+- count/display number of wireless networks / APs since last start/stop
+
 ---------
  FILES
 ---------
 
 - write kismet-like .network format and format to be importable into AutoRoute
 
 - implement beacon stripping (the first beacon is enough to detect a
   new network - further beacons just blow up the capture file)
 
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp
index d32b362..8ef62e9 100644
--- a/noncore/net/wellenreiter/gui/main.cpp
+++ b/noncore/net/wellenreiter/gui/main.cpp
@@ -63,32 +63,34 @@ int main( int argc, char **argv )
     if ( check )
     {
         // root check
         if ( getuid() )
         {
             qWarning( QObject::tr( "Wellenreiter: trying to run as non-root!" ) );
             result = QMessageBox::warning( w, " - Wellenreiter II -  (non-root)", QObject::tr( "You have started Wellenreiter II\n"
             "as non-root. You will have\nonly limited functionality.\nProceed anyway?" ),
             QMessageBox::Yes, QMessageBox::No );
             if ( result == QMessageBox::No ) return -1;
         }
 
-        if ( OProcess::processPID( "dhcpc" ) )
+        int dhcpid = OProcess::processPID( "dhcpc" );
+
+        if ( dhcpid )
         {
             result = QMessageBox::warning( w, " - Wellenreiter II -  (dhcp)", QObject::tr( "You have a dhcp client running.\n"
-            "This can severly limit scanning!\nShould I kill it for you?" ),
+            "(PID = %1)\nThis can severly limit scanning!\nShould I kill it for you?" ).arg( dhcpid ),
             QMessageBox::Yes, QMessageBox::No );
             if ( result == QMessageBox::Yes )
             {
-                if ( -1 == ::kill( OProcess::processPID( "dhcpc" ), SIGTERM ) )
+                if ( -1 == ::kill( dhcpid, SIGTERM ) )
                     qWarning( "Wellenreiter: can't kill process #%d (%s)", result, strerror( errno ) );
                 else
                     killed = true;
             }
         }
     }
 
     a.exec();
 
     if ( check )
     {
 
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index b462afd..72624f7 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -233,25 +233,25 @@ void WellenreiterMainWindow::demoAddStations()
     mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:04:01:E7:56:62"), false, 3, 15, GpsLocation( 2.3, 5.5 ) );
     mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:05:8E:E7:56:E2"), false, 3, 20, GpsLocation( -10.0, -20.5 ) );
 }
 
 
 void WellenreiterMainWindow::demoReadFromGps()
 {
     WellenreiterConfigWindow* configwindow = WellenreiterConfigWindow::instance();
     GPS* gps = new GPS( this );
     gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
     GpsLocation loc = gps->position();
 
-    QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n$1" ).arg( loc.dmsPosition() ) );
+    QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n%1" ).arg( loc.dmsPosition() ) );
 }
 
 
 QString WellenreiterMainWindow::getFileName( bool save )
 {
     QMap<QString, QStringList> map;
     map.insert( tr("All"), QStringList() );
     QStringList text;
     text << "text/*";
     map.insert( tr("Text"), text );
     text << "*";
     map.insert( tr("All"), text );