From 165fe0b00eded356850c6d1cba33971b7ffe6821 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Fri, 01 Dec 2006 22:23:58 +0000
Subject: Several cleanups

---
(limited to 'sugar-emulator')

diff --git a/sugar-emulator b/sugar-emulator
index 6def3c1..6e829e1 100755
--- a/sugar-emulator
+++ b/sugar-emulator
@@ -28,7 +28,7 @@ else:
 	sourcedir = None
 
 from sugar import env
-from sugar import setup
+from sugar import util
 
 if sourcedir:
 	if os.environ.has_key('PYTHONPATH'):
@@ -50,13 +50,13 @@ if sourcedir:
 
 	bin = os.path.join(sourcedir,
 					  'services/presence/sugar-presence-service')
-	setup.write_service('org.laptop.Presence', bin,
-						env.get_user_service_dir())	
+	util.write_service('org.laptop.Presence', bin,
+					   env.get_user_service_dir())	
 							
 	bin = os.path.join(sourcedir,
 					  'services/clipboard/sugar-clipboard')
-	setup.write_service('org.laptop.Clipboard', bin,
-						env.get_user_service_dir())
+	util.write_service('org.laptop.Clipboard', bin,
+					   env.get_user_service_dir())
 
 from sugar.emulator import Emulator
 
--
cgit v0.9.1