Merge branch 'master' of git://git.sugarlabs.org/dextrose/mainline

4 files changed, 36 insertions, 41 deletions

diff --git a/rpms/sugar/avoid-popping-an-empty-list-in-the-software-updater.patch b/rpms/sugar/avoid-popping-an-empty-list-in-the-software-updater.patch
deleted file mode 100644
index a9a2245..0000000
--- a/rpms/sugar/avoid-popping-an-empty-list-in-the-software-updater.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Date: Sun, 23 May 2010 14:50:16 -0400
-From: Michael Stone <michael@laptop.org>
-To: sugar-devel@lists.sugarlabs.org
-Subject: [Sugar-devel] [PATCH] Avoid popping an empty list in the software
- updater.
-
-When you run Sugar with no activities installed, UpdateModel._bundles_to_check
-is empty. Attempting to unconditionally pop this list results in an IndexError.
-Instead, the updater should stop trying to update bundles when it determines
-that it has no more bundles to check.
-
-Signed-off-by: Michael Stone <michael@laptop.org>
----
-  extensions/cpsection/updater/model.py |    2 ++
-  1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/extensions/cpsection/updater/model.py b/extensions/cpsection/updater/model.py
-index f2de65b..c45dcd3 100755
---- a/extensions/cpsection/updater/model.py
-+++ b/extensions/cpsection/updater/model.py
-@@ -71,6 +71,8 @@ class UpdateModel(gobject.GObject):
-         total = len(bundleregistry.get_registry())
-         current = total - len(self._bundles_to_check)
- 
-+        if len(self._bundles_to_check) == 0:
-+            return False
-         bundle = self._bundles_to_check.pop()
-         self.emit('progress', UpdateModel.ACTION_CHECKING, bundle.get_name(),
-                   current, total)
--- 
-1.7.1
-_______________________________________________
-Sugar-devel mailing list
-Sugar-devel@lists.sugarlabs.org
-http://lists.sugarlabs.org/listinfo/sugar-devel
-
diff --git a/rpms/sugar/microformat-updater.patch b/rpms/sugar/microformat-updater.patch
index ea30323..a97d747 100644
--- a/rpms/sugar/microformat-updater.patch
+++ b/rpms/sugar/microformat-updater.patch
@@ -158,10 +158,10 @@ index 9845371..3ec6888 100755
  
  class UpdateModel(gobject.GObject):
      __gtype_name__ = 'SugarUpdateModel'
-@@ -72,11 +71,11 @@ class UpdateModel(gobject.GObject):
+@@ -70,11 +69,11 @@ class UpdateModel(gobject.GObject):
+         total = len(bundleregistry.get_registry())
+         current = total - len(self._bundles_to_check)
  
-         if len(self._bundles_to_check) == 0:
-             return False
 -        bundle = self._bundles_to_check.pop()
 -        self.emit('progress', UpdateModel.ACTION_CHECKING, bundle.get_name(),
 -                  current, total)
diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec
index c29450d..c54e9d5 100644
--- a/rpms/sugar/sugar.spec
+++ b/rpms/sugar/sugar.spec
@@ -15,7 +15,8 @@ Patch1: dynamically-set-number-of-control-panel-columns.patch
 Patch2: click-on-journal-icons-with-a-exclusive-time-frame.patch
 Patch3: set-default-scaling-to-100.patch
 Patch4: fix-for-file-list-sorting-for-FAT32-formatted-flash-drives-in-journal.patch
-Patch5: avoid-popping-an-empty-list-in-the-software-updater.patch
+# superseded by anish's microformat upater
+#Patch5: avoid-popping-an-empty-list-in-the-software-updater.patch
 Patch6: simplify-the-definition-of-UpdateModel._bundles_to_check..patch
 Patch7: fix-duplication-of-OLPC-mesh-icons.patch
 Patch8: use-the-spanish-verb-quitar-for-unmounting-devices.patch
@@ -36,6 +37,7 @@ Patch23: sl1940-register-session-failed-fix.patch
 Patch24: sl328-disable-start-menu-options-for-unk-items.patch
 Patch25: sl1725-homewindow-resize-on-resolution-change.patch
 Patch26: sl2060-Copying-multiple-times-bogus-names.patch
+Patch27: tell-gconf-to-sync-after-the-intro-screen.patch
 
 # Andres' journal filesize enhancement
 Patch101: sizelist-0001-Journal-Retrieve-filesize-from-the-datastore.patch
@@ -162,7 +164,7 @@ multiple instances of sugar.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
+#%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -183,6 +185,7 @@ multiple instances of sugar.
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 
 %patch101 -p1
 %patch102 -p1
diff --git a/rpms/sugar/tell-gconf-to-sync-after-the-intro-screen.patch b/rpms/sugar/tell-gconf-to-sync-after-the-intro-screen.patch
new file mode 100644
index 0000000..e1d32a9
--- /dev/null
+++ b/rpms/sugar/tell-gconf-to-sync-after-the-intro-screen.patch
@@ -0,0 +1,28 @@
+From c8b6e3be9820482aee0ce8d02ec9c009d6a7a0e0 Mon Sep 17 00:00:00 2001
+From: Michael Stone <michael@laptop.org>
+Date: Sat, 4 Sep 2010 02:45:34 -0400
+Subject: [PATCH] Tell gconf to sync after the intro screen.
+Organization: Sugar Labs Foundation
+X-Subversion: sucks
+
+This way, we don't have to repeat the intro screen if we die soon after it
+ends, e.g., because of SIGINT.
+---
+ main/src/jarabe/intro/window.py |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/jarabe/intro/window.py b/src/jarabe/intro/window.py
+index 6fc27f7..23caef6 100644
+--- a/src/jarabe/intro/window.py
++++ b/src/jarabe/intro/window.py
+@@ -47,6 +47,7 @@ def create_profile(name, color=None, pixbuf=None):
+     client = gconf.client_get_default()
+     client.set_string("/desktop/sugar/user/nick", name)
+     client.set_string("/desktop/sugar/user/color", color.to_string())
++    client.suggest_sync()
+ 
+     # Generate keypair
+     import commands
+-- 
+1.7.3.2
+