diff options
| author | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-03 11:07:25 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-03 11:07:25 (GMT) |
| commit | 9cf0b08e7dab0f5a787e6b62d5f7aaf323044f79 (patch) | |
| tree | 9fcbbe0882cce67f909b9bbaafe7cfd0744cf10e | |
| parent | d0f20d466ed3bda2dee727da5137cd62703997d3 (diff) | |
Move schoolserver code inside the desktop module for now,
it's the only one using it.
| -rw-r--r-- | src/jarabe/desktop/Makefile.am | 1 | ||||
| -rw-r--r-- | src/jarabe/desktop/favoritesview.py | 9 | ||||
| -rw-r--r-- | src/jarabe/desktop/schoolserver.py (renamed from src/jarabe/hardware/schoolserver.py) | 0 | ||||
| -rw-r--r-- | src/jarabe/hardware/Makefile.am | 3 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/jarabe/desktop/Makefile.am b/src/jarabe/desktop/Makefile.am index c78648c..c7f425c 100644 --- a/src/jarabe/desktop/Makefile.am +++ b/src/jarabe/desktop/Makefile.am @@ -12,6 +12,7 @@ sugar_PYTHON = \ meshbox.py \ myicon.py \ proc_smaps.py \ + schoolserver.py \ snowflakelayout.py \ spreadlayout.py \ transitionbox.py diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py index 72df099..8f98f9b 100644 --- a/src/jarabe/desktop/favoritesview.py +++ b/src/jarabe/desktop/favoritesview.py @@ -33,14 +33,15 @@ from sugar import activity from jarabe.view import shell from jarabe.view.palettes import JournalPalette from jarabe.view.palettes import CurrentActivityPalette, ActivityPalette -from jarabe.desktop.myicon import MyIcon -from jarabe.desktop import favoriteslayout from jarabe.model import shellmodel -from jarabe.hardware import schoolserver -from jarabe.hardware.schoolserver import RegisterError from jarabe.controlpanel.gui import ControlPanel from jarabe.session import get_session_manager +from jarabe.desktop import schoolserver +from jarabe.desktop.schoolserver import RegisterError +from jarabe.desktop.myicon import MyIcon +from jarabe.desktop import favoriteslayout + _logger = logging.getLogger('FavoritesView') _ICON_DND_TARGET = ('activity-icon', gtk.TARGET_SAME_WIDGET, 0) diff --git a/src/jarabe/hardware/schoolserver.py b/src/jarabe/desktop/schoolserver.py index a9ed60b..a9ed60b 100644 --- a/src/jarabe/hardware/schoolserver.py +++ b/src/jarabe/desktop/schoolserver.py diff --git a/src/jarabe/hardware/Makefile.am b/src/jarabe/hardware/Makefile.am index 5c11a72..e341e7b 100644 --- a/src/jarabe/hardware/Makefile.am +++ b/src/jarabe/hardware/Makefile.am @@ -1,5 +1,4 @@ sugardir = $(pythondir)/jarabe/hardware sugar_PYTHON = \ __init__.py \ - hardwaremanager.py \ - schoolserver.py + hardwaremanager.py |