diff options
| author | Dan Williams <dcbw@redhat.com> | 2007-04-09 18:40:56 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2007-04-09 18:40:56 (GMT) |
| commit | bc083dae5a601d9ce099496096330691efc46447 (patch) | |
| tree | ca92b000912b198bd3e791321937f863b600dd60 /services | |
| parent | 2509d990e4837f4810a372fda40d260f32014712 (diff) | |
Cut over to new PresenceService
Diffstat (limited to 'services')
| -rw-r--r-- | services/Makefile.am | 2 | ||||
| -rw-r--r-- | services/presence/Makefile.am | 15 | ||||
| -rw-r--r-- | services/presence/buddy.py | 1 | ||||
| -rwxr-xr-x | services/presence/sugar-presence-service | 2 |
4 files changed, 15 insertions, 5 deletions
diff --git a/services/Makefile.am b/services/Makefile.am index 4ba8cdd..113d0f0 100644 --- a/services/Makefile.am +++ b/services/Makefile.am @@ -1 +1 @@ -SUBDIRS = presence presence2 clipboard datastore console +SUBDIRS = presence clipboard datastore console diff --git a/services/presence/Makefile.am b/services/presence/Makefile.am index fbd3125..57de87d 100644 --- a/services/presence/Makefile.am +++ b/services/presence/Makefile.am @@ -1,4 +1,11 @@ -sugardir = $(pkgdatadir)/services/presence2 +servicedir = $(datadir)/dbus-1/services +service_in_files = org.laptop.Sugar.Presence.service.in +service_DATA = $(service_in_files:.service.in=.service) + +$(service_DATA): $(service_in_files) Makefile + @sed -e "s|\@bindir\@|$(bindir)|" $< > $@ + +sugardir = $(pkgdatadir)/services/presence sugar_PYTHON = \ __init__.py \ activity.py \ @@ -8,6 +15,8 @@ sugar_PYTHON = \ presenceservice.py \ server_plugin.py -bin_SCRIPTS = sugar-presence-service2 +bin_SCRIPTS = sugar-presence-service + +DISTCLEANFILES = $(service_DATA) -EXTRA_DIST = $(bin_SCRIPTS) +EXTRA_DIST = $(service_in_files) $(bin_SCRIPTS) diff --git a/services/presence/buddy.py b/services/presence/buddy.py index 4b6031d..a5c18ed 100644 --- a/services/presence/buddy.py +++ b/services/presence/buddy.py @@ -170,6 +170,7 @@ class Buddy(DBusGObject): props['owner'] = self.props.owner props['key'] = self.props.key props['color'] = self.props.color + props['current-activity'] = self.props.current_activity return props # methods diff --git a/services/presence/sugar-presence-service b/services/presence/sugar-presence-service index 83ff58d..2859132 100755 --- a/services/presence/sugar-presence-service +++ b/services/presence/sugar-presence-service @@ -24,7 +24,7 @@ import os from sugar import logger from sugar import env -sys.path.insert(0, env.get_service_path('presence2')) +sys.path.insert(0, env.get_service_path('presence')) logger.start('presenceservice') |