--- a/immsview	Thu Feb 12 09:38:06 2004 -0500
+++ b/immsview	Thu Feb 12 09:43:48 2004 -0500
@@ -20,9 +20,12 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-_version_ = "$Id: immsview 1720 2004-02-12 14:38:06Z fabien $"
+_version_ = "$Id: immsview 1721 2004-02-12 14:43:48Z fabien $"
 
 # $Log$
+# Revision 1.32  2004/02/12 14:43:48  fabien
+# Better OO approach.
+#
 # Revision 1.31  2004/02/12 14:38:06  fabien
 # Add periodic timeout.
 #
@@ -465,12 +468,11 @@
 		if gtk.main_iteration_do(gtk.FALSE):
 			break;
 
-def _timeout_get_current(tb):
-    tb.do_get_current()
-    return gtk.TRUE
-
 class Application:
     REFRESH_RATE = 5000
+    def refresh_current(self):
+        self.toolbar.do_get_current()
+        return gtk.TRUE
     def __init__(self):
         self.xmms = XMMSControl()
         self.db = IMMSDb()
@@ -492,12 +494,12 @@
         iview.show()
         scroll.show()
         plotter = IMMSPlot(self.model)
-        toolbar = IMMSToolbar(iview, self.xmms, plotter)
-        vbox.pack_start(toolbar, expand = gtk.FALSE)
-        toolbar.show()
+        self.toolbar = IMMSToolbar(iview, self.xmms, plotter)
+        vbox.pack_start(self.toolbar, expand = gtk.FALSE)
+        self.toolbar.show()
         root.show()
-        toolbar.do_refresh(None)
-        gtk.timeout_add(self.REFRESH_RATE, _timeout_get_current, toolbar)
+        self.toolbar.do_refresh(None)
+        gtk.timeout_add(self.REFRESH_RATE, Application.refresh_current, self)
 
 if __name__ == '__main__':
     app = Application()