Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpg@redhat.com>2007-03-16 15:55:53 (GMT)
committer Marco Pesenti Gritti <mpg@redhat.com>2007-03-16 15:55:53 (GMT)
commit8b6af7efa56599fd4edb81471fe92253549edb37 (patch)
treee4bfb78e0de1dafd0868787726059aada80c2f3c
parent32fb016a6ce0b8fc21f7cb2a281fa78b4c731c74 (diff)
parentf4b7233255b826f0899ae7f69950f6ff09ccf55a (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
-rw-r--r--services/presence2/presenceservice.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/presence2/presenceservice.py b/services/presence2/presenceservice.py
index 82db832..f5ee296 100644
--- a/services/presence2/presenceservice.py
+++ b/services/presence2/presenceservice.py
@@ -48,7 +48,7 @@ class PresenceService(dbus.service.Object):
self._activities = {} # activity id -> Activity
bus = dbus.SessionBus()
- self._bus_name = dbus.service.BusName(_PRESENCE_SERVICE, bus=bus)
+ self._bus_name = dbus.service.BusName(_PRESENCE_SERVICE, bus=bus)
# Create the Owner object
objid = self._get_next_object_id()
@@ -84,7 +84,7 @@ class PresenceService(dbus.service.Object):
pass
# TEST
id = util.unique_id()
- self._share_activity(id, "org.laptop.Sugar.lapin",
+ self._share_activity(id, "org.laptop.Sugar.Test",
"Chat of %s" % self._owner.props.nick, [])
def _contact_online(self, tp, handle, props):