Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpgritti@gmail.com>2008-09-28 13:55:57 (GMT)
committer Marco Pesenti Gritti <mpgritti@gmail.com>2008-09-28 13:55:57 (GMT)
commit46deb1ad0035f4c4cce2f7357054228241591660 (patch)
treeb19dbae0d2495693cdda4aab5d0d87dc61d5abcf /src
parent9df3286e8cdfa9124253a6505f378ca64a0dabd1 (diff)
Another few import fixes.
Diffstat (limited to 'src')
-rw-r--r--src/jarabe/main.py4
-rw-r--r--src/jarabe/view/frame/activitiestray.py1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/jarabe/main.py b/src/jarabe/main.py
index b4aae12..16f1a96 100644
--- a/src/jarabe/main.py
+++ b/src/jarabe/main.py
@@ -30,11 +30,11 @@ from sugar import logger
from sugar.profile import get_profile
from jarabe.view import Shell
-from shellservice import ShellService
+from jarabe.shellservice import ShellService
from jarabe.hardware import hardwaremanager
from jarabe.intro.window import IntroWindow
from jarabe.intro.window import create_profile
-from session import get_session_manager
+from jarabe.session import get_session_manager
from jarabe import logsmanager
from jarabe import config
diff --git a/src/jarabe/view/frame/activitiestray.py b/src/jarabe/view/frame/activitiestray.py
index 76b0a33..c461cce 100644
--- a/src/jarabe/view/frame/activitiestray.py
+++ b/src/jarabe/view/frame/activitiestray.py
@@ -35,6 +35,7 @@ from jarabe.view.palettes import JournalPalette, CurrentActivityPalette
from jarabe.view.pulsingicon import PulsingIcon
from jarabe.view.frame.frameinvoker import FrameWidgetInvoker
from jarabe.view.frame.notification import NotificationIcon
+from jarabe.view import Shell
import jarabe.view.frame.frame
class ActivityButton(RadioToolButton):