3 files changed, 15 insertions, 7 deletions
diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py
index a3db42e..d4892d0 100644
--- a/src/sugar/activity/activity.py
+++ b/src/sugar/activity/activity.py
@@ -280,9 +280,6 @@ class Activity(Window, gtk.Container):
         self._jobject = None
         self._read_file_called = False
 
-        settings = gtk.settings_get_default()
-        settings.set_property("gtk-font-name", "%s %f" % (style.FONT_FACE, style.FONT_SIZE))
-
         self._session = _get_session()
         self._session.register(self)
         self._session.connect('quit-requested',
diff --git a/src/sugar/activity/activityfactory.py b/src/sugar/activity/activityfactory.py
index ee0fd92..c195572 100644
--- a/src/sugar/activity/activityfactory.py
+++ b/src/sugar/activity/activityfactory.py
@@ -244,13 +244,17 @@ class ActivityCreationHandler(gobject.GObject):
                               self._handle.object_id,
                               self._handle.uri)
 
+        dev_null = file('/dev/null', 'w')
         environment_dir = None
-        if os.path.exists('/etc/olpc-security'):
+        rainbow_found = subprocess.call(['which', 'rainbow-run'],
+            stdout=dev_null, stderr=dev_null) == 0
+        use_rainbow = rainbow_found and os.path.exists('/etc/olpc-security')
+        if use_rainbow:
             environment_dir = tempfile.mkdtemp()
-            command = ['/usr/bin/sudo', '-E', '--',
-                       '/usr/bin/rainbow-run',
+            command = ['sudo', '-E', '--',
+                       'rainbow-run',
                        '-v', '-v',
-                       '-a', '/usr/bin/rainbow-sugarize',
+                       '-a', 'rainbow-sugarize',
                        '-s', '/var/spool/rainbow/2',
                        '-f', '1',
                        '-f', '2',
diff --git a/src/sugar/activity/main.py b/src/sugar/activity/main.py
index 93f34e6..ef4d001 100644
--- a/src/sugar/activity/main.py
+++ b/src/sugar/activity/main.py
@@ -28,6 +28,7 @@ import dbus.glib
 import sugar
 from sugar.activity import activityhandle
 from sugar.bundle.activitybundle import ActivityBundle
+from sugar.graphics import style
 from sugar import logger
 
 
@@ -96,6 +97,12 @@ def main():
 
     gtk.icon_theme_get_default().append_search_path(bundle.get_icons_path())
 
+    # This code can be removed when we grow an xsettings daemon (the GTK+
+    # init routines will then automatically figure out the font settings)
+    settings = gtk.settings_get_default()
+    settings.set_property('gtk-font-name',
+                          '%s %f' % (style.FONT_FACE, style.FONT_SIZE))
+
     locale_path = None
     if 'SUGAR_LOCALEDIR' in os.environ:
         locale_path = os.environ['SUGAR_LOCALEDIR']