Promote terminal activity from terminal to activities. Fix api

activities/Makefile.am

@@ -1 +1 @@
-SUBDIRS = browser chat
+SUBDIRS = browser chat terminal

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)

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")
 

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