Nullclient.py: changing mainloop

[python-purple] / core / buddy.pxd

diff --git a/core/buddy.pxd b/core/buddy.pxd
index b09aaca..7d1a589 100644 (file)
--- a/core/buddy.pxd
+++ b/core/buddy.pxd
@@ -18,32 +18,43 @@
 #
 
 cdef extern from "libpurple/purple.h":
-    cdef struct _PurpleBuddy
-    ctypedef _PurpleBuddy PurpleBuddy
-
-    cdef struct _PurpleAccount
-    ctypedef _PurpleAccount PurpleAccount
-
-    PurpleBuddy *purple_buddy_new(PurpleAccount *account,
+    ctypedef struct PurpleBlistNode:
+        pass
+
+    ctypedef struct PurpleBuddyIcon:
+        pass
+
+    ctypedef struct PurplePresence:
+        pass
+
+    ctypedef struct PurpleBuddy:
+        PurpleBlistNode node
+        char *name
+        char *alias
+        char *server_alias
+        void *proto_data
+        PurpleBuddyIcon *icon
+        PurpleAccount *account
+        PurplePresence *presence
+
+    PurpleBuddy *c_purple_buddy_new "purple_buddy_new" (PurpleAccount *account,
             const_char_ptr screenname, const_char_ptr alias)
 
-    const_char_ptr purple_buddy_get_alias_only(PurpleBuddy *buddy)
-    const_char_ptr purple_buddy_get_name(PurpleBuddy *buddy)
-
+    const_char_ptr c_purple_buddy_get_alias_only "purple_buddy_get_alias_only" (PurpleBuddy *buddy)
+    const_char_ptr c_purple_buddy_get_name "purple_buddy_get_name" (PurpleBuddy *buddy)
 
 cdef class Buddy:
     """ Buddy class """
     cdef PurpleBuddy *__buddy
 
-    def __cinit__(self, acc, const_char_ptr scr, const_char_ptr alias):
-        self.__buddy = purple_buddy_new(<PurpleAccount *>acc.__account, scr, alias)
-        self.acc = acc
+    def __cinit__(self):
+        self.__buddy = NULL
+
+    def new_buddy(self, acc, const_char_ptr scr, const_char_ptr alias):
+        self.__buddy = c_purple_buddy_new(<PurpleAccount *>acc.__account, scr, alias)
 
     def get_alias(self):
-        return purple_buddy_get_alias_only(self.__buddy)
+        return c_purple_buddy_get_alias_only(self.__buddy)
 
     def get_name(self):
-        return purple_buddy_get_name(self.__buddy)
-
-    def get_account(self):
-        return self.acc
+        return c_purple_buddy_get_name(self.__buddy)