Implemented request_add callback.

[python-purple] / libpurple / connection.pxd

diff --git a/libpurple/connection.pxd b/libpurple/connection.pxd
index 1dc6c62..9dc5581 100644 (file)
--- a/libpurple/connection.pxd
+++ b/libpurple/connection.pxd
@@ -17,11 +17,14 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+cimport glib
+
 cimport account
+cimport plugin
 
 cdef extern from *:
     ctypedef int size_t
-    ctypedef char const_char "const char"
+    ctypedef long int time_t
 
 cdef extern from "libpurple/connection.h":
     ctypedef struct PurpleConnection
@@ -66,18 +69,62 @@ cdef extern from "libpurple/connection.h":
         char *description
 
     ctypedef struct PurpleConnectionUiOps:
-        void (*connect_progress) (PurpleConnection *gc, const_char *text, size_t step, size_t step_count)
+        void (*connect_progress) (PurpleConnection *gc, char *text, size_t step, size_t step_count)
         void (*connected) (PurpleConnection *gc)
         void (*disconnected) (PurpleConnection *gc)
-        void (*notice) (PurpleConnection *gc, const_char *text)
-        void (*report_disconnect) (PurpleConnection *gc, const_char *text)
+        void (*notice) (PurpleConnection *gc, char *text)
+        void (*report_disconnect) (PurpleConnection *gc, char *text)
         void (*network_connected) ()
         void (*network_disconnected) ()
-        void (*report_disconnect_reason) (PurpleConnection *gc, PurpleConnectionError reason, const_char *text)
+        void (*report_disconnect_reason) (PurpleConnection *gc, PurpleConnectionError reason, 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
+
+    # Connection API FIXME
+    void purple_connection_set_state(PurpleConnection *gc, \
+            PurpleConnectionState state)
+    void purple_connection_set_account(PurpleConnection *gc, \
+            account.PurpleAccount *account)
+    void purple_connection_set_display_name(PurpleConnection *gc, char *name)
+    PurpleConnectionState purple_connection_get_state(PurpleConnection *gc)
+    account.PurpleAccount *purple_connection_get_account(PurpleConnection *gc)
+    plugin.PurplePlugin * purple_connection_get_prpl(PurpleConnection *gc)
+    char *purple_connection_get_password(PurpleConnection *gc)
+    char *purple_connection_get_display_name(PurpleConnection *gc)
+    void purple_connection_update_progress(PurpleConnection *gc, char *text, \
+            size_t step, size_t count)
+    void purple_connection_notice(PurpleConnection *gc, char *text)
+    void purple_connection_error(PurpleConnection *gc, char *reason)
+    void purple_connection_error_reason (PurpleConnection *gc, \
+            PurpleConnectionError reason, char *description)
+    #void purple_connection_ssl_error (PurpleConnection *gc, \
+            #PurpleSslErrorType ssl_error)
+    glib.gboolean purple_connection_error_is_fatal ( \
+            PurpleConnectionError reason)
+
+    # Connections API
+    void purple_connections_disconnect_all()
+    glib.GList *purple_connections_get_all()
+    glib.GList *purple_connections_get_connecting()
+
+    # UI Registration Functions
+    void purple_connections_set_ui_ops(PurpleConnectionUiOps *ops)
+    PurpleConnectionUiOps *purple_connections_get_ui_ops()
 
-    account.PurpleAccount *c_purple_connection_get_account "purple_connection_get_account" (PurpleConnection *gc)
-    void *c_purple_connections_get_handle "purple_connections_get_handle" ()
-    void c_purple_connections_set_ui_ops "purple_connections_set_ui_ops" (PurpleConnectionUiOps *ops)
+    # Connections Subsystem
+    void purple_connections_init()
+    void purple_connections_uninit()
+    void *purple_connections_get_handle()