Modify scanner object to follow new definition of parent GPSObject

[wifihood] / wifimap / wifiscan.py

diff --git a/wifimap/wifiscan.py b/wifimap/wifiscan.py
index ca7da15..013fb9c 100644 (file)
--- a/wifimap/wifiscan.py
+++ b/wifimap/wifiscan.py
@@ -17,7 +17,7 @@ conf = config.Configuration()
 class Scanner ( gps.GPSObject ) :
 
     def __init__ ( self , widget=None , ifname="wlan0" ) :
-        gps.GPSObject.__init__( self , widget )
+        gps.GPSObject.__init__( self )
         self.osso_context = None
         if widget :
             self.osso_context = osso.Context("wifi_scanner", "2.0", False)
@@ -111,13 +111,11 @@ class Scanner ( gps.GPSObject ) :
                 celllist.write ( "%s\n" % ( self.cell_info ,) )
                 celllist.close()
 
-    def set_infowin ( self , statuswin , listwin ) :
-        gps.GPSObject.set_infowin( self , statuswin )
+    def set_infowin ( self , listwin ) :
         self.scanlist = listwin
 
-    def refresh_infowin ( self ) :
-        if self.status :
-            self.status.set_text( "%d gps\t%d scan\t%d fp\t%d ap\t%d total ap" % ( self.ngps , self.nscan , self.nfp , self.newap , self.db.nrows() ) )
+    def report ( self ) :
+        return "%s\t%d scan\t%d fp\t%d ap\t%d total ap" % ( gps.GPSObject.report(self) , self.nscan , self.nfp , self.newap , self.db.nrows() )
 
 
 gobject.type_register(Scanner)