Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/Makefile.am1
-rw-r--r--shell/src/Makefile.am4
-rw-r--r--shell/src/activity.py (renamed from shell/example-activity/activity.py)0
-rwxr-xr-xshell/src/shell.py10
4 files changed, 10 insertions, 5 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am
new file mode 100644
index 0000000..af437a6
--- /dev/null
+++ b/shell/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = src
diff --git a/shell/src/Makefile.am b/shell/src/Makefile.am
new file mode 100644
index 0000000..604552a
--- /dev/null
+++ b/shell/src/Makefile.am
@@ -0,0 +1,4 @@
+sugardir = $(pythondir)/sugar
+sugar_PYTHON = \
+ activity.py \
+ shell.py
diff --git a/shell/example-activity/activity.py b/shell/src/activity.py
index 8ff6835..8ff6835 100644
--- a/shell/example-activity/activity.py
+++ b/shell/src/activity.py
diff --git a/shell/src/shell.py b/shell/src/shell.py
index 869f987..193c2a3 100755
--- a/shell/src/shell.py
+++ b/shell/src/shell.py
@@ -264,10 +264,10 @@ class ActivityContainer(dbus.service.Object):
i += 1
+def main():
+ session_bus = dbus.SessionBus()
+ service = dbus.service.BusName("com.redhat.Sugar.Shell", bus=session_bus)
-session_bus = dbus.SessionBus()
-service = dbus.service.BusName("com.redhat.Sugar.Shell", bus=session_bus)
+ activityContainer = ActivityContainer(service, session_bus)
-activityContainer = ActivityContainer(service, session_bus)
-
-gtk.main()
+ gtk.main()