diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-27 23:25:08 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-27 23:25:08 (GMT) |
| commit | 86bd6f50f0ad5eaaf2110e245c979687eb041d22 (patch) | |
| tree | 8517b74e5451ee070776576713b15273797cf335 /activities | |
| parent | 1d370ca8e5b8f4f4b863adb7bb9ea39fe885d284 (diff) | |
Use dbus activation to launch factories. This breaks
p-to-p chat and ./sugar/activities. Will fix tomorrow.
Diffstat (limited to 'activities')
| -rw-r--r-- | activities/browser/Makefile.am | 5 | ||||
| -rw-r--r-- | activities/browser/browser.activity | 2 | ||||
| -rw-r--r-- | activities/chat/Makefile.am | 5 | ||||
| -rw-r--r-- | activities/chat/chat.activity | 2 | ||||
| -rw-r--r-- | activities/terminal/Makefile.am | 9 | ||||
| -rw-r--r-- | activities/terminal/TerminalActivity.py (renamed from activities/terminal/terminal.py) | 0 | ||||
| -rw-r--r-- | activities/terminal/terminal.activity | 2 |
7 files changed, 8 insertions, 17 deletions
diff --git a/activities/browser/Makefile.am b/activities/browser/Makefile.am index 8cb2f84..da87461 100644 --- a/activities/browser/Makefile.am +++ b/activities/browser/Makefile.am @@ -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 diff --git a/activities/browser/browser.activity b/activities/browser/browser.activity index 631d79c..dcf4e43 100644 --- a/activities/browser/browser.activity +++ b/activities/browser/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 diff --git a/activities/chat/Makefile.am b/activities/chat/Makefile.am index b97f748..e77c345 100644 --- a/activities/chat/Makefile.am +++ b/activities/chat/Makefile.am @@ -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 diff --git a/activities/chat/chat.activity b/activities/chat/chat.activity index abf2cca..b42ba8a 100644 --- a/activities/chat/chat.activity +++ b/activities/chat/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 diff --git a/activities/terminal/Makefile.am b/activities/terminal/Makefile.am index a2a2397..03f3f61 100644 --- a/activities/terminal/Makefile.am +++ b/activities/terminal/Makefile.am @@ -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 diff --git a/activities/terminal/terminal.py b/activities/terminal/TerminalActivity.py index c9ee525..c9ee525 100644 --- a/activities/terminal/terminal.py +++ b/activities/terminal/TerminalActivity.py diff --git a/activities/terminal/terminal.activity b/activities/terminal/terminal.activity index f0e77c8..1f3e1e5 100644 --- a/activities/terminal/terminal.activity +++ b/activities/terminal/terminal.activity @@ -1,4 +1,4 @@ [Activity] name = Terminal id = org.sugar.Terminal -python_module = terminal.TerminalActivity +python_module = terminal.TerminalActivity.TerminalActivity |