Removed redundant cdef's, fixed structures declarations.

[python-purple] / core / account.pxd

diff --git a/core/account.pxd b/core/account.pxd
index 50830e5..e07aa9f 100644 (file)
--- a/core/account.pxd
+++ b/core/account.pxd
@@ -18,23 +18,23 @@
 #
 
 cdef extern from "libpurple/account.h":
-    ctypedef struct PurpleAccount
+    ctypedef struct PurpleAccount:
+        pass
 
-    cdef PurpleAccount* c_purple_account_new "purple_account_new" (const_char_ptr username, const_char_ptr protocol_id)
-    cdef void c_purple_account_set_password "purple_account_set_password" (PurpleAccount *account, const_char_ptr password)
-    cdef void c_purple_account_set_enabled "purple_account_set_enabled" (PurpleAccount *account, const_char_ptr ui, gboolean value)
+    PurpleAccount *c_purple_account_new "purple_account_new" (const_char_ptr username, const_char_ptr protocol_id)
+    void c_purple_account_set_username "purple_account_set_username" (PurpleAccount *account, const_char_ptr username)
+    void c_purple_account_set_password "purple_account_set_password" (PurpleAccount *account, const_char_ptr password)
+    void c_purple_account_set_enabled "purple_account_set_enabled" (PurpleAccount *account, const_char_ptr ui, gboolean value)
 
 class Account(object):
     """ Account class """
 
-    def __init__(self):
-        purple_account = None
+    def __init__(self, username, protocol_id):
+        cdef PurpleAccount *acc = c_purple_account_new(username, protocol_id)
+        self.__acc = <object> acc
+        acc = <PurpleAccount *> self.__acc
 
-    # FIXME
     """
-    def purple_account_new(self, user_name, protocol_id):
-        return c_purple_account_new(user_name, protocol_id)
-
     def purple_account_set_password(self, account, password):
         c_purple_account_set_password(account, password)