X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=account.pyx;h=7dd484fa158d210e953b97f83e57fff535e6875d;hp=d3dbdbff9cd94d384a82df9c69b84c4a85eea359;hb=a9c739f31cfa8cbb2a91e79f829a71f09406d73b;hpb=f0ff8c3ffbd828fbdc0963c8c4744c94363f40a7

diff --git a/account.pyx b/account.pyx
index d3dbdbf..7dd484f 100644
--- a/account.pyx
+++ b/account.pyx
@@ -140,14 +140,28 @@ cdef class Account:
     def get_buddies_online(self):
         cdef glib.GSList *iter
         cdef blist.PurpleBuddy *buddy
+        cdef char *c_name = NULL
+        cdef char *c_alias = NULL
         buddies = []
         iter = blist.c_purple_find_buddies(self.c_account, NULL)
         while iter:
+            c_name = NULL
+            c_alias = NULL
             buddy = <blist.PurpleBuddy *> iter.data
             if <blist.PurpleBuddy *>buddy and \
                 account.c_purple_account_is_connected(blist.c_purple_buddy_get_account(buddy)) and \
                 status.c_purple_presence_is_online(blist.c_purple_buddy_get_presence(buddy)):
-                buddies += [buddy.name]
+                c_name = <char *> blist.c_purple_buddy_get_name(buddy)
+                if c_name == NULL:
+                    name = None
+                else:
+                    name = c_name
+                c_alias = <char *> blist.c_purple_buddy_get_alias_only(buddy)
+                if c_alias == NULL:
+                    alias = None
+                else:
+                    alias = c_alias
+                buddies.append((name, alias))
             iter = iter.next
         return buddies