diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-08-11 09:37:35 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-08-11 09:37:35 (GMT) |
commit | cb47f17b31dde57823d46d974e983aa7fe7cad98 (patch) | |
tree | d97b9c32ab156a4052b49c6e90b37d53ca95c011 /shell | |
parent | 27456ff7231b65ffc4409f76b167110e32790626 (diff) |
Move session stuff to his own package
Diffstat (limited to 'shell')
-rw-r--r-- | shell/Makefile.am | 7 | ||||
-rw-r--r-- | shell/session/Emulator.py (renamed from shell/Emulator.py) | 2 | ||||
-rw-r--r-- | shell/session/Makefile.am | 6 | ||||
-rw-r--r-- | shell/session/Process.py (renamed from shell/Process.py) | 0 | ||||
-rw-r--r-- | shell/session/Session.py (renamed from shell/Session.py) | 2 | ||||
-rw-r--r-- | shell/session/__init__.py | 0 | ||||
-rwxr-xr-x | shell/sugar | 4 |
7 files changed, 12 insertions, 9 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 82812dd..5642a4a 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -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 diff --git a/shell/Emulator.py b/shell/session/Emulator.py index 89a20fc..d70059d 100644 --- a/shell/Emulator.py +++ b/shell/session/Emulator.py @@ -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""" diff --git a/shell/session/Makefile.am b/shell/session/Makefile.am new file mode 100644 index 0000000..c95c6cb --- /dev/null +++ b/shell/session/Makefile.am @@ -0,0 +1,6 @@ +sugardir = $(pkgdatadir)/shell/session +sugar_PYTHON = \ + __init__.py \ + Emulator.py \ + Process.py \ + Session.py diff --git a/shell/Process.py b/shell/session/Process.py index 09d93a7..09d93a7 100644 --- a/shell/Process.py +++ b/shell/session/Process.py diff --git a/shell/Session.py b/shell/session/Session.py index 985f1af..8131c1d 100644 --- a/shell/Session.py +++ b/shell/session/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): diff --git a/shell/session/__init__.py b/shell/session/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/shell/session/__init__.py diff --git a/shell/sugar b/shell/sugar index 73e7bc1..47c1225 100755 --- a/shell/sugar +++ b/shell/sugar @@ -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() |