diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-08-27 16:25:45 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-08-27 16:25:45 (GMT) |
| commit | 294a5231b9a4b67220a38cacd0998e3a40ebd47b (patch) | |
| tree | 20f0e312c123751994991f46765539b0d033e6b6 /bin | |
| parent | 40ddf944572d594ec42a3d935ca1dd8040a30718 (diff) | |
2647, if security is enabled let rainbow launch activities.
Also notify rainbow when active activity changes.
Patch by Ashsong, had to merge it manually.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/sugar.in | 6 |
1 files changed, 5 insertions, 1 deletions
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 |