X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=buddy.pyx;h=9fa9ac39dcbb13126edb3870b916f42619bcb8de;hp=5de38f77ef239814343f4fc042ef89115688444f;hb=ddbaa0875f63a6b7d77681b9f0804cd0d24c0872;hpb=6b8140055af9a85c4089aa9059fc123d8f87b78b

diff --git a/buddy.pyx b/buddy.pyx
index 5de38f7..9fa9ac3 100644
--- a/buddy.pyx
+++ b/buddy.pyx
@@ -35,25 +35,36 @@ cdef class Buddy:
 
     def __get_alias(self):
         if self.c_buddy:
-            return <char *>blist.c_purple_buddy_get_alias_only(self.c_buddy)
+            return <char *>blist.purple_buddy_get_alias_only(self.c_buddy)
         else:
             return None
     alias = property(__get_alias)
 
     def __get_name(self):
         if self.c_buddy:
-            return <char *>blist.c_purple_buddy_get_name(self.c_buddy)
+            return <char *>blist.purple_buddy_get_name(self.c_buddy)
         else:
             return None
     name = property(__get_name)
 
+    """
     def __get_online(self): # FIXME
         name = self.name
-        self.c_buddy = blist.c_purple_find_buddy(self.__acc.c_account, name)
-        return status.c_purple_presence_is_online(blist.c_purple_buddy_get_presence(self.c_buddy))
+        self.c_buddy = blist.purple_find_buddy(self.__acc.c_account, name)
+        return status.purple_presence_is_online(blist.purple_buddy_get_presence(self.c_buddy))
     online = property(__get_online)
+    """
 
-    def new_buddy(self, acc, char *scr, char *alias):
+    def new_buddy(self, acc, name, alias):
         self.__acc = acc
-        self.c_buddy = blist.c_purple_buddy_new(<account.PurpleAccount *>\
-                self.__acc.c_account, scr, alias)
+        cdef char *c_name = NULL
+        cdef char *c_alias = NULL
+
+        if name is not None:
+            c_name = name
+
+        if alias is not None:
+            c_alias = alias
+
+        self.c_buddy = blist.purple_buddy_new(<account.PurpleAccount *>\
+                self.__acc.c_account, c_name, c_alias)