Move session stuff to his own package
This commit is contained in:
parent
27456ff723
commit
cb47f17b31
@ -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
|
||||
|
@ -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
|
||||
|
@ -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"""
|
6
shell/session/Makefile.am
Normal file
6
shell/session/Makefile.am
Normal file
@ -0,0 +1,6 @@
|
||||
sugardir = $(pkgdatadir)/shell/session
|
||||
sugar_PYTHON = \
|
||||
__init__.py \
|
||||
Emulator.py \
|
||||
Process.py \
|
||||
Session.py
|
@ -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):
|
0
shell/session/__init__.py
Normal file
0
shell/session/__init__.py
Normal 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()
|
||||
|
Loading…
Reference in New Issue
Block a user