Better patrch to restore the Restart option

3 files changed, 55 insertions, 31 deletions

diff --git a/rpms/sugar/restart-option.patch b/rpms/sugar/restart-option.patch
new file mode 100644
index 0000000..1a4dfde
--- /dev/null
+++ b/rpms/sugar/restart-option.patch
@@ -0,0 +1,53 @@
+From c19e92c91bb55740069db635b44ffd58f08331dd Mon Sep 17 00:00:00 2001
+From: James Cameron <quozl@laptop.org>
+Date: Thu, 19 Aug 2010 08:43:33 +1000
+Subject: [PATCH] revert earlier fix to #1206 and use gconf
+
+---
+ data/sugar.schemas.in        |   12 ++++++++++++
+ src/jarabe/view/buddymenu.py |    6 ++++++
+ 2 files changed, 18 insertions(+), 0 deletions(-)
+
+diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
+index 2e6b820..d9a3954 100644
+--- a/data/sugar.schemas.in
++++ b/data/sugar.schemas.in
+@@ -192,6 +192,18 @@
+     </schema>
+ 
+     <schema>
++      <key>/schemas/desktop/sugar/show_restart</key>
++      <applyto>/desktop/sugar/show_restart</applyto>
++      <owner>sugar</owner>
++      <type>bool</type>
++      <default>true</default>
++      <locale name="C">
++        <short>Show Restart</short>
++        <long>If TRUE, Sugar will show a "Restart" option.</long>
++      </locale>
++    </schema>
++
++    <schema>
+       <key>/schemas/desktop/sugar/peripherals/keyboard/layouts</key>
+       <applyto>/desktop/sugar/peripherals/keyboard/layouts</applyto>
+       <owner>sugar</owner>
+diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py
+index 4637751..5592eee 100644
+--- a/src/jarabe/view/buddymenu.py
++++ b/src/jarabe/view/buddymenu.py
+@@ -86,6 +86,12 @@ class BuddyMenu(Palette):
+ 
+         client = gconf.client_get_default()
+ 
++        if client.get_bool('/desktop/sugar/show_restart'):
++            item = MenuItem(_('Restart'), 'system-restart')
++            item.connect('activate', self.__reboot_activate_cb)
++            self.menu.append(item)
++            item.show()
++
+         if client.get_bool('/desktop/sugar/show_logout'):
+             item = MenuItem(_('Logout'), 'system-logout')
+             item.connect('activate', self.__logout_activate_cb)
+-- 
+1.7.1
+
diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec
index 22df3a4..53bdb11 100644
--- a/rpms/sugar/sugar.spec
+++ b/rpms/sugar/sugar.spec
@@ -3,7 +3,7 @@
 Summary: Constructionist learning platform
 Name: sugar
 Version: 0.88.1
-Release: 5.34dxo%{?dist}
+Release: 5.35dxo%{?dist}
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 
@@ -66,7 +66,7 @@ Patch509: sl1610-default-ad-hoc-networks.patch
 # tch experimental patches
 patch601: bundle-Delete-profile-data-only-when-erased.patch
 patch602: caacupe-Protected-activities-list.patch
-patch603: tch-Add-missing-restart-button.patch
+patch603: restart-option.patch
 
 # Accessibility
 patch701: accessibility_0001_cp_accessibility_keyboard.patch
diff --git a/rpms/sugar/tch-Add-missing-restart-button.patch b/rpms/sugar/tch-Add-missing-restart-button.patch
deleted file mode 100644
index baac267..0000000
--- a/rpms/sugar/tch-Add-missing-restart-button.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 25d05d8936e73ed04371b286a008da5866d33958 Mon Sep 17 00:00:00 2001
-From: Martin Abente <mabente@paraguayeduca.org>
-Date: Thu, 15 Jul 2010 11:43:17 -0400
-Subject: [PATCH] Add missing restart button
-Organization: Paraguay Educa
-
----
- src/jarabe/view/buddymenu.py |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py
-index 4637751..e21b617 100644
---- a/src/jarabe/view/buddymenu.py
-+++ b/src/jarabe/view/buddymenu.py
-@@ -84,6 +84,11 @@ class BuddyMenu(Palette):
-         self.menu.append(item)
-         item.show()
- 
-+        item = MenuItem(_('Restart'), 'system-restart')
-+        item.connect('activate', self.__reboot_activate_cb)
-+        self.menu.append(item)
-+        item.show()
-+
-         client = gconf.client_get_default()
- 
-         if client.get_bool('/desktop/sugar/show_logout'):
--- 
-1.6.0.4
-