diff options
author | James Cameron <quozl@laptop.org> | 2011-03-30 22:18:37 (GMT) |
---|---|---|
committer | Gonzalo Odiard <godiard@sugarlabs.org> | 2011-05-26 21:08:17 (GMT) |
commit | 923e76f1260c501c8b2b84e8744bff915966f541 (patch) | |
tree | 4df841517def17f280441b8b77901a22ca86bf25 | |
parent | a397668fd2935e3aa0832023ac43cd2b1a41c99a (diff) |
disable send information button if default server not set, #2277
Disables the sending of log information to third-party web site that is
no longer available.
Adds two gconf settings for deployments or builders who may wish to
re-enable this feature. An enable key is required, as well as a string
for the server URL.
Reviewed-by: Rafael Ortiz <rafael@activitycentral.com>
Signed-off-by: James Cameron <quozl@laptop.org>
-rw-r--r-- | logviewer.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/logviewer.py b/logviewer.py index cdd77ed..07f6a11 100644 --- a/logviewer.py +++ b/logviewer.py @@ -24,7 +24,8 @@ import re import gtk import pango import gobject -import gio +import gio +import gconf from sugar.activity import activity from sugar import env @@ -476,8 +477,6 @@ class LogActivity(activity.Activity): self.collector_palette.popup(True) class CollectorPalette(Palette): - _DEFAULT_SERVER = 'http://olpc.scheffers.net/olpc/submit.tcl' - def __init__(self, handler): Palette.__init__(self, _('Log Collector: Send XO information')) @@ -492,6 +491,13 @@ class CollectorPalette(Palette): send_button = gtk.Button(_('Send information')) send_button.connect('clicked', self._on_send_button_clicked_cb) + client = gconf.client_get_default() + if client.get_bool('/desktop/sugar/privacy/log_send_enable'): + self._default_server = \ + client.get_string('/desktop/sugar/privacy/log_send_server') + else: + send_button.set_sensitive(False) + self._default_server = None vbox = gtk.VBox(False, 5) vbox.pack_start(label) @@ -505,7 +511,7 @@ class CollectorPalette(Palette): try: data = self._collector.write_logs() sender = LogSend() - success = sender.http_post_logs(self._DEFAULT_SERVER, data) + success = sender.http_post_logs(self._default_server, data) except: success = False |