Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/rpms/sugar/0059-Do-not-send-empty-feedback-reports-if-anonymous_with.patch
diff options
context:
space:
mode:
Diffstat (limited to 'rpms/sugar/0059-Do-not-send-empty-feedback-reports-if-anonymous_with.patch')
-rw-r--r--rpms/sugar/0059-Do-not-send-empty-feedback-reports-if-anonymous_with.patch66
1 files changed, 66 insertions, 0 deletions
diff --git a/rpms/sugar/0059-Do-not-send-empty-feedback-reports-if-anonymous_with.patch b/rpms/sugar/0059-Do-not-send-empty-feedback-reports-if-anonymous_with.patch
new file mode 100644
index 0000000..6e29242
--- /dev/null
+++ b/rpms/sugar/0059-Do-not-send-empty-feedback-reports-if-anonymous_with.patch
@@ -0,0 +1,66 @@
+From 2ef6c6d0fc0cf10698a28880b89208b85f0b32e7 Mon Sep 17 00:00:00 2001
+From: Aleksey Lim <alsroot@activitycentral.org>
+Date: Sat, 12 Feb 2011 07:17:17 +0000
+Subject: [PATCH sugar 59/74] Do not send empty feedback reports if
+ anonymous_with_sn is enabled
+
+---
+ src/jarabe/model/feedback_collector.py | 24 +++++++++++++-----------
+ 1 files changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/src/jarabe/model/feedback_collector.py b/src/jarabe/model/feedback_collector.py
+index e239c9a..95dc4ee 100644
+--- a/src/jarabe/model/feedback_collector.py
++++ b/src/jarabe/model/feedback_collector.py
+@@ -49,7 +49,8 @@ def start(host, port, auto_submit_delay):
+ _port = port
+
+ if auto_submit_delay > 0:
+- gobject.timeout_add_seconds(auto_submit_delay, anonymous_submit, True)
++ logging.debug('Feedback auto submit with %ss delay', auto_submit_delay)
++ gobject.timeout_add_seconds(auto_submit_delay, _auto_submit_cb)
+
+
+ def update(bundle_id, report, log_file):
+@@ -88,27 +89,28 @@ def submit(message):
+ 'nick': '',
+ 'jabber_server': jabber,
+ }
+- _submit(data, False)
++ _reports.update(data)
++ _submit(False)
+
+
+ def anonymous_submit(implicit=False):
++ if is_empty():
++ return
++
+ 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, implicit)
++ _reports['serial_number'] = misc.get_xo_serial()
++ _submit(implicit)
+
+- return True
+
++def _auto_submit_cb():
++ anonymous_submit()
++ return True
+
+-def _submit(data, implicit):
+- if data:
+- _reports.update(data)
+- if is_empty():
+- return
+
++def _submit(implicit):
+ logging.debug('Sending feedback report: %r', _reports)
+
+ report = simplejson.dumps(_reports)
+--
+1.7.6
+