diff options
author | Dan Williams <dcbw@redhat.com> | 2007-04-09 20:05:32 (GMT) |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2007-04-09 20:05:32 (GMT) |
commit | 76a0f45aa82ba49138449826ea7b006c784eaa62 (patch) | |
tree | a621a1307bc04b406acbb2452439dd25a5807688 /sugar | |
parent | 4cf8f321f03317c6156e8fe8544b4b3a9d16bb7a (diff) |
More new PS fixes
Diffstat (limited to 'sugar')
-rw-r--r-- | sugar/logger.py | 4 | ||||
-rw-r--r-- | sugar/presence/presenceservice.py | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sugar/logger.py b/sugar/logger.py index 5eb8039..bd01f2e 100644 --- a/sugar/logger.py +++ b/sugar/logger.py @@ -53,7 +53,9 @@ class LogWriter: elif level == STDOUT_LEVEL: level_txt = 'STDOUT' - fmt = "%s - %s\n" % (level_txt, msg) + if msg[len(msg) - 1] != '\n': + msg += "\n" + fmt = "%s - %s" % (level_txt, msg) fmt = fmt.encode("utf8") self._log_file.write(fmt) self._log_file.flush() diff --git a/sugar/presence/presenceservice.py b/sugar/presence/presenceservice.py index ef954b7..f7e528c 100644 --- a/sugar/presence/presenceservice.py +++ b/sugar/presence/presenceservice.py @@ -83,10 +83,10 @@ class PresenceService(gobject.GObject): obj = self._objcache.get(object_path) if not obj: if object_path.startswith(self._PS_BUDDY_OP): - obj = Buddy.Buddy(self._bus, self._new_object, + obj = buddy.Buddy(self._bus, self._new_object, self._del_object, object_path) elif object_path.startswith(self._PS_ACTIVITY_OP): - obj = Activity.Activity(self._bus, self._new_object, + obj = activity.Activity(self._bus, self._new_object, self._del_object, object_path) else: raise RuntimeError("Unknown object type") @@ -158,7 +158,7 @@ class PresenceService(gobject.GObject): return self._new_object(act_op) def get_buddies(self): - resp = self._ps.getBuddies() + resp = self._ps.GetBuddies() buddies = [] for item in resp: buddies.append(self._new_object(item)) |