Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernie Innocenti <bernie@codewiz.org>2010-12-02 04:24:54 (GMT)
committer Bernie Innocenti <bernie@codewiz.org>2010-12-02 04:24:54 (GMT)
commit60027369f34da88504333aa2b661280c6a8d94c8 (patch)
treecbb9a6269595535c22928e471357f3c1240fc74c
parent90512a89886931072cef3ed004cbbbd5b432a696 (diff)
Tell gconf to sync after the intro screen
This way, we don't have to repeat the intro screen if we die soon after it ends, e.g., because of SIGINT.
-rw-r--r--rpms/sugar/sugar.spec2
-rw-r--r--rpms/sugar/tell-gconf-to-sync-after-the-intro-screen.patch28
2 files changed, 30 insertions, 0 deletions
diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec
index b12a96e..ea77b9e 100644
--- a/rpms/sugar/sugar.spec
+++ b/rpms/sugar/sugar.spec
@@ -37,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
@@ -184,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
+