[Ocfs2-tools-commits] manish commits r762 - trunk/ocfs2console/ocfs2interface

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-03-28 21:18:02 -0600 (Mon, 28 Mar 2005)
New Revision: 762

Modified:
   trunk/ocfs2console/ocfs2interface/toolbar.py
Log:
Refresh after toolbar actions


Modified: trunk/ocfs2console/ocfs2interface/toolbar.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/toolbar.py	2005-03-29 03:13:41 UTC (rev 761)
+++ trunk/ocfs2console/ocfs2interface/toolbar.py	2005-03-29 03:18:02 UTC (rev 762)
@@ -18,9 +18,9 @@
 import gtk
 
 toolbar_data = (
-    ('Mount', gtk.STOCK_EXECUTE, 'mount'),
-    ('Unmount', gtk.STOCK_STOP, 'unmount'),
-    ('Refresh', gtk.STOCK_REFRESH, 'refresh')
+    ('Mount',   gtk.STOCK_EXECUTE, 'mount',   'refresh'),
+    ('Unmount', gtk.STOCK_STOP,    'unmount', 'refresh'),
+    ('Refresh', gtk.STOCK_REFRESH, 'refresh',  None)
 )
 
 class Toolbar:
@@ -32,14 +32,21 @@
         items = {}
 
         for data in toolbar_data:
-            label, stock_id, callback = data
+            label, stock_id, callback, sub_callback = data
 
             def make_cb():
                 cb = getattr(self.window, callback)
 
-                def cb_func(w):
-                    cb()
+                if sub_callback:
+                    sub_cb = getattr(self.window, sub_callback)
 
+                    def cb_func(w):
+                        cb()
+                        sub_cb()
+                else:
+                    def cb_func(w):
+                        cb()
+
                 return cb_func
 
             icon = gtk.Image()