Author: ArcRiley
Date: 2009-01-01 00:30:03 -0500 (Thu, 01 Jan 2009)
New Revision: 1398
Modified:
trunk/pysoy/include/g.pxd
trunk/pysoy/include/lm.pxd
trunk/pysoy/setup.py
Log:
Ticket #971 :
* added loudmouth's include directory to setup.py
* added necessary types to g.pxd and lm.pxd for clean compiling
Modified: trunk/pysoy/include/g.pxd
===================================================================
--- trunk/pysoy/include/g.pxd 2009-01-01 04:36:12 UTC (rev 1397)
+++ trunk/pysoy/include/g.pxd 2009-01-01 05:30:03 UTC (rev 1398)
@@ -19,6 +19,10 @@
cdef extern from "glib.h" nogil :
+ #############################################################################
+ #
+ # basic types
+ #
ctypedef void* gpointer
ctypedef void* gconstpointer
ctypedef char gchar
@@ -32,19 +36,36 @@
ctypedef unsigned int guint
ctypedef float gfloat
ctypedef double gdouble
-
+ #
+ #############################################################################
+ #
+ # private structs
+ #
+ ctypedef void* GMainContext
+ ctypedef void* GMainLoop
+ ctypedef void* GSource
+ ctypedef void* GSourceCallbackFuncs
+ ctypedef void* GSourceFuncs
+ ctypedef void* GThreadFunctions
+ ctypedef void* GHashTable
+ ctypedef void* GAsyncQueue
+ #
+ #############################################################################
+ #
+ # public structs
+ #
+ ctypedef struct GError :
+ guint domain
+ gint code
+ gchar* message
+ #
+ #############################################################################
+ #
+ # cdef functions
+ #
cdef gpointer g_malloc ( gulong )
cdef void g_free ( gpointer )
- ctypedef struct GThreadFunctions :
- void* none
-
- ctypedef struct GHashTable :
- void* none
-
- ctypedef struct GAsyncQueue :
- void* none
-
ctypedef gboolean GHRFunc ( gpointer, gpointer, gpointer )
ctypedef gint GCompareFunc ( gconstpointer, gconstpointer )
ctypedef gint GCompareDataFunc ( gconstpointer, gconstpointer,
gpointer )
@@ -90,3 +111,5 @@
cdef gpointer g_async_queue_pop ( GAsyncQueue* )
cdef gchar* g_strdup ( gchar* )
+ #
+ #############################################################################
Modified: trunk/pysoy/include/lm.pxd
===================================================================
--- trunk/pysoy/include/lm.pxd 2009-01-01 04:36:12 UTC (rev 1397)
+++ trunk/pysoy/include/lm.pxd 2009-01-01 05:30:03 UTC (rev 1398)
@@ -22,40 +22,6 @@
cdef extern from "loudmouth/loudmouth.h" nogil :
#############################################################################
#
- # private structs
- #
- ctypedef struct LmConnection :
- void* none
-
- ctypedef struct LmMessageHandler :
- void* none
-
- ctypedef struct LmMessagePriv :
- void* none
- #
- #############################################################################
- #
- # public structs
- #
- ctypedef struct LmMessage :
- LmMessageNode* node
- LmMessagePriv* priv
-
- ctypedef struct LmMessageNode :
- g.gchar* name
- g.gchar* value
- g.gboolean raw_mode
- LmMessageNode* next
- LmMessageNode* prev
- LmMessageNode* parent
- LmMessageNode* children
- #
- # private :
- void* attributes
- int ref_count
- #
- #############################################################################
- #
# enums
#
ctypedef enum :
@@ -126,9 +92,62 @@
LM_MESSAGE_SUB_TYPE_SET
LM_MESSAGE_SUB_TYPE_RESULT
LM_MESSAGE_SUB_TYPE_ERROR
+
+ ctypedef enum LmProxyType :
+ LM_PROXY_TYPE_NONE
+ LM_PROXY_TYPE_HTTP
+
+ ctypedef enum LmCertificateStatus :
+ LM_CERT_INVALID,
+ LM_CERT_ISSUER_NOT_FOUND,
+ LM_CERT_REVOKED
+
+ ctypedef enum LmSSLStatus :
+ LM_SSL_STATUS_NO_CERT_FOUND,
+ LM_SSL_STATUS_UNTRUSTED_CERT,
+ LM_SSL_STATUS_CERT_EXPIRED,
+ LM_SSL_STATUS_CERT_NOT_ACTIVATED,
+ LM_SSL_STATUS_CERT_HOSTNAME_MISMATCH,
+ LM_SSL_STATUS_CERT_FINGERPRINT_MISMATCH,
+ LM_SSL_STATUS_GENERIC_ERROR
+
+ ctypedef enum LmSSLResponse :
+ LM_SSL_RESPONSE_CONTINUE,
+ LM_SSL_RESPONSE_STOP
#
#############################################################################
#
+ # private structs
+ #
+ ctypedef void* LmConnection
+ ctypedef void* LmMessageHandler
+ ctypedef void* LmMessagePriv
+ ctypedef void* LmProxy
+ ctypedef void* LmSSL
+ #
+ #############################################################################
+ #
+ # public structs
+ #
+ ctypedef struct LmMessageNode :
+ g.gchar* name
+ g.gchar* value
+ g.gboolean raw_mode
+ LmMessageNode* next
+ LmMessageNode* prev
+ LmMessageNode* parent
+ LmMessageNode* children
+ #
+ # private :
+ void* attributes
+ int ref_count
+
+ ctypedef struct LmMessage :
+ LmMessageNode* node
+ LmMessagePriv* priv
+ #
+ #############################################################################
+ #
# callbacks
#
ctypedef void (* LmResultFunction) ( LmConnection*, g.gboolean,
@@ -261,3 +280,4 @@
g.gchar* lm_message_node_to_string( LmMessageNode* )
#
#############################################################################
+
Modified: trunk/pysoy/setup.py
===================================================================
--- trunk/pysoy/setup.py 2009-01-01 04:36:12 UTC (rev 1397)
+++ trunk/pysoy/setup.py 2009-01-01 05:30:03 UTC (rev 1398)
@@ -107,7 +107,8 @@
'-I', '/usr/lib/glib-2.0/include',
'-I', '/usr/include/cairo',
'-I', '/usr/local/include',
- '-I', '/usr/include/liboil-0.3/',
+ '-I', '/usr/include/liboil-0.3',
+ '-I', '/usr/include/loudmouth-1.0',
]
modules['_core'].append('X11')
modules['_core'].append('Xxf86vm')
_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn
