From c988ab6f2862d4dd911c26834cec35d8ffb735e0 Mon Sep 17 00:00:00 2001
From: Morgan Collett <morgan.collett@gmail.com>
Date: Mon, 13 Aug 2007 13:12:30 +0000
Subject: #2714: Adapt chat activity to sugar.graphics cleanup

---
diff --git a/NEWS b/NEWS
index 42cd9af..22ef035 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+* #2714 sugar.graphics cleanup (morgs)
 * #2578 German translation (morgs)
 
 13
diff --git a/chat.py b/chat.py
index c5e6fab..2a0d304 100644
--- a/chat.py
+++ b/chat.py
@@ -26,9 +26,8 @@ from sugar import profile
 from sugar.activity.activity import Activity, ActivityToolbox
 from sugar.activity import activityfactory
 from sugar.graphics.canvasicon import CanvasIcon
-from sugar.graphics.roundbox import RoundBox
+from sugar.graphics.canvasroundbox import CanvasRoundBox
 from sugar.graphics.xocolor import XoColor
-from sugar.graphics.units import points_to_pixels as px
 from sugar.presence import presenceservice
 
 from telepathy.client import Connection, Channel
@@ -175,7 +174,7 @@ class Chat(Activity):
             font_desc=pango.FontDescription('Sans 64'),
             color=0xffffffff)
 
-        conversation = hippo.CanvasBox(spacing=px(4))
+        conversation = hippo.CanvasBox(spacing=4)
         self.conversation = conversation
 
         entry = gtk.Entry()
@@ -239,7 +238,7 @@ class Chat(Activity):
 
         name = hippo.CanvasText(text=name)
 
-        vbox = hippo.CanvasBox(padding=px(5))
+        vbox = hippo.CanvasBox(padding=5)
 
         if icon:
             vbox.append(icon)
@@ -247,14 +246,14 @@ class Chat(Activity):
         vbox.append(name)
 
         if status_message:
-            rb = RoundBox(background_color=0x808080ff, padding=px(3))
+            rb = CanvasRoundBox(background_color=0x808080ff, padding=3)
         else:
-            rb = RoundBox(background_color=0xffffffff, padding=px(3))
+            rb = CanvasRoundBox(background_color=0xffffffff, padding=3)
         rb.append(text)
 
         box = hippo.CanvasBox(
             orientation=hippo.ORIENTATION_HORIZONTAL,
-            spacing=px(5))
+            spacing=5)
         box.append(vbox)
         box.append(rb)
 
--
cgit v0.9.1