X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=libpurple%2Fglib.pxd;h=ea71a897e1b747d7a6ea4e8f6f5e5bf4de7f992b;hp=7478033d176772e4eceb0dadba092f5775102f21;hb=573def76e068006d507f09ea1239fcd6d6adfae7;hpb=22ed5fb55427ef6c065ce5899606cb238c97997b

diff --git a/libpurple/glib.pxd b/libpurple/glib.pxd
index 7478033..ea71a89 100644
--- a/libpurple/glib.pxd
+++ b/libpurple/glib.pxd
@@ -17,12 +17,17 @@
 #  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
     ctypedef int gint
     ctypedef unsigned int guint
     ctypedef unsigned long gulong
+    ctypedef signed long long gint64
+    ctypedef unsigned long long guint64
     ctypedef gint gboolean
     ctypedef gboolean (*GSourceFunc) (gpointer data)
     ctypedef unsigned int gsize
@@ -30,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)