Remove 'callout' from listsel interface

not needed
Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/lib/listselect.py b/lib/listselect.py
index dac1b8cbe58fba13c94d706b7bea30d84476bf59..fdc398a45e1eadfa6ddeca14f8d1fc0cd392eb5e 100644 (file)
--- a/lib/listselect.py
+++ b/lib/listselect.py
@@ -88,8 +88,6 @@ class ListSelect(gtk.DrawingArea):
         self.list = []
         self.center = center
 
-        self.callout = None
-        
         self.fd = self.get_pango_context().get_font_description()
         # zoom level: 20..50
         self.zoom = 0
@@ -363,6 +361,12 @@ class ListSelect(gtk.DrawingArea):
     def select(self, ind):
         if self.selected == ind:
             return
+        if ind == None:
+            self.selected = None
+            self.selected_str = None
+            self.list_changed()
+            self.emit('selected', -1)
+            return
         old = self.selected
         self.selected = ind
         self.selected_str = self.list[ind][0]
@@ -376,8 +380,6 @@ class ListSelect(gtk.DrawingArea):
                 col = (old - self.top) / self.rows
                 row = (old - self.top) - (col * self.rows)
                 self.draw_one(row, col)
-        if self.callout:
-            self.callout(ind, self.list[ind])
         self.emit('selected', ind)
 
 if __name__ == "__main__":
@@ -395,10 +397,9 @@ if __name__ == "__main__":
         el.append((a, "blue"))
     el[9] = (el[9][0], ("red",True,True,"black","white"))
     el[13] = (el[13][0], ("black",False,False,"yellow","white",(4,8)))
-    def sel(n, i):
-        s,f = i
-        print n, s, "selected"
-    s.callout = sel
+    def sel(s, n):
+        print n, s.list[n], "selected"
+    s.connect('selected', sel)
 
     s.list = el
     s.select(12)

diff --git a/lib/scrawl.py b/lib/scrawl.py
index 7d514f8ea7b3aac11564a531072928ebeaa8ed29..f64bb4de6b353c892aa008570351b4e3558f48e1 100644 (file)
--- a/lib/scrawl.py
+++ b/lib/scrawl.py
@@ -789,10 +789,9 @@ if __name__ == "__main__":
     v.pack_end(s, expand = True)
     s.show()
 
-    def sel(n, i):
-        s,f = i
-        print n, s, "selected"
-    s.callout = sel
+    def sel(s, n):
+        print n, s.list[n], "selected"
+    s.connect('selected', sel)
 
     global sc