diff options
| -rw-r--r-- | extensions/cpsection/network/view.py | 8 | ||||
| -rw-r--r-- | src/jarabe/desktop/groupbox.py | 4 | ||||
| -rw-r--r-- | src/jarabe/model/shell.py | 2 |
3 files changed, 4 insertions, 10 deletions
diff --git a/extensions/cpsection/network/view.py b/extensions/cpsection/network/view.py index e11d26a..ef28f00 100644 --- a/extensions/cpsection/network/view.py +++ b/extensions/cpsection/network/view.py @@ -23,8 +23,6 @@ from sugar.graphics import style from jarabe.controlpanel.sectionview import SectionView from jarabe.controlpanel.inlinealert import InlineAlert -from model import ReadError - CLASS = 'Network' ICON = 'module-network' TITLE = _('Network') @@ -172,7 +170,7 @@ class Network(SectionView): self._entry.set_text(self._model.get_jabber()) try: radio_state = self._model.get_radio() - except ReadError, detail: + except self._model.ReadError, detail: self._radio_alert.props.msg = detail self._radio_alert.show() else: @@ -206,7 +204,7 @@ class Network(SectionView): radio_state = widget.get_active() try: self._model.set_radio(radio_state) - except ReadError, detail: + except self._model.ReadError, detail: self._radio_alert.props.msg = detail self._radio_valid = False else: @@ -227,7 +225,7 @@ class Network(SectionView): return try: self._model.set_jabber(widget.get_text()) - except ReadError, detail: + except self._model.ReadError, detail: self._jabber_alert.props.msg = detail self._jabber_valid = False self._jabber_alert.show() diff --git a/src/jarabe/desktop/groupbox.py b/src/jarabe/desktop/groupbox.py index 5599d0c..1c1dd0c 100644 --- a/src/jarabe/desktop/groupbox.py +++ b/src/jarabe/desktop/groupbox.py @@ -17,13 +17,11 @@ import logging import gobject -import gtk import hippo import gconf from sugar.graphics import style -from sugar.graphics.icon import CanvasIcon, Icon -from sugar.graphics.palette import Palette +from sugar.graphics.icon import CanvasIcon from sugar.graphics.xocolor import XoColor from sugar.presence import presenceservice diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py index c418935..d0b256f 100644 --- a/src/jarabe/model/shell.py +++ b/src/jarabe/model/shell.py @@ -17,7 +17,6 @@ import logging import time -import os import gconf import wnck @@ -31,7 +30,6 @@ from sugar.graphics.xocolor import XoColor from sugar.presence import presenceservice from jarabe.model.bundleregistry import get_registry -from jarabe import config _SERVICE_NAME = "org.laptop.Activity" _SERVICE_PATH = "/org/laptop/Activity" |