Cut over to new PresenceService

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
 
-EXTRA_DIST = $(bin_SCRIPTS)
+DISTCLEANFILES = $(service_DATA)
+
+EXTRA_DIST = $(service_in_files) $(bin_SCRIPTS)

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

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')