Modify scanner object to follow new definition of parent GPSObject

git-svn-id: file:///svnroot/wifihood/branches/cleaning@88 c51dfc6a-5949-4919-9c8e-f207a149c383

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)

diff --git a/wifiscanner.py b/wifiscanner.py
index 2370750..de72421 100755 (executable)
--- a/wifiscanner.py
+++ b/wifiscanner.py
@@ -107,7 +107,7 @@ class AbstractWifiscanner :
 
         # Bottom frame population
         status = gtk.Label( "status bar ..." )
-        self.gpsdev.set_infowin( status , textview.get_buffer() )
+        self.gpsdev.set_infowin( textview.get_buffer() )
         bottom_box.pack_start( status , expand=False , padding=20 )
 
     def run ( self ) :