From cc561b474b5c3cf4efdafa59d6099bd1f8f1f2d8 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Fri, 4 Feb 2011 01:29:29 +0000
Subject: [PATCH 55/82] Send XO serial numbers with anonymous reports
Organization: Sugar Labs Foundation

---
 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 637422e..fb18d19 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 5e92fbd..93fa704 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):
-- 
1.7.4.4