Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activities/Makefile.am2
-rw-r--r--activities/terminal/Makefile.am9
-rw-r--r--activities/terminal/__init__.py0
-rw-r--r--activities/terminal/terminal.activity (renamed from examples/terminal/terminal.activity)0
-rw-r--r--activities/terminal/terminal.py (renamed from examples/terminal/terminal.py)4
-rw-r--r--configure.ac1
6 files changed, 13 insertions, 3 deletions
diff --git a/activities/Makefile.am b/activities/Makefile.am
index 0347678..84bfa85 100644
--- a/activities/Makefile.am
+++ b/activities/Makefile.am
@@ -1 +1 @@
-SUBDIRS = browser chat
+SUBDIRS = browser chat terminal
diff --git a/activities/terminal/Makefile.am b/activities/terminal/Makefile.am
new file mode 100644
index 0000000..a2a2397
--- /dev/null
+++ b/activities/terminal/Makefile.am
@@ -0,0 +1,9 @@
+sugardir = $(pkgdatadir)/activities/browser
+sugar_PYTHON = \
+ __init__.py \
+ terminal.py
+
+activitydir = $(pkgdatadir)/activities/browser
+activity_DATA = terminal.activity
+
+EXTRA_DIST = $(activity_DATA)
diff --git a/activities/terminal/__init__.py b/activities/terminal/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/activities/terminal/__init__.py
diff --git a/examples/terminal/terminal.activity b/activities/terminal/terminal.activity
index f0e77c8..f0e77c8 100644
--- a/examples/terminal/terminal.activity
+++ b/activities/terminal/terminal.activity
diff --git a/examples/terminal/terminal.py b/activities/terminal/terminal.py
index eca10a7..c9ee525 100644
--- a/examples/terminal/terminal.py
+++ b/activities/terminal/terminal.py
@@ -51,8 +51,8 @@ class Terminal(gtk.HBox):
pass
class TerminalActivity(Activity):
- def __init__(self, args):
- Activity.__init__(self, _TERMINAL_ACTIVITY_TYPE)
+ def __init__(self, service, args):
+ Activity.__init__(self, service)
self.set_title("Terminal")
diff --git a/configure.ac b/configure.ac
index f93ea48..d9be8cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,7 @@ Makefile
activities/Makefile
activities/browser/Makefile
activities/chat/Makefile
+activities/terminal/Makefile
shell/Makefile
shell/data/Makefile
shell/PresenceService/Makefile