Enable/disable personalized and anonymous feedback submits unrelated

3 files changed, 19 insertions, 18 deletions

diff --git a/bin/sugar-session b/bin/sugar-session
index 8e83d52..ee0048d 100755
--- a/bin/sugar-session
+++ b/bin/sugar-session
@@ -242,11 +242,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 eecd1d8..637422e 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>0</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>0</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 4f5198f..49db09b 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())