From 4ec49cf24eb0069071cb91ac8cbcf574e04dfca7 Mon Sep 17 00:00:00 2001
From: Santiago Collazo <scollazo@activitycentral.com>
Date: Fri, 05 Apr 2013 14:25:09 +0000
Subject: Merge commit 'refs/merge-requests/4' of git://git.sugarlabs.org/dextrose/oob into dextrose4-au

---
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
--
cgit v0.9.1