Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell/view/frame/FriendsBox.py
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2007-08-27 19:51:55 (GMT)
committer John (J5) Palmieri <johnp@redhat.com>2007-08-27 19:51:55 (GMT)
commitf5f95f4d7b84f5fe09499c6c4d75d1a06e1bbcb6 (patch)
tree9f8bf94d05c550d0a2ef4d533e8be814e6fe668d /shell/view/frame/FriendsBox.py
parentc06d63948794cce11e5b59e98f2ec2122a433972 (diff)
parent7fcc23b4c8c36b28f2e17904c1a64244fdd553b6 (diff)
Merge branch 'master' of git+ssh://j5@dev.laptop.org/git/sugar
Diffstat (limited to 'shell/view/frame/FriendsBox.py')
-rw-r--r--shell/view/frame/FriendsBox.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/view/frame/FriendsBox.py b/shell/view/frame/FriendsBox.py
index b634cb1..914b341 100644
--- a/shell/view/frame/FriendsBox.py
+++ b/shell/view/frame/FriendsBox.py
@@ -17,7 +17,7 @@
import hippo
from sugar.graphics.palette import Palette
-from sugar.graphics.canvasicon import CanvasIcon
+from sugar.graphics.icon import CanvasIcon
from sugar.graphics import style
from sugar.presence import presenceservice