Merge branch 'master' of git://git.sugarlabs.org/sugar/mainline

8 files changed, 40 insertions, 23 deletions

diff --git a/extensions/cpsection/Makefile.am b/extensions/cpsection/Makefile.am
index 0e69fd1..73e5164 100644
--- a/extensions/cpsection/Makefile.am
+++ b/extensions/cpsection/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = aboutme aboutxo datetime frame language network power
+SUBDIRS = aboutme aboutcomputer datetime frame language network power
 
 sugardir = $(pkgdatadir)/extensions/cpsection
 sugar_PYTHON = __init__.py
diff --git a/extensions/cpsection/aboutcomputer/Makefile.am b/extensions/cpsection/aboutcomputer/Makefile.am
new file mode 100644
index 0000000..a3bdec8
--- /dev/null
+++ b/extensions/cpsection/aboutcomputer/Makefile.am
@@ -0,0 +1,6 @@
+sugardir = $(pkgdatadir)/extensions/cpsection/aboutcomputer
+
+sugar_PYTHON = 		\
+	__init__.py	\
+	model.py	\
+	view.py		
diff --git a/extensions/cpsection/aboutxo/__init__.py b/extensions/cpsection/aboutcomputer/__init__.py
index 4dc2cb2..ceb515a 100644
--- a/extensions/cpsection/aboutxo/__init__.py
+++ b/extensions/cpsection/aboutcomputer/__init__.py
@@ -16,7 +16,7 @@
 
 from gettext import gettext as _
 
-CLASS = 'AboutXO'
-ICON = 'module-about_my_xo'
-TITLE = _('About my XO')
+CLASS = 'AboutComputer'
+ICON = 'module-about_my_computer'
+TITLE = _('About my Computer')
 
diff --git a/extensions/cpsection/aboutxo/model.py b/extensions/cpsection/aboutcomputer/model.py
index 4b5b27e..5d53f54 100644
--- a/extensions/cpsection/aboutxo/model.py
+++ b/extensions/cpsection/aboutcomputer/model.py
@@ -21,16 +21,16 @@ import re
 import subprocess
 from gettext import gettext as _
 
-_logger = logging.getLogger('ControlPanel - AboutXO')
+_logger = logging.getLogger('ControlPanel - AboutComputer')
 _not_available = _('Not available')
 
-def get_aboutxo():        
+def get_aboutcomputer():
     msg = 'Serial Number: %s \nBuild Number: %s \nFirmware Number: %s \n' \
             % (get_serial_number(), get_build_number(), get_firmware_number())
     return msg
 
-def print_aboutxo():
-    print get_aboutxo()
+def print_aboutcomputer():
+    print get_aboutcomputer()
 
 def get_serial_number():
     serial_no = _read_file('/ofw/serial-number')
@@ -115,4 +115,3 @@ def get_license():
     except IOError:
         license_text = _not_available
     return license_text
-
diff --git a/extensions/cpsection/aboutxo/view.py b/extensions/cpsection/aboutcomputer/view.py
index bd2f27f..f9dfe93 100644
--- a/extensions/cpsection/aboutxo/view.py
+++ b/extensions/cpsection/aboutcomputer/view.py
@@ -23,7 +23,7 @@ from sugar.graphics import style
 
 from jarabe.controlpanel.sectionview import SectionView
 
-class AboutXO(SectionView):
+class AboutComputer(SectionView):
     def __init__(self, model, alerts=None):
         SectionView.__init__(self)
 
diff --git a/extensions/cpsection/aboutxo/Makefile.am b/extensions/cpsection/aboutxo/Makefile.am
deleted file mode 100644
index 3f71af0..0000000
--- a/extensions/cpsection/aboutxo/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-sugardir = $(pkgdatadir)/extensions/cpsection/aboutxo
-
-sugar_PYTHON = 		\
-	__init__.py	\
-	model.py	\
-	view.py		
diff --git a/extensions/cpsection/network/model.py b/extensions/cpsection/network/model.py
index bfd008a..bfb9686 100644
--- a/extensions/cpsection/network/model.py
+++ b/extensions/cpsection/network/model.py
@@ -44,7 +44,24 @@ def set_jabber(server):
     """
     client = gconf.client_get_default()
     client.set_string('/desktop/sugar/collaboration/jabber_server', server)
-    return 1
+
+    self._restart_jabber()
+    return 0
+
+def _restart_jabber():
+    """Call Sugar Presence Service to restart Telepathy CMs.
+
+    This allows restarting the jabber server connection when we change it.
+    """
+    _PS_SERVICE = "org.laptop.Sugar.Presence"
+    _PS_INTERFACE = "org.laptop.Sugar.Presence"
+    _PS_PATH = "/org/laptop/Sugar/Presence"
+    bus = dbus.SessionBus()
+    try:
+        ps = dbus.Interface(bus.get_object(_PS_SERVICE, _PS_PATH), _PS_INTERFACE)
+    except dbus.DBusException:
+        raise ReadError('%s service not available', _PS_SERVICE)
+    ps.RestartServerConnection()
 
 def get_radio():
     bus = dbus.SystemBus()
diff --git a/extensions/cpsection/network/view.py b/extensions/cpsection/network/view.py
index 9a7f387..31a4f72 100644
--- a/extensions/cpsection/network/view.py
+++ b/extensions/cpsection/network/view.py
@@ -27,6 +27,8 @@ CLASS = 'Network'
 ICON = 'module-network'
 TITLE = _('Network')
 
+_APPLY_TIMEOUT = 3000
+
 class Network(SectionView):
     def __init__(self, model, alerts):
         SectionView.__init__(self)
@@ -214,7 +216,7 @@ class Network(SectionView):
     def __jabber_changed_cb(self, widget, data=None):        
         if self._jabber_sid:
             gobject.source_remove(self._jabber_sid)
-        self._jabber_sid = gobject.timeout_add(self._APPLY_TIMEOUT, 
+        self._jabber_sid = gobject.timeout_add(_APPLY_TIMEOUT, 
                                                self.__jabber_timeout_cb, widget)
                 
     def __jabber_timeout_cb(self, widget):        
@@ -223,17 +225,16 @@ class Network(SectionView):
             return
         try:
             self._model.set_jabber(widget.get_text())
-        except ValueError, detail:
+        except ReadError, detail:
             self._jabber_alert.props.msg = detail
             self._jabber_valid = False
+            self._jabber_alert.show()
+            self.restart_alerts.append('jabber')
         else:
-            self._jabber_alert.props.msg = self.restart_msg
             self._jabber_valid = True            
-            self.needs_restart = True
-            self.restart_alerts.append('jabber')            
+            self._jabber_alert.hide()
 
         self._validate()
-        self._jabber_alert.show()        
         return False
 
     def __network_configuration_reset_cb(self, widget):