Additions and changes to 'sugar-toolkit' 0.88.1-4.10

* Update sugar-toolkit.spec
* Add namingalert being optional

2 files changed, 39 insertions, 1 deletions

diff --git a/rpms/sugar-toolkit/namingalert_being_optional.patch b/rpms/sugar-toolkit/namingalert_being_optional.patch
new file mode 100644
index 0000000..5781492
--- /dev/null
+++ b/rpms/sugar-toolkit/namingalert_being_optional.patch
@@ -0,0 +1,30 @@
+From c3b9b8e3699b705514b62593098e6d19155d8af6 Mon Sep 17 00:00:00 2001
+From: Martin Abente <martin.abente.lahaye@gmail.org>
+Date: Tue, 2 Nov 2010 15:11:26 -0300
+Subject: [PATCH] STK non-intrusive NamingAlert
+
+Use a gconf value to determine when or not to
+show NamingAlert when an activity close.
+---
+ src/sugar/activity/activity.py |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py
+index 0e2ecc5..5337a87 100644
+--- a/src/sugar/activity/activity.py
++++ b/src/sugar/activity/activity.py
+@@ -804,7 +804,10 @@ class Activity(Window, gtk.Container):
+         if not self.can_close():
+             return
+ 
+-        if skip_save or self._jobject is None or \
++        client = gconf.client_get_default()
++        show_alert = client.get_bool('/desktop/sugar/show_naming_alert')
++
++        if not show_alert or skip_save or self._jobject is None or \
+                 self.metadata.get('title_set_by_user', '0') == '1':
+             if not self._closing:
+                 if not self._prepare_close(skip_save):
+-- 
+1.7.1
+
diff --git a/rpms/sugar-toolkit/sugar-toolkit.spec b/rpms/sugar-toolkit/sugar-toolkit.spec
index 43a3014..1f2ed82 100644
--- a/rpms/sugar-toolkit/sugar-toolkit.spec
+++ b/rpms/sugar-toolkit/sugar-toolkit.spec
@@ -3,7 +3,7 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.88.1
-Release: 4.8dxo%{?dist}
+Release: 4.10dxo%{?dist}
 URL: http://wiki.laptop.org/go/Sugar
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 Source1: macros.sugar
@@ -36,6 +36,9 @@ Patch301: keep_a_copy_translation_missing.patch
 # esteban experimental patches
 Patch401: accessibility_0001_style-contrast.patch
 
+#NamingAlert being optional
+Patch501: namingalert_being_optional.patch
+
 License: LGPLv2+
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -91,6 +94,8 @@ to interact with system services like presence and the datastore.
 
 %patch401 -p1
 
+%patch501 -p1
+
 %build
 %configure
 make %{?_smp_mflags} V=1
@@ -118,6 +123,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Mon Jan 10 2011 Anish Mangal <anish@sugarlabs.org> - 0.88.1-4.10
+- Add 'NamingAlert being optional' (patch501)
+
 * Wed Sep 22 2010 Steven M. Parrish <smparrish@gmail.com> - 0.88.1-2
 - Add gettext requires