From b50feac3df0030ae4957f756c12175fe2a81818c Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Sat, 24 Feb 2007 11:08:45 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity

---
diff --git a/linksview.py b/linksview.py
index 8ae39d6..2c0b96b 100755
--- a/linksview.py
+++ b/linksview.py
@@ -22,11 +22,11 @@ from sugar.graphics.toolbar import Toolbar
 from sugar.graphics.menu import Menu
 from sugar.graphics.canvasicon import CanvasIcon
 from sugar.graphics.popupcontext import PopupContext
-from sugar.graphics.iconcolor import IconColor
+from sugar.graphics.xocolor import XoColor
 
 class LinkIcon(CanvasIcon):
     def __init__(self, link):
-        color = IconColor(link.buddy.get_color())
+        color = XoColor(link.buddy.get_color())
         
         path = os.path.join(activity.get_bundle_path(), 'activity')
         icon_name = os.path.join(path, 'activity-web.svg')
diff --git a/webtoolbar.py b/webtoolbar.py
index 2a1858e..fb8d21c 100755
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -26,17 +26,17 @@ class WebToolbar(Toolbar):
     def __init__(self, embed):
         Toolbar.__init__(self)
         
-        self._back = IconButton('theme:stock-back')
+        self._back = IconButton(icon_name='theme:stock-back')
         self._back.props.active = False
         self._back.connect("activated", self._go_back_cb)
         self.append(self._back)
 
-        self._forward = IconButton('theme:stock-forward')
+        self._forward = IconButton(icon_name='theme:stock-forward')
         self._forward.props.active = False
         self._forward.connect("activated", self._go_forward_cb)
         self.append(self._forward)
 
-        self._stop_and_reload = IconButton('theme:stock-close')
+        self._stop_and_reload = IconButton(icon_name='theme:stock-close')
         self._stop_and_reload.connect("activated", self._stop_and_reload_cb)
         self.append(self._stop_and_reload)
 
@@ -44,7 +44,7 @@ class WebToolbar(Toolbar):
         self._entry.connect("activated", self._entry_activate_cb)
         self.append(self._entry, hippo.PACK_EXPAND)
 
-        self._post = IconButton('theme:stock-add')
+        self._post = IconButton(icon_name='theme:stock-add')
         self._post.props.active = False
         self._post.connect("activated", self._post_cb)
         self.append(self._post)
--
cgit v0.9.1