From f5095c78971bc3850e90555267d0c7ee11cf3b96 Mon Sep 17 00:00:00 2001
From: Gary Martin <gary@garycmartin.com>
Date: Sun, 29 May 2011 15:27:44 +0000
Subject: Fix broken new toolbars (failed testing in older Sugar release 0.88 due to xocolor.py changes)

---
(limited to 'clock.py')

diff --git a/clock.py b/clock.py
index a8a6e34..f22106c 100755
--- a/clock.py
+++ b/clock.py
@@ -75,6 +75,7 @@ OLD_TOOLBAR = False
 try:
     from sugar.graphics.toolbarbox import ToolbarBox
     from sugar.activity.widgets import StopButton
+    from sugar.activity.widgets import ActivityToolbarButton
 except ImportError:
     OLD_TOOLBAR = True
 
@@ -191,18 +192,15 @@ class ClockActivity(activity.Activity):
 
         else:
             toolbar_box = ToolbarBox()
-            activity_button = ToolButton()
-            color = XoColor(profile.get_color())
-            bundle = ActivityBundle(activity.get_bundle_path())
-            icon = Icon(file=bundle.get_icon(), xo_color=color)
-            activity_button.set_icon_widget(icon)
+            activity_button = ActivityToolbarButton(self)
             activity_button.show()
-
             toolbar_box.toolbar.insert(activity_button, 0)
+
             self._add_clock_controls(toolbar_box.toolbar)
 
             separator = gtk.SeparatorToolItem()
             separator.props.draw = False
+            separator.set_size_request(0, -1)
             separator.set_expand(True)
             toolbar_box.toolbar.insert(separator, -1)
 
--
cgit v0.9.1