diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-12-10 16:21:28 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@laptop.org> | 2013-01-22 09:14:00 (GMT) |
| commit | 7a3c6568835a40e0d322175a14fa1d79bc0cd27d (patch) | |
| tree | e13d34ad45f6858e724cd759b074c91994e6b3b6 | |
| parent | 668ba9a910a53740b4c84eadfddbfca04d105d72 (diff) | |
Move the sugar-session code inside jarabe
It's quite unexpected to find a large amount of code outside the
package. Also it's not really much of a "session", it starts a
couple of other processes maybe, but it mostly setups stuff and
initialize the UI.
Acked-by: Simon Schampijer <simon@laptop.org>
| -rw-r--r-- | bin/Makefile.am | 3 | ||||
| -rw-r--r-- | bin/sugar.in | 2 | ||||
| -rw-r--r-- | src/jarabe/Makefile.am | 3 | ||||
| -rwxr-xr-x | src/jarabe/main.py (renamed from bin/sugar-session) | 1 |
4 files changed, 4 insertions, 5 deletions
diff --git a/bin/Makefile.am b/bin/Makefile.am index 845816c..cb671da 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -2,8 +2,7 @@ python_scripts = \ sugar-control-panel \ sugar-emulator \ sugar-install-bundle \ - sugar-launch \ - sugar-session + sugar-launch bin_SCRIPTS = \ sugar \ diff --git a/bin/sugar.in b/bin/sugar.in index e7cb068..a2cee51 100644 --- a/bin/sugar.in +++ b/bin/sugar.in @@ -83,4 +83,4 @@ fi echo Xcursor.theme: sugar | xrdb -merge metacity --no-force-fullscreen -d $DISPLAY & -exec sugar-session +exec python -m jarabe.main diff --git a/src/jarabe/Makefile.am b/src/jarabe/Makefile.am index 84bb213..d926d9f 100644 --- a/src/jarabe/Makefile.am +++ b/src/jarabe/Makefile.am @@ -10,7 +10,8 @@ SUBDIRS = \ sugardir = $(pythondir)/jarabe sugar_PYTHON = \ - __init__.py + __init__.py \ + main.py nodist_sugar_PYTHON = config.py diff --git a/bin/sugar-session b/src/jarabe/main.py index 3c86f3e..0b18320 100755 --- a/bin/sugar-session +++ b/src/jarabe/main.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (C) 2006, Red Hat, Inc. # Copyright (C) 2009, One Laptop Per Child Association Inc # |