From 9011a49e494e87addd37d0bb7bc0b213f3883cd9 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Fri, 16 Jan 2009 13:27:57 +0000
Subject: pylint fixes

detected an error in the restart jabber
---
(limited to 'extensions')

diff --git a/extensions/cpsection/network/model.py b/extensions/cpsection/network/model.py
index bfb9686..1b67942 100644
--- a/extensions/cpsection/network/model.py
+++ b/extensions/cpsection/network/model.py
@@ -45,7 +45,7 @@ def set_jabber(server):
     client = gconf.client_get_default()
     client.set_string('/desktop/sugar/collaboration/jabber_server', server)
 
-    self._restart_jabber()
+    _restart_jabber()
     return 0
 
 def _restart_jabber():
@@ -58,7 +58,8 @@ def _restart_jabber():
     _PS_PATH = "/org/laptop/Sugar/Presence"
     bus = dbus.SessionBus()
     try:
-        ps = dbus.Interface(bus.get_object(_PS_SERVICE, _PS_PATH), _PS_INTERFACE)
+        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()
diff --git a/extensions/cpsection/network/view.py b/extensions/cpsection/network/view.py
index 31a4f72..d0bd755 100644
--- a/extensions/cpsection/network/view.py
+++ b/extensions/cpsection/network/view.py
@@ -225,7 +225,7 @@ class Network(SectionView):
             return
         try:
             self._model.set_jabber(widget.get_text())
-        except ReadError, detail:
+        except Exception, detail:
             self._jabber_alert.props.msg = detail
             self._jabber_valid = False
             self._jabber_alert.show()
--
cgit v0.9.1