Author: ArcRiley
Date: 2009-03-03 23:35:03 -0500 (Tue, 03 Mar 2009)
New Revision: 1545
Modified:
trunk/concordance/include/concordance.sockets.h
trunk/concordance/src/sockets/Client.c
Log:
xml callbacks are working
Modified: trunk/concordance/include/concordance.sockets.h
===================================================================
--- trunk/concordance/include/concordance.sockets.h 2009-03-04 04:35:00 UTC
(rev 1544)
+++ trunk/concordance/include/concordance.sockets.h 2009-03-04 04:35:03 UTC
(rev 1545)
@@ -66,6 +66,7 @@
} socketsClient_Object;
typedef struct {
socketsClient_Object* self; /* the listening socket this belongs */
+ PyObject* srvc; /* service */
PyObject* node; /* Node object for this or NULL */
GMutex* lock; /* Mutex for self test/add/remove */
GIOChannel* chan; /* Glib IO channel for this session */
Modified: trunk/concordance/src/sockets/Client.c
===================================================================
--- trunk/concordance/src/sockets/Client.c 2009-03-04 04:35:00 UTC (rev
1544)
+++ trunk/concordance/src/sockets/Client.c 2009-03-04 04:35:03 UTC (rev
1545)
@@ -419,7 +419,6 @@
cdef : \*/
socketsClient_Object* self = session->self;
GString* buff;
- servicesService_Object* service;
gchar* from;
guint major, minor;
gchar** versions;
@@ -430,10 +429,10 @@
/* lookup domain mapping */
if (to) {
- service = (servicesService_Object*)
+ session->srvc = (servicesService_Object*)
g_hash_table_lookup(self->domains, (gconstpointer) to);
- if (service) {
- from = service->domain;
+ if (session->srvc) {
+ from = ((servicesService_Object*) session->srvc)->domain;
}
else {
from = to;
@@ -846,7 +845,7 @@
pmsgc = (concordMsg_xmlClose*)
g_malloc(sizeof(concordMsg_xmlClose));
pmsgc->type = CONCORD_MT_XMLCLOSE;
pmsgc->tree = &session->tree;
- pmsgc->self = (PyObject*) self;
+ pmsgc->self = session->srvc;
pmsgc->data = session;
pmsgc->retn = session->queue;
_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn
