Move session stuff to his own package

This commit is contained in:
Marco Pesenti Gritti 2006-08-11 11:37:35 +02:00
parent 27456ff723
commit cb47f17b31
8 changed files with 13 additions and 9 deletions

View File

@ -30,6 +30,7 @@ activities/chat/Makefile
activities/terminal/Makefile
shell/Makefile
shell/data/Makefile
shell/session/Makefile
shell/PresenceService/Makefile
sugar/Makefile
sugar/__installed__.py

View File

@ -1,4 +1,4 @@
SUBDIRS = PresenceService data
SUBDIRS = data session PresenceService
bin_SCRIPTS = \
sugar \
@ -14,15 +14,12 @@ sugar_PYTHON = \
ActivitiesModel.py \
ActivityHost.py \
ActivityRegistry.py \
ChatController.py \
ChatController.py \
ConsoleWindow.py \
Emulator.py \
Owner.py \
HomeWindow.py \
PeopleWindow.py \
PresenceView.py \
Process.py \
Session.py \
Shell.py
EXTRA_DIST = sugar

View File

@ -3,7 +3,7 @@ import os
import socket
import sys
from Process import Process
from session.Process import Process
def get_display_number():
"""Find a free display number trying to connect to 6000+ ports"""

View File

@ -0,0 +1,6 @@
sugardir = $(pkgdatadir)/shell/session
sugar_PYTHON = \
__init__.py \
Emulator.py \
Process.py \
Session.py

View File

@ -7,7 +7,7 @@ import dbus.dbus_bindings
from sugar.presence import PresenceService
from Shell import Shell
from Process import Process
from session.Process import Process
import sugar.env
class DbusProcess(Process):

View File

View File

@ -76,7 +76,7 @@ registry = ActivityRegistry()
registry.scan_directory(activities_dest)
#registry.scan_directory(os.path.join(env.get_user_dir(), 'activities'))
from Emulator import Emulator
from session.Emulator import Emulator
# FIXE Don't run the emulator on the OLPC
emulator = Emulator()
@ -84,7 +84,7 @@ emulator.start()
print 'Redirecting output to the console, press F3 to open it.'
from Session import Session
from session.Session import Session
session = Session(registry)
session.start()