From 294a5231b9a4b67220a38cacd0998e3a40ebd47b Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Mon, 27 Aug 2007 16:25:45 +0000
Subject: 2647, if security is enabled let rainbow launch activities.

Also notify rainbow when active activity changes.
Patch by Ashsong, had to merge it manually.
---
(limited to 'bin')

diff --git a/bin/sugar.in b/bin/sugar.in
index 4e6fc8b..5026ad0 100644
--- a/bin/sugar.in
+++ b/bin/sugar.in
@@ -3,4 +3,8 @@
 export SUGAR_PREFIX=@prefix@
 export SUGAR_PATH=@prefix@/share/sugar
 export GTK2_RC_FILES=@prefix@/share/sugar/data/sugar-xo.gtkrc
-dbus-launch --exit-with-session sugar-shell
+if [ -f /etc/olpc-security ] ; then
+  dbus-launch --exit-with-session --config-file=/etc/dbus-1/session-olpc.conf sugar-shell
+else
+  dbus-launch --exit-with-session sugar-shell
+fi
--
cgit v0.9.1