From: Ragner Magalhaes Date: Tue, 2 Dec 2008 20:35:03 +0000 (+0000) Subject: Added missing structures on connection.pxd. X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=commitdiff_plain;h=67776a7b4725730be59aa1c1a8347385301e0771;ds=sidebyside Added missing structures on connection.pxd. FIXES: - Added missing structure (PurpleConnection) definition on connection.pxd. - Fixed typo with time_t definition on status.pxd. - Fixed typo with purple_markup_strip_html definition on util.pxd. Signed-off-by: Bruno Abinader git-svn-id: https://garage.maemo.org/svn/carman/branches/carman-0.7-beta2/python-purple@1320 596f6dd7-e928-0410-a184-9e12fd12cf7e --- diff --git a/libpurple/connection.pxd b/libpurple/connection.pxd index 1dc6c62..f0ea109 100644 --- a/libpurple/connection.pxd +++ b/libpurple/connection.pxd @@ -17,10 +17,14 @@ # along with this program. If not, see . # +cimport glib + cimport account +cimport plugin cdef extern from *: ctypedef int size_t + ctypedef long int time_t ctypedef char const_char "const char" cdef extern from "libpurple/connection.h": @@ -76,7 +80,19 @@ cdef extern from "libpurple/connection.h": void (*report_disconnect_reason) (PurpleConnection *gc, PurpleConnectionError reason, const_char *text) ctypedef struct PurpleConnection: - pass + plugin.PurplePlugin *prpl + PurpleConnectionFlags flags + PurpleConnectionState state + account.PurpleAccount *account + char *password + int inpa + glib.GSList *buddy_chats + void *proto_data + char *display_name + glib.guint keepalive + glib.gboolean wants_to_die + glib.guint disconnect_timeout + time_t last_received account.PurpleAccount *c_purple_connection_get_account "purple_connection_get_account" (PurpleConnection *gc) void *c_purple_connections_get_handle "purple_connections_get_handle" () diff --git a/libpurple/status.pxd b/libpurple/status.pxd index 6bd3917..41a9c01 100644 --- a/libpurple/status.pxd +++ b/libpurple/status.pxd @@ -26,7 +26,7 @@ cimport value cdef extern from *: ctypedef char const_char "const char" - ctypedef int time_t + ctypedef long int time_t cdef extern from "libpurple/status.h": ctypedef struct PurpleStatusType diff --git a/libpurple/util.pxd b/libpurple/util.pxd index 04bd446..3ee6083 100644 --- a/libpurple/util.pxd +++ b/libpurple/util.pxd @@ -18,5 +18,5 @@ # cdef extern from "libpurple/util.h": - void *c_purple_markup_strip_html "purple_markup_strip_html" (char *str) + char *c_purple_markup_strip_html "purple_markup_strip_html" (char *str) void c_purple_util_set_user_dir "purple_util_set_user_dir" (char *dir)