Merge commit 'refs/merge-requests/1' of git://git.sugarlabs.org/~RafaelOrtiz/log/log-fixes into quozl-fixesHEADmaster

2 files changed, 13 insertions, 8 deletions

diff --git a/logcollect.py b/logcollect.py
index 8713048..a1251a4 100644
--- a/logcollect.py
+++ b/logcollect.py
@@ -484,10 +484,8 @@ if sys.argv[0].endswith('logcollect.py') or \
         print """logcollect.py - send your XO logs to OLPC
         
 Usage:
-    logcollect.py http  - send logs to default server
-    
     logcollect.py http://server.name/submit.php
-                         - submit logs to alternative server
+                         - submit logs to a server
                          
     logcollect.py file:/media/xxxx-yyyy/mylog.zip
                          - save the zip file on a USB device or SD card
@@ -536,7 +534,8 @@ Usage:
     if mode.startswith('http'):
         print "Trying to send the logs using HTTP (web)"
         if len(mode) == 4:
-            url = 'http://olpc.scheffers.net/olpc/submit.tcl'
+            print "No default log destination, aborting"
+            sys.exit(1)
         else:
             url = mode
             
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