1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
From 9e9f27c8398e5210e63d918d700f9c00f741111e Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Fri, 4 Feb 2011 01:29:28 +0000
Subject: [PATCH sugar 54/74] Enable/disable personalized and anonymous
feedback submits unrelated
---
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 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 @@ def __realize_cb(self, widget):
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())
--
1.7.6
|
