More new PS fixes

This commit is contained in:
Dan Williams
2007-04-09 16:05:32 -04:00
parent 4cf8f321f0
commit 76a0f45aa8
8 changed files with 48 additions and 38 deletions
+3 -1
View File
@@ -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()
+3 -3
View File
@@ -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))