Rename the clipboard service as shell service.

12 files changed, 11 insertions, 9 deletions

diff --git a/services/Makefile.am b/services/Makefile.am
index 7d8e351..e230030 100644
--- a/services/Makefile.am
+++ b/services/Makefile.am
@@ -1 +1 @@
-SUBDIRS = clipboard console
+SUBDIRS = shell console
diff --git a/services/clipboard/Makefile.am b/services/shell/Makefile.am
index 6d2cd9c..b34b974 100644
--- a/services/clipboard/Makefile.am
+++ b/services/shell/Makefile.am
@@ -19,17 +19,19 @@ org.laptop.Clipboard.service: org.laptop.Clipboard.service.in Makefile
 org.laptop.ObjectTypeRegistry.service: org.laptop.ObjectTypeRegistry.service.in Makefile
 	@sed -e "s|\@bindir\@|$(bindir)|" $< > $@
 
-sugardir = $(pkgdatadir)/services/clipboard
+sugardir = $(pkgdatadir)/services/shell
 
 sugar_PYTHON =				\
 	__init__.py			\
 	activityregistryservice.py	\
+	bundleregistry.py		\
 	clipboardobject.py      	\
 	clipboardservice.py     	\
 	objecttypeservice.py
 
-bin_SCRIPTS = sugar-clipboard
+bin_SCRIPTS = sugar-shell-service
 
 DISTCLEANFILES = $(service_DATA)
 
 EXTRA_DIST = $(service_in_files) $(bin_SCRIPTS)
+
diff --git a/services/clipboard/__init__.py b/services/shell/__init__.py
index 52b82c8..52b82c8 100644
--- a/services/clipboard/__init__.py
+++ b/services/shell/__init__.py
diff --git a/services/clipboard/activityregistryservice.py b/services/shell/activityregistryservice.py
index 60293d4..60293d4 100644
--- a/services/clipboard/activityregistryservice.py
+++ b/services/shell/activityregistryservice.py
diff --git a/services/clipboard/bundleregistry.py b/services/shell/bundleregistry.py
index 65a2348..65a2348 100644
--- a/services/clipboard/bundleregistry.py
+++ b/services/shell/bundleregistry.py
diff --git a/services/clipboard/clipboardobject.py b/services/shell/clipboardobject.py
index bc51f47..bc51f47 100644
--- a/services/clipboard/clipboardobject.py
+++ b/services/shell/clipboardobject.py
diff --git a/services/clipboard/clipboardservice.py b/services/shell/clipboardservice.py
index 19958a7..19958a7 100644
--- a/services/clipboard/clipboardservice.py
+++ b/services/shell/clipboardservice.py
diff --git a/services/clipboard/objecttypeservice.py b/services/shell/objecttypeservice.py
index e12398e..e12398e 100644
--- a/services/clipboard/objecttypeservice.py
+++ b/services/shell/objecttypeservice.py
diff --git a/services/clipboard/org.laptop.ActivityRegistry.service.in b/services/shell/org.laptop.ActivityRegistry.service.in
index 051ab00..ab6647c 100644
--- a/services/clipboard/org.laptop.ActivityRegistry.service.in
+++ b/services/shell/org.laptop.ActivityRegistry.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name = org.laptop.ActivityRegistry
-Exec = @bindir@/sugar-clipboard
+Exec = @bindir@/sugar-shell-service
 
diff --git a/services/clipboard/org.laptop.Clipboard.service.in b/services/shell/org.laptop.Clipboard.service.in
index b38bf2b..7ce3f6e 100644
--- a/services/clipboard/org.laptop.Clipboard.service.in
+++ b/services/shell/org.laptop.Clipboard.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name = org.laptop.Clipboard
-Exec = @bindir@/sugar-clipboard
+Exec = @bindir@/sugar-shell-service
 
diff --git a/services/clipboard/org.laptop.ObjectTypeRegistry.service.in b/services/shell/org.laptop.ObjectTypeRegistry.service.in
index 66477eb..563a600 100644
--- a/services/clipboard/org.laptop.ObjectTypeRegistry.service.in
+++ b/services/shell/org.laptop.ObjectTypeRegistry.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name = org.laptop.ObjectTypeRegistry
-Exec = @bindir@/sugar-clipboard
+Exec = @bindir@/sugar-shell-service
 
diff --git a/services/clipboard/sugar-clipboard b/services/shell/sugar-shell-service
index 9531e94..370c2ea 100755
--- a/services/clipboard/sugar-clipboard
+++ b/services/shell/sugar-shell-service
@@ -23,20 +23,20 @@ import os
 import logging
 
 from sugar import logger
-logger.start('clipboard')
+logger.start('shellservice')
 
 import gobject
 import dbus.glib
  
 from sugar import env
 
-sys.path.append(env.get_service_path('clipboard'))
+sys.path.append(env.get_service_path('shell'))
 
 import clipboardservice
 import objecttypeservice
 import activityregistryservice
 
-logging.info('Starting clipboard service.')
+logging.info('Starting shell service.')
 
 gobject.threads_init()
 dbus.glib.threads_init()