sugarlabs
/
sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move the presence service out of the shell

Browse Source
master
Marco Pesenti Gritti 18 years ago
parent bcc1740f7f
commit 5f99dcf9a5
16 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape Escape View File

@ -38,7 +38,7 @@ po/*.gmo
sugar/__installed__.py sugar/__installed__.py
sugar/__uninstalled__.py sugar/__uninstalled__.py
tools/sugar-setup-activity tools/sugar-setup-activity
shell/PresenceService/org.laptop.Presence.service services/presence/org.laptop.Presence.service
threadframe threadframe
config.guess config.guess
config.sub config.sub

2
Makefile.am
Unescape Escape View File

@ -1,4 +1,4 @@
SUBDIRS = activities bindings po shell sugar tools SUBDIRS = activities bindings po shell sugar services tools
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4

2
configure.ac
Unescape Escape View File

@ -45,6 +45,7 @@ activities/terminal/Makefile
bindings/Makefile bindings/Makefile
bindings/globalkeys/Makefile bindings/globalkeys/Makefile
bindings/threadframe/Makefile bindings/threadframe/Makefile
services/Makefile
shell/Makefile shell/Makefile
shell/conf/Makefile shell/conf/Makefile
shell/data/Makefile shell/data/Makefile
@ -52,7 +53,6 @@ shell/view/Makefile
shell/view/home/Makefile shell/view/home/Makefile
shell/view/frame/Makefile shell/view/frame/Makefile
shell/model/Makefile shell/model/Makefile
shell/PresenceService/Makefile
sugar/Makefile sugar/Makefile
sugar/__installed__.py sugar/__installed__.py
sugar/__uninstalled__.py sugar/__uninstalled__.py

1
services/Makefile.am
Unescape Escape View File

@ -0,0 +1 @@
SUBDIRS = presence

0
shell/PresenceService/Activity.py → services/presence/Activity.py
Unescape Escape View File

0
shell/PresenceService/Buddy.py → services/presence/Buddy.py
Unescape Escape View File

6
shell/PresenceService/Makefile.am → services/presence/Makefile.am
Unescape Escape View File

@ -5,7 +5,7 @@ service_DATA = $(service_in_files:.service.in=.service)
$(service_DATA): $(service_in_files) Makefile $(service_DATA): $(service_in_files) Makefile
@sed -e "s|\@bindir\@|$(bindir)|" $< > $@ @sed -e "s|\@bindir\@|$(bindir)|" $< > $@
sugardir = $(pkgdatadir)/shell/PresenceService sugardir = $(pkgdatadir)/services/presence
sugar_PYTHON = \ sugar_PYTHON = \
__init__.py \ __init__.py \
Activity.py \ Activity.py \
@ -13,6 +13,8 @@ sugar_PYTHON = \
PresenceService.py \ PresenceService.py \
Service.py Service.py
bin_SCRIPTS = sugar-presence-service
DISTCLEANFILES = $(service_DATA) DISTCLEANFILES = $(service_DATA)
EXTRA_DIST = $(service_in_files) EXTRA_DIST = $(service_in_files) $(bin_SCRIPTS)

0
shell/PresenceService/PresenceService.py → services/presence/PresenceService.py
Unescape Escape View File

0
shell/PresenceService/Service.py → services/presence/Service.py
Unescape Escape View File

0
shell/PresenceService/__init__.py → services/presence/__init__.py
Unescape Escape View File

0
shell/PresenceService/org.laptop.Presence.service.in → services/presence/org.laptop.Presence.service.in
Unescape Escape View File

2
shell/sugar-presence-service → services/presence/sugar-presence-service
Unescape Escape View File

@ -1,7 +1,7 @@
#!/usr/bin/python #!/usr/bin/python
import logging import logging
from PresenceService import PresenceService from presence import PresenceService
import sugar.logger import sugar.logger
sugar.logger.start('PresenceService') sugar.logger.start('PresenceService')

5
shell/Makefile.am
Unescape Escape View File

@ -1,11 +1,10 @@
SUBDIRS = conf data model view PresenceService SUBDIRS = conf data model view
bin_SCRIPTS = \ bin_SCRIPTS = \
sugar \ sugar \
sugar-activity \ sugar-activity \
sugar-activity-factory \ sugar-activity-factory \
sugar-console \ sugar-console
sugar-presence-service
sugardir = $(pkgdatadir)/shell sugardir = $(pkgdatadir)/shell
sugar_PYTHON = \ sugar_PYTHON = \

3
sugar/__installed__.py.in
Unescape Escape View File

@ -6,5 +6,6 @@ sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf'
sugar_python_path = ['@prefix@/share/sugar/shell', sugar_python_path = ['@prefix@/share/sugar/shell',
'@prefix@/share/sugar/bindings', '@prefix@/share/sugar/bindings',
'@prefix@/share/sugar/activities'] '@prefix@/share/sugar/activities',
'@prefix@/share/sugar/services']
sugar_bin_path = [] sugar_bin_path = []

2
sugar/__uninstalled__.py.in
Unescape Escape View File

@ -14,6 +14,8 @@ sugar_python_path = ['@prefix@/share/sugar/bindings']
sugar_python_path.append(sugar_source_dir) sugar_python_path.append(sugar_source_dir)
sugar_python_path.append(os.path.join(sugar_source_dir, 'shell')) sugar_python_path.append(os.path.join(sugar_source_dir, 'shell'))
sugar_python_path.append(os.path.join(sugar_source_dir, 'activities')) sugar_python_path.append(os.path.join(sugar_source_dir, 'activities'))
sugar_python_path.append(os.path.join(sugar_source_dir, 'services'))
sugar_bin_path = [] sugar_bin_path = []
sugar_bin_path.append(os.path.join(sugar_source_dir, 'shell')) sugar_bin_path.append(os.path.join(sugar_source_dir, 'shell'))
sugar_bin_path.append(os.path.join(sugar_source_dir, 'services/presence'))

3
sugar/env.py
Unescape Escape View File

@ -43,7 +43,8 @@ def setup_system():
runner = os.path.join(sugar_source_dir, 'shell/sugar-activity-factory') runner = os.path.join(sugar_source_dir, 'shell/sugar-activity-factory')
sugar.setup.setup_activities(source, sugar_activities_dir, runner) sugar.setup.setup_activities(source, sugar_activities_dir, runner)
bin = os.path.join(sugar_source_dir, 'shell/sugar-presence-service') bin = os.path.join(sugar_source_dir,
'services/presence/sugar-presence-service')
sugar.setup.write_service('org.laptop.Presence', bin, sugar.setup.write_service('org.laptop.Presence', bin,
sugar_activities_dir) sugar_activities_dir)

Write Preview
Loading…
Cancel
Save