Rename the clipboard service as shell service.
This commit is contained in:
parent
fa8bcd2ba5
commit
cac6038665
@ -45,7 +45,7 @@ data/Makefile
|
|||||||
lib/Makefile
|
lib/Makefile
|
||||||
lib/ui/Makefile
|
lib/ui/Makefile
|
||||||
services/Makefile
|
services/Makefile
|
||||||
services/clipboard/Makefile
|
services/shell/Makefile
|
||||||
shell/Makefile
|
shell/Makefile
|
||||||
shell/intro/Makefile
|
shell/intro/Makefile
|
||||||
shell/hardware/Makefile
|
shell/hardware/Makefile
|
||||||
|
@ -1 +1 @@
|
|||||||
SUBDIRS = clipboard console
|
SUBDIRS = shell console
|
||||||
|
@ -19,17 +19,19 @@ org.laptop.Clipboard.service: org.laptop.Clipboard.service.in Makefile
|
|||||||
org.laptop.ObjectTypeRegistry.service: org.laptop.ObjectTypeRegistry.service.in Makefile
|
org.laptop.ObjectTypeRegistry.service: org.laptop.ObjectTypeRegistry.service.in Makefile
|
||||||
@sed -e "s|\@bindir\@|$(bindir)|" $< > $@
|
@sed -e "s|\@bindir\@|$(bindir)|" $< > $@
|
||||||
|
|
||||||
sugardir = $(pkgdatadir)/services/clipboard
|
sugardir = $(pkgdatadir)/services/shell
|
||||||
|
|
||||||
sugar_PYTHON = \
|
sugar_PYTHON = \
|
||||||
__init__.py \
|
__init__.py \
|
||||||
activityregistryservice.py \
|
activityregistryservice.py \
|
||||||
|
bundleregistry.py \
|
||||||
clipboardobject.py \
|
clipboardobject.py \
|
||||||
clipboardservice.py \
|
clipboardservice.py \
|
||||||
objecttypeservice.py
|
objecttypeservice.py
|
||||||
|
|
||||||
bin_SCRIPTS = sugar-clipboard
|
bin_SCRIPTS = sugar-shell-service
|
||||||
|
|
||||||
DISTCLEANFILES = $(service_DATA)
|
DISTCLEANFILES = $(service_DATA)
|
||||||
|
|
||||||
EXTRA_DIST = $(service_in_files) $(bin_SCRIPTS)
|
EXTRA_DIST = $(service_in_files) $(bin_SCRIPTS)
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
[D-BUS Service]
|
[D-BUS Service]
|
||||||
Name = org.laptop.ActivityRegistry
|
Name = org.laptop.ActivityRegistry
|
||||||
Exec = @bindir@/sugar-clipboard
|
Exec = @bindir@/sugar-shell-service
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
[D-BUS Service]
|
[D-BUS Service]
|
||||||
Name = org.laptop.Clipboard
|
Name = org.laptop.Clipboard
|
||||||
Exec = @bindir@/sugar-clipboard
|
Exec = @bindir@/sugar-shell-service
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
[D-BUS Service]
|
[D-BUS Service]
|
||||||
Name = org.laptop.ObjectTypeRegistry
|
Name = org.laptop.ObjectTypeRegistry
|
||||||
Exec = @bindir@/sugar-clipboard
|
Exec = @bindir@/sugar-shell-service
|
||||||
|
|
@ -23,20 +23,20 @@ import os
|
|||||||
import logging
|
import logging
|
||||||
|
|
||||||
from sugar import logger
|
from sugar import logger
|
||||||
logger.start('clipboard')
|
logger.start('shellservice')
|
||||||
|
|
||||||
import gobject
|
import gobject
|
||||||
import dbus.glib
|
import dbus.glib
|
||||||
|
|
||||||
from sugar import env
|
from sugar import env
|
||||||
|
|
||||||
sys.path.append(env.get_service_path('clipboard'))
|
sys.path.append(env.get_service_path('shell'))
|
||||||
|
|
||||||
import clipboardservice
|
import clipboardservice
|
||||||
import objecttypeservice
|
import objecttypeservice
|
||||||
import activityregistryservice
|
import activityregistryservice
|
||||||
|
|
||||||
logging.info('Starting clipboard service.')
|
logging.info('Starting shell service.')
|
||||||
|
|
||||||
gobject.threads_init()
|
gobject.threads_init()
|
||||||
dbus.glib.threads_init()
|
dbus.glib.threads_init()
|
Loading…
Reference in New Issue
Block a user