diff options
author | Santiago Collazo <scollazo@activitycentral.com> | 2013-04-05 14:25:09 (GMT) |
---|---|---|
committer | Santiago Collazo <scollazo@activitycentral.com> | 2013-04-05 14:25:09 (GMT) |
commit | 4ec49cf24eb0069071cb91ac8cbcf574e04dfca7 (patch) | |
tree | 508fff3dee35ef14f5ae27b7edd8029508b43e1f | |
parent | e8255f6b1e2f5f7ca1277a31397b68a23b377486 (diff) | |
parent | a9de3ce7b071aa40c36a885eed24a0cadd0131c9 (diff) |
Merge commit 'refs/merge-requests/4' of git://git.sugarlabs.org/dextrose/oob into dextrose4-audextrose4-au
-rw-r--r-- | examples/dextrose4-xo1.5-au.ini | 16 | ||||
-rw-r--r-- | examples/dextrose4-xo1.75-au.ini | 19 | ||||
-rw-r--r-- | examples/dextrose4-xo4-au.ini | 19 | ||||
-rw-r--r-- | modules/sugar/kspost.52.gconf-dextrose4.inc | 2 |
4 files changed, 1 insertions, 55 deletions
diff --git a/examples/dextrose4-xo1.5-au.ini b/examples/dextrose4-xo1.5-au.ini index 1c7de8f..078233f 100644 --- a/examples/dextrose4-xo1.5-au.ini +++ b/examples/dextrose4-xo1.5-au.ini @@ -91,22 +91,6 @@ favorites_view_del= org.tuxpaint org.worldwideworkshop.olpc.storybuilder -protected_activities= - com.laptop.Ruler - edu.mit.media.ScratchActivity - org.laptop.AbiWordActivity - org.laptop.Analyze - org.laptop.Chat - org.laptop.Memorize - org.laptop.Oficina - org.laptop.RecordActivity - org.laptop.TurtleArtActivity - org.laptop.WebActivity - org.laptop.WikipediaActivityEN - org.laptop.sugar.ReadActivity - vu.lux.olpc.Maze - vu.lux.olpc.Speak - [sugar_activity_group] ;url=http://wiki.laptop.org/go/Activities/OLPCAU/i386/11.3.1 url=http://wiki.laptop.org/go/Activities/OLPCAU/13.1.0/i386-Base diff --git a/examples/dextrose4-xo1.75-au.ini b/examples/dextrose4-xo1.75-au.ini index 08a39a6..d83bbcb 100644 --- a/examples/dextrose4-xo1.75-au.ini +++ b/examples/dextrose4-xo1.75-au.ini @@ -95,25 +95,6 @@ favorites_view_del= org.tuxpaint org.worldwideworkshop.olpc.storybuilder - -protected_activities= - com.laptop.Ruler - edu.mit.media.ScratchActivity - org.laptop.AbiWordActivity - org.laptop.Analyze - org.laptop.Chat - org.laptop.Memorize - org.laptop.Oficina - org.laptop.RecordActivity - org.laptop.TurtleArtActivity - org.laptop.WebActivity - org.laptop.WikipediaActivityEN - org.laptop.sugar.ReadActivity - vu.lux.olpc.Maze - vu.lux.olpc.Speak - - - [sugar_activity_group] url=http://wiki.laptop.org/go/Activities/OLPCAU/13.1.0/ARM-Base activity_group_systemwide=0 diff --git a/examples/dextrose4-xo4-au.ini b/examples/dextrose4-xo4-au.ini index 60f3e96..3d7d97a 100644 --- a/examples/dextrose4-xo4-au.ini +++ b/examples/dextrose4-xo4-au.ini @@ -94,25 +94,6 @@ favorites_view_del= org.tuxpaint org.worldwideworkshop.olpc.storybuilder - -protected_activities= - com.laptop.Ruler - edu.mit.media.ScratchActivity - org.laptop.AbiWordActivity - org.laptop.Analyze - org.laptop.Chat - org.laptop.Memorize - org.laptop.Oficina - org.laptop.RecordActivity - org.laptop.TurtleArtActivity - org.laptop.WebActivity - org.laptop.WikipediaActivityEN - org.laptop.sugar.ReadActivity - vu.lux.olpc.Maze - vu.lux.olpc.Speak - - - [sugar_activity_group] url=http://wiki.laptop.org/go/Activities/OLPCAU/13.1.0/ARM-Base activity_group_systemwide=0 diff --git a/modules/sugar/kspost.52.gconf-dextrose4.inc b/modules/sugar/kspost.52.gconf-dextrose4.inc index d11ad86..f7780d0 100644 --- a/modules/sugar/kspost.52.gconf-dextrose4.inc +++ b/modules/sugar/kspost.52.gconf-dextrose4.inc @@ -1,5 +1,5 @@ # disable hot-corners (some deployments begged us to do it, let's see how many will beg us to revert this) -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t int /desktop/sugar/frame/corner_delay 1000 +# gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t int /desktop/sugar/frame/corner_delay 1000 # enable ad-hoc icon |