From cac6038665239aa037bcab475038bb5f33b34533 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Date: Wed, 8 Aug 2007 18:33:10 +0200
Subject: [PATCH] Rename the clipboard service as shell service.

---
 configure.ac                                                | 2 +-
 services/Makefile.am                                        | 2 +-
 services/{clipboard => shell}/Makefile.am                   | 6 ++++--
 services/{clipboard => shell}/__init__.py                   | 0
 services/{clipboard => shell}/activityregistryservice.py    | 0
 services/{clipboard => shell}/bundleregistry.py             | 0
 services/{clipboard => shell}/clipboardobject.py            | 0
 services/{clipboard => shell}/clipboardservice.py           | 0
 services/{clipboard => shell}/objecttypeservice.py          | 0
 .../org.laptop.ActivityRegistry.service.in                  | 2 +-
 .../{clipboard => shell}/org.laptop.Clipboard.service.in    | 2 +-
 .../org.laptop.ObjectTypeRegistry.service.in                | 2 +-
 .../sugar-clipboard => shell/sugar-shell-service}           | 6 +++---
 13 files changed, 12 insertions(+), 10 deletions(-)
 rename services/{clipboard => shell}/Makefile.am (91%)
 rename services/{clipboard => shell}/__init__.py (100%)
 rename services/{clipboard => shell}/activityregistryservice.py (100%)
 rename services/{clipboard => shell}/bundleregistry.py (100%)
 rename services/{clipboard => shell}/clipboardobject.py (100%)
 rename services/{clipboard => shell}/clipboardservice.py (100%)
 rename services/{clipboard => shell}/objecttypeservice.py (100%)
 rename services/{clipboard => shell}/org.laptop.ActivityRegistry.service.in (59%)
 rename services/{clipboard => shell}/org.laptop.Clipboard.service.in (55%)
 rename services/{clipboard => shell}/org.laptop.ObjectTypeRegistry.service.in (60%)
 rename services/{clipboard/sugar-clipboard => shell/sugar-shell-service} (91%)

diff --git a/configure.ac b/configure.ac
index f6626693..e0acaf19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ data/Makefile
 lib/Makefile
 lib/ui/Makefile
 services/Makefile
-services/clipboard/Makefile
+services/shell/Makefile
 shell/Makefile
 shell/intro/Makefile
 shell/hardware/Makefile
diff --git a/services/Makefile.am b/services/Makefile.am
index 7d8e3516..e230030d 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
similarity index 91%
rename from services/clipboard/Makefile.am
rename to services/shell/Makefile.am
index 6d2cd9c9..b34b974c 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
similarity index 100%
rename from services/clipboard/__init__.py
rename to services/shell/__init__.py
diff --git a/services/clipboard/activityregistryservice.py b/services/shell/activityregistryservice.py
similarity index 100%
rename from services/clipboard/activityregistryservice.py
rename to services/shell/activityregistryservice.py
diff --git a/services/clipboard/bundleregistry.py b/services/shell/bundleregistry.py
similarity index 100%
rename from services/clipboard/bundleregistry.py
rename to services/shell/bundleregistry.py
diff --git a/services/clipboard/clipboardobject.py b/services/shell/clipboardobject.py
similarity index 100%
rename from services/clipboard/clipboardobject.py
rename to services/shell/clipboardobject.py
diff --git a/services/clipboard/clipboardservice.py b/services/shell/clipboardservice.py
similarity index 100%
rename from services/clipboard/clipboardservice.py
rename to services/shell/clipboardservice.py
diff --git a/services/clipboard/objecttypeservice.py b/services/shell/objecttypeservice.py
similarity index 100%
rename from services/clipboard/objecttypeservice.py
rename to services/shell/objecttypeservice.py
diff --git a/services/clipboard/org.laptop.ActivityRegistry.service.in b/services/shell/org.laptop.ActivityRegistry.service.in
similarity index 59%
rename from services/clipboard/org.laptop.ActivityRegistry.service.in
rename to services/shell/org.laptop.ActivityRegistry.service.in
index 051ab006..ab6647c9 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
similarity index 55%
rename from services/clipboard/org.laptop.Clipboard.service.in
rename to services/shell/org.laptop.Clipboard.service.in
index b38bf2b1..7ce3f6ef 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
similarity index 60%
rename from services/clipboard/org.laptop.ObjectTypeRegistry.service.in
rename to services/shell/org.laptop.ObjectTypeRegistry.service.in
index 66477eb6..563a600d 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
similarity index 91%
rename from services/clipboard/sugar-clipboard
rename to services/shell/sugar-shell-service
index 9531e94b..370c2ea4 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()