diff options
| author | James Cameron <james@dors.lan> | 2011-06-20 00:49:07 (GMT) |
|---|---|---|
| committer | James Cameron <quozl@laptop.org> | 2011-06-20 00:49:07 (GMT) |
| commit | e30a00226eedd2711aabf269e5147562d15562d0 (patch) | |
| tree | 509c413023d36e6f933a4d41520789f01355433c | |
| parent | 284a8c00c55efd3ba7e8f86c579928056b5260fd (diff) | |
fix incomplete merge of log-fixes-quozl
| -rw-r--r-- | logviewer.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/logviewer.py b/logviewer.py index 81f58ce..4cd15dd 100644 --- a/logviewer.py +++ b/logviewer.py @@ -364,7 +364,8 @@ class LogActivity(activity.Activity): # prevent title from being edited, and prevent keep activity_toolbar = activity_button.get_page() - activity_toolbar.title.set_sensitive(False) + if 'title' in activity_toolbar: + activity_toolbar.title.set_sensitive(False) activity_toolbar.keep.set_sensitive(False) separator = gtk.SeparatorToolItem() @@ -508,13 +509,6 @@ class CollectorPalette(Palette): send_button = gtk.Button(_('Capture 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) |