gconf key related changes|feedback and register menu option

* Add gconf key to enable disable showing the register menu option
  in the favourites view
* Feedback feature gconf related changes.
* Bump sugar version 0.88.1-5.51dxo

4 files changed, 260 insertions, 2 deletions

diff --git a/rpms/sugar/Show-register-gconf-value.patch b/rpms/sugar/Show-register-gconf-value.patch
new file mode 100644
index 0000000..d7d6938
--- /dev/null
+++ b/rpms/sugar/Show-register-gconf-value.patch
@@ -0,0 +1,75 @@
+From patchwork Thu Feb  3 16:13:15 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: Show register gconf value
+Date: Thu, 03 Feb 2011 21:13:15 -0000
+From: Martin Abente <martin.abente.lahaye@gmail.com>
+X-Patchwork-Id: 620
+Message-Id: <1296749595-22078-1-git-send-email-martin.abente.lahaye@gmail.com>
+To: dextrose@lists.sugarlabs.org,
+	abhishek.singh@olenepal.org
+
+Add a new gconf show_register value in the sugar scheme. This value
+determines whether or not the Register option will be displayed at
+the buddy icon palette.
+
+This is a request from Abhishek Singh at Nepal.
+Reviewed-by: Aleksey Lim <alsroot@activitycentral.org>
+
+---
+data/sugar.schemas.in               |   12 ++++++++++++
+ src/jarabe/desktop/favoritesview.py |   10 ++++++++--
+ 2 files changed, 20 insertions(+), 2 deletions(-)
+
+diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
+index 880c9d1..b79c5d1 100644
+--- a/data/sugar.schemas.in
++++ b/data/sugar.schemas.in
+@@ -260,6 +260,18 @@
+     </schema>
+ 
+     <schema>
++      <key>/schemas/desktop/sugar/show_register</key>
++      <applyto>/desktop/sugar/show_register</applyto>
++      <owner>sugar</owner>
++      <type>bool</type>
++      <default>true</default>
++      <locale name="C">
++        <short>Show Register</short>
++        <long>If TRUE, Sugar will show a "Register" 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/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
+index 2219be3..bab8cc9 100644
+--- a/src/jarabe/desktop/favoritesview.py
++++ b/src/jarabe/desktop/favoritesview.py
+@@ -630,6 +630,14 @@ class _MyIcon(MyIcon):
+         palette = BuddyMenu(owner)
+ 
+         client = gconf.client_get_default()
++        show_register = client.get_bool('/desktop/sugar/show_register')
++
++        if show_register:
++            self._create_register_menu(palette, client)
++
++        return palette
++
++    def _create_register_menu(self, palette, client):
+         backup_url = client.get_string('/desktop/sugar/backup_url')
+ 
+         if not backup_url:
+@@ -641,8 +649,6 @@ class _MyIcon(MyIcon):
+         palette.menu.append(self._register_menu)
+         self._register_menu.show()
+ 
+-        return palette
+-
+     def get_toplevel(self):
+         return hippo.get_canvas_for_item(self).get_toplevel()
+ 
diff --git a/rpms/sugar/sugar-1-2-Enable-disable-personalized-and-anonymous-feedback-submits-unrelated.patch b/rpms/sugar/sugar-1-2-Enable-disable-personalized-and-anonymous-feedback-submits-unrelated.patch
new file mode 100644
index 0000000..47b9dc4
--- /dev/null
+++ b/rpms/sugar/sugar-1-2-Enable-disable-personalized-and-anonymous-feedback-submits-unrelated.patch
@@ -0,0 +1,102 @@
+From patchwork Thu Feb  3 20:29:28 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [sugar,
+	1/2] Enable/disable personalized and anonymous feedback submits
+	unrelated
+Date: Fri, 04 Feb 2011 01:29:28 -0000
+From: Aleksey Lim <alsroot@member.fsf.org>
+X-Patchwork-Id: 624
+Message-Id: <1296764969-1545-2-git-send-email-alsroot@member.fsf.org>
+To: dextrose@lists.sugarlabs.org
+
+---
+ bin/sugar-session                 |    5 +++--
+ data/sugar.schemas.in             |   30 +++++++++++++++---------------
+ extensions/deviceicon/feedback.py |    2 +-
+ 3 files changed, 19 insertions(+), 18 deletions(-)
+
+
+diff --git a/bin/sugar-session b/bin/sugar-session
+index d4362ef..fd63386 100755
+--- a/bin/sugar-session
++++ b/bin/sugar-session
+@@ -238,11 +238,12 @@ def main():
+     client.set_string('/apps/metacity/general/mouse_button_modifier',
+                       '<Super>')
+ 
+-    if client.get_bool('/desktop/sugar/feedback/enabled'):
++    if client.get_bool('/desktop/sugar/feedback/personalized_submit') or \
++            client.get_int('/desktop/sugar/feedback/anonymous_delay'):
+         feedback_collector.start(
+                 client.get_string('/desktop/sugar/feedback/server_host'),
+                 client.get_int('/desktop/sugar/feedback/server_port'),
+-                client.get_int('/desktop/sugar/feedback/auto_submit_delay'))
++                client.get_int('/desktop/sugar/feedback/anonymous_delay'))
+ 
+     timezone = client.get_string('/desktop/sugar/date/timezone')
+     if timezone is not None and timezone:
+diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
+index 880c9d1..7e4a923 100644
+--- a/data/sugar.schemas.in
++++ b/data/sugar.schemas.in
+@@ -2,14 +2,25 @@
+ <gconfschemafile>
+   <schemalist>
+     <schema>
+-      <key>/schemas/desktop/sugar/feedback/enabled</key>
+-      <applyto>/desktop/sugar/feedback/enabled</applyto>
++      <key>/schemas/desktop/sugar/feedback/personalized_submit</key>
++      <applyto>/desktop/sugar/feedback/personalized_submit</applyto>
+       <owner>sugar</owner>
+       <type>bool</type>
+       <default>true</default>
+       <locale name="C">
+-        <short>Enable of disable feedback feature</short>
+-        <long>Setting value to false will disable any feedback reports.</long>
++        <short>Enable personalized submit</short>
++        <long>Show device icon to let pople submit text message with all collected data including detialed information about sumbitter.</long>
++      </locale>
++    </schema>
++    <schema>
++      <key>/schemas/desktop/sugar/feedback/anonymous_delay</key>
++      <applyto>/desktop/sugar/feedback/anonymous_delay</applyto>
++      <owner>sugar</owner>
++      <type>int</type>
++      <default>60</default>
++      <locale name="C">
++        <short>Delay in seconds to send anonymous reports automatically</short>
++        <long>Submit will not contain any information about submiter, only anonymous data (but see anonymous_with_sn). Setting value to 0 will disable automatic submiting.</long>
+       </locale>
+     </schema>
+     <schema>
+@@ -35,17 +46,6 @@
+       </locale>
+     </schema>
+     <schema>
+-      <key>/schemas/desktop/sugar/feedback/auto_submit_delay</key>
+-      <applyto>/desktop/sugar/feedback/auto_submit_delay</applyto>
+-      <owner>sugar</owner>
+-      <type>int</type>
+-      <default>60</default>
+-      <locale name="C">
+-        <short>Delay in seconds to send anonymous reports automatically</short>
+-        <long>Setting value to 0 will disable automatic submiting.</long>
+-      </locale>
+-    </schema>
+-    <schema>
+       <key>/schemas/desktop/sugar/user/nick</key>
+       <applyto>/desktop/sugar/user/nick</applyto>
+       <owner>sugar</owner>
+diff --git a/extensions/deviceicon/feedback.py b/extensions/deviceicon/feedback.py
+index ce3079c..2b52632 100644
+--- a/extensions/deviceicon/feedback.py
++++ b/extensions/deviceicon/feedback.py
+@@ -175,5 +175,5 @@ class _Window(gtk.Window):
+ 
+ def setup(tray):
+     client = gconf.client_get_default()
+-    if client.get_bool('/desktop/sugar/feedback/enabled'):
++    if client.get_bool('/desktop/sugar/feedback/personalized_submit'):
+         tray.add_device(DeviceView())
diff --git a/rpms/sugar/sugar-2-2-Send-XO-serial-numbers-with-anonymous-reports.patch b/rpms/sugar/sugar-2-2-Send-XO-serial-numbers-with-anonymous-reports.patch
new file mode 100644
index 0000000..6a1c068
--- /dev/null
+++ b/rpms/sugar/sugar-2-2-Send-XO-serial-numbers-with-anonymous-reports.patch
@@ -0,0 +1,67 @@
+From patchwork Thu Feb  3 20:29:29 2011
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [sugar,2/2] Send XO serial numbers with anonymous reports
+Date: Fri, 04 Feb 2011 01:29:29 -0000
+From: Aleksey Lim <alsroot@member.fsf.org>
+X-Patchwork-Id: 625
+Message-Id: <1296764969-1545-3-git-send-email-alsroot@member.fsf.org>
+To: dextrose@lists.sugarlabs.org
+
+---
+ data/sugar.schemas.in                  |   11 +++++++++++
+ src/jarabe/model/feedback_collector.py |   10 ++++++++--
+ 2 files changed, 19 insertions(+), 2 deletions(-)
+
+
+diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
+index 7e4a923..c3606f2 100644
+--- a/data/sugar.schemas.in
++++ b/data/sugar.schemas.in
+@@ -24,6 +24,17 @@
+       </locale>
+     </schema>
+     <schema>
++      <key>/schemas/desktop/sugar/feedback/anonymous_with_sn</key>
++      <applyto>/desktop/sugar/feedback/anonymous_with_sn</applyto>
++      <owner>sugar</owner>
++      <type>bool</type>
++      <default>false</default>
++      <locale name="C">
++        <short>Add XO serial numbers to anonymous submits</short>
++        <long>Add XO serial numbers to anonymous submits.</long>
++      </locale>
++    </schema>
++    <schema>
+       <key>/schemas/desktop/sugar/feedback/server_host</key>
+       <applyto>/desktop/sugar/feedback/server_host</applyto>
+       <owner>sugar</owner>
+diff --git a/src/jarabe/model/feedback_collector.py b/src/jarabe/model/feedback_collector.py
+index c0deae2..4671437 100644
+--- a/src/jarabe/model/feedback_collector.py
++++ b/src/jarabe/model/feedback_collector.py
+@@ -47,7 +47,7 @@ def start(host, port, auto_submit_delay):
+     _port = port
+ 
+     if auto_submit_delay > 0:
+-        gobject.timeout_add_seconds(auto_submit_delay, _submit)
++        gobject.timeout_add_seconds(auto_submit_delay, anonymous_submit)
+ 
+ 
+ def update(bundle_id, report, log_file):
+@@ -90,7 +90,13 @@ def submit(message):
+ 
+ 
+ def anonymous_submit():
+-    _submit()
++    from jarabe.journal import misc
++
++    data = {}
++    client = gconf.client_get_default()
++    if client.get_bool('/desktop/sugar/feedback/anonymous_with_sn'):
++        data['serial_number'] = misc.get_xo_serial()
++    _submit(data)
+ 
+ 
+ def _submit(data=None):
diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec
index 788b819..0da94e5 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.50dxo%{?dist}
+Release: 5.51dxo%{?dist}
 URL: http://sugarlabs.org/
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 
@@ -156,7 +156,12 @@ patch2401: Add-spanish-translations-and-update-POTFILES.patch
 #lease info
 patch2501: Add-lease-duration-information-in-about-my-computer.patch
 
-#lease info
+#feedback fixes
+patch2601: sugar-1-2-Enable-disable-personalized-and-anonymous-feedback-submits-unrelated.patch
+patch2602: sugar-2-2-Send-XO-serial-numbers-with-anonymous-reports.patch
+
+#Remove favourites-view|register via gconf
+patch2701: Show-register-gconf-value.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -350,6 +355,11 @@ multiple instances of sugar.
 
 %patch2501 -p1
 
+%patch2601 -p1
+%patch2602 -p1
+
+%patch2701 -p1
+
 %build
 autoreconf
 %configure
@@ -426,6 +436,10 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg
 
 %changelog
+* Thu Feb  3 2011 Anish Mangal <anish@sugarlabs.org> 0.88.1-5.51
+- Remove register option from favourites view via GConf
+- Feedback related fixes (new gconf keys)
+
 * Wed Feb  2 2011 Anish Mangal <anish@sugarlabs.org> 0.88.1-5.50
 - Add spanish translations
 - Display lease information