Move interface name selection into main wifiscanner program

git-svn-id: file:///svnroot/wifihood/trunk@112 c51dfc6a-5949-4919-9c8e-f207a149c383

diff --git a/wifiscanner/wifimap/replay.py b/wifiscanner/wifimap/replay.py
index 1e8b594..6bf7c86 100644 (file)
--- a/wifiscanner/wifimap/replay.py
+++ b/wifiscanner/wifimap/replay.py
@@ -10,7 +10,7 @@ conf = config.Configuration()
 
 class ReplayScanner ( gobject.GObject ) :
 
-    def __init__ ( self ) :
+    def __init__ ( self , ifname="wlan0" ) :
         gobject.GObject.__init__( self )
         self.scan_timeout = 0
         self.db = db.database( os.path.join( conf.homedir , "wifireplay.db" ) )

diff --git a/wifiscanner/wifimap/scanner.py b/wifiscanner/wifimap/scanner.py
index 03389ba..41f2e5c 100644 (file)
--- a/wifiscanner/wifimap/scanner.py
+++ b/wifiscanner/wifimap/scanner.py
@@ -19,7 +19,7 @@ class Scanner ( gps.GPSObject , wifiscan.WifiScanner ) :
 
     def __init__ ( self , ifname="wlan0" ) :
         gps.GPSObject.__init__( self )
-        wifiscan.WifiScanner.__init__( self )
+        wifiscan.WifiScanner.__init__( self , ifname )
         self.db = db.database( os.path.join( conf.homedir , conf.dbname ) )
 
         # Values to be set by wireless scans

diff --git a/wifiscanner/wifiscanner b/wifiscanner/wifiscanner
index 7c6d3e4..cb2a452 100755 (executable)
--- a/wifiscanner/wifiscanner
+++ b/wifiscanner/wifiscanner
@@ -67,7 +67,7 @@ class AbstractWifiscanner :
 
     def __init__ ( self ) :
 
-        _scanner = scanner()
+        _scanner = scanner( "wlan0" )
 
         self.connect("delete_event", gtk.main_quit, None)