Added misssing structures on blist.pxd and glib.pxd.

FIXES:
 - Added missing structures on blist.pxd and glib.pxd.

Signed-off-by: Bruno Abinader <bruno.abinader@indt.org.br>

git-svn-id: https://garage.maemo.org/svn/carman/branches/carman-0.7-beta2/python-purple@1332 596f6dd7-e928-0410-a184-9e12fd12cf7e

diff --git a/libpurple/blist.pxd b/libpurple/blist.pxd
index bfebb18..c44aea8 100644 (file)
--- a/libpurple/blist.pxd
+++ b/libpurple/blist.pxd
@@ -110,12 +110,14 @@ cdef extern from "libpurple/blist.h":
     void *c_purple_blist_get_handle "purple_blist_get_handle" ()
     void c_purple_blist_load "purple_blist_load" ()
     PurpleBuddyList* c_purple_blist_new "purple_blist_new" ()
+    PurpleBlistNodeType c_purple_blist_node_get_type "purple_blist_node_get_type" (PurpleBlistNode *node)
     void c_purple_blist_set_ui_ops "purple_blist_set_ui_ops" (PurpleBlistUiOps *ops)
-
+    const_char *c_purple_chat_get_name "purple_chat_get_name" (PurpleChat *chat)
+    const_char *c_purple_group_get_name "purple_group_get_name" (PurpleGroup *group)
     PurpleBuddy *c_purple_buddy_new "purple_buddy_new" (account.PurpleAccount *account,
             char *screenname, char *alias)
-    char *c_purple_buddy_get_alias_only "purple_buddy_get_alias_only" (PurpleBuddy *buddy)
-    char *c_purple_buddy_get_name "purple_buddy_get_name" (PurpleBuddy *buddy)
+    const_char *c_purple_buddy_get_alias_only "purple_buddy_get_alias_only" (PurpleBuddy *buddy)
+    const_char *c_purple_buddy_get_name "purple_buddy_get_name" (PurpleBuddy *buddy)
     PurpleBuddy *c_purple_find_buddy "purple_find_buddy" (account.PurpleAccount *account, char *name)
     void c_purple_set_blist "purple_set_blist" (PurpleBuddyList *list)
     glib.GSList *c_purple_find_buddies "purple_find_buddies" (account.PurpleAccount *account, char *name)

diff --git a/libpurple/glib.pxd b/libpurple/glib.pxd
index d2ff744..ea71a89 100644 (file)
--- a/libpurple/glib.pxd
+++ b/libpurple/glib.pxd
@@ -17,6 +17,9 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+cdef extern from *:
+    ctypedef int volatile_gint "volatile int"
+
 cdef extern from "glib.h":
     ctypedef void *gpointer
     ctypedef void *gconstpointer
@@ -32,33 +35,54 @@ cdef extern from "glib.h":
     ctypedef unsigned char guchar
 
     ctypedef void (*GCallback) ()
+    ctypedef void (*GDestroyNotify) (gpointer)
 
-    ctypedef struct GHashTable:
+    ctypedef guint GHashFunc (gconstpointer)
+    ctypedef gboolean GEqualFunc (gconstpointer, gconstpointer)
+
+    ctypedef struct GObject:
         pass
 
+    ctypedef struct GHashNode:
+        gpointer key
+        gpointer value
+        GHashNode *next
+        guint key_hash
+
+    ctypedef struct GHashTable:
+        gint size
+        gint nnodes
+        GHashNode **nodes
+        GHashFunc hash_func
+        GEqualFunc key_equal_func
+        volatile_gint ref_count
+        int version
+        GDestroyNotify key_destroy_func
+        GDestroyNotify value_destroy_func
+
     ctypedef struct GMainContext:
         pass
 
-    struct _GSList:
+    ctypedef struct GSList:
         gpointer data
-        _GSList *next
-    ctypedef _GSList GSList
+        GSList *next
 
-    struct _GList:
+    ctypedef struct GList:
         gpointer data
-        _GList *next
-        _GList *prev
-    ctypedef _GList GList
+        GList *next
+        GList *prev
 
-    ctypedef guint GHashFunc (gconstpointer)
-    ctypedef gboolean GEqualFunc (gconstpointer, gconstpointer)
+    void g_list_free (GList*)
 
     gboolean g_str_equal (gconstpointer, gconstpointer)
     guint g_str_hash (gconstpointer)
 
     GHashTable *g_hash_table_new (GHashFunc, GEqualFunc)
-    void g_hash_table_insert (GHashTable*, gpointer, gpointer)
     void g_hash_table_destroy (GHashTable*)
+    GList *g_hash_table_get_keys (GHashTable*)
+    GList *g_hash_table_get_values (GHashTable*)
+    void g_hash_table_insert (GHashTable*, gpointer, gpointer)
+    gpointer g_hash_table_lookup (GHashTable*, gconstpointer)
 
     guint g_timeout_add(guint interval, GSourceFunc function, gpointer data)
     guint g_timeout_add_seconds(guint interval, GSourceFunc function, gpointer data)