[Dextrose] [PATCH sugar 1/2] Enable/disable personalized and anonymous feedback submits unrelated

[Anish Mangal]

Committed to dextrose/mainline

http://git.sugarlabs.org/dextrose/mainline/commit/ddcfc0d86e4483fdd4d990645018ced3217a0b2d

Thanks for working on this!

Reviewed-by: Anish Mangal <anish at activitycentral.org>
Acked-by: Anish Mangal <anish at activitycentral.org>

On Thu, Feb 3, 2011 at 17:29, Aleksey Lim <alsroot at member.fsf.org> wrote:
> ---
>  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>false</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 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())
> --
> 1.7.3.4
>
> _______________________________________________
> Dextrose mailing list
> Dextrose at lists.sugarlabs.org
> http://lists.sugarlabs.org/listinfo/dextrose
>



-- 
Anish