Use dbus activation to launch factories. This breaks

p-to-p chat and ./sugar/activities. Will fix tomorrow.
2006-07-28 01:25:08 +02:00
parent 1d370ca8e5
commit 86bd6f50f0
23 changed files with 186 additions and 86 deletions
@@ -6,7 +6,4 @@ sugar_PYTHON =			\
 	BrowserActivity.py      \
 	NavigationToolbar.py

-activitydir = $(pkgdatadir)/activities/browser
-activity_DATA = browser.activity
-
-EXTRA_DIST = $(activity_DATA)
+EXTRA_DIST = browser.activity
@@ -1,6 +1,6 @@
 [Activity]
 name = Web
 id = com.redhat.Sugar.BrowserActivity
-python_module = BrowserActivity.BrowserActivity
+python_module = browser.BrowserActivity.BrowserActivity
 default_type = _web_olpc._udp
 show_launcher = yes
@@ -3,7 +3,4 @@ sugar_PYTHON =			\
 	__init__.py		\
 	ChatActivity.py

-activitydir = $(pkgdatadir)/activities/chat
-activity_DATA = chat.activity
-
-EXTRA_DIST = $(activity_DATA)
+EXTRA_DIST = chat.activity
@@ -1,5 +1,5 @@
 [Activity]
 name = Chat
 id = com.redhat.Sugar.ChatActivity
-python_module = ChatActivity.ChatActivity
+python_module = chat.ChatActivity.ChatActivity
 default_type = _chat_activity._tcp
@@ -1,9 +1,6 @@
-sugardir = $(pkgdatadir)/activities/browser
+sugardir = $(pkgdatadir)/activities/terminal
 sugar_PYTHON =			\
 	__init__.py		\
-	terminal.py
+	TerminalActivity.py

-activitydir = $(pkgdatadir)/activities/browser
-activity_DATA = terminal.activity
-
-EXTRA_DIST = $(activity_DATA)
+EXTRA_DIST = terminal.activity
@@ -1,4 +1,4 @@
 [Activity]
 name = Terminal
 id = org.sugar.Terminal
-python_module = terminal.TerminalActivity
+python_module = terminal.TerminalActivity.TerminalActivity