From 6a66a9507c0fe4c22f4f75bfbc438ef5f72ad7f3 Mon Sep 17 00:00:00 2001 From: Stefan Sayer Date: Tue, 8 Jan 2008 19:27:13 +0000 Subject: [PATCH] fixed new AmSipMsg header and removed key git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@587 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- apps/py_sems/sip/sippy_sems_libAmSipReply.h | 2 +- .../sip/sippy_sems_libAmSipRequest.cpp | 36 ------------------- apps/py_sems/sip/sippy_sems_libAmSipRequest.h | 2 +- 3 files changed, 2 insertions(+), 38 deletions(-) diff --git a/apps/py_sems/sip/sippy_sems_libAmSipReply.h b/apps/py_sems/sip/sippy_sems_libAmSipReply.h index e87f1e3c..39cf2cae 100644 --- a/apps/py_sems/sip/sippy_sems_libAmSipReply.h +++ b/apps/py_sems/sip/sippy_sems_libAmSipReply.h @@ -8,7 +8,7 @@ #define _py_sems_libAmSipReply_h #line 6 "AmSipReply.sip" -#include "../../../core/AmSipReply.h" +#include "../../../core/AmSipMsg.h" #line 13 "sippy_sems_libAmSipReply.h" #define sipClass_AmSipReply sipModuleAPI_py_sems_lib.em_types[10] diff --git a/apps/py_sems/sip/sippy_sems_libAmSipRequest.cpp b/apps/py_sems/sip/sippy_sems_libAmSipRequest.cpp index 673f1266..7992013a 100644 --- a/apps/py_sems/sip/sippy_sems_libAmSipRequest.cpp +++ b/apps/py_sems/sip/sippy_sems_libAmSipRequest.cpp @@ -70,41 +70,6 @@ static void *init_AmSipRequest(sipWrapper *,PyObject *sipArgs,sipWrapper **,int return sipCpp; } - -extern "C" {static PyObject *var_AmSipRequest_key(PyObject *, PyObject *);} -static PyObject *var_AmSipRequest_key(PyObject *sipSelf,PyObject *sipPy) -{ - int sipIsErr = 0; - int sipValState; - string *sipVal; - AmSipRequest *sipCpp = reinterpret_cast(sipGetCppPtr((sipWrapper *)sipSelf,sipClass_AmSipRequest)); - - if (!sipCpp) - return NULL; - - if (sipPy == NULL) - { - sipVal = &sipCpp->key; - - sipPy = sipConvertFromMappedType(sipVal,sipMappedType_string,NULL); - - return sipPy; - } - - sipVal = reinterpret_cast(sipForceConvertToMappedType(sipPy,sipMappedType_string,NULL,SIP_NOT_NONE,&sipValState,&sipIsErr)); - - if (sipIsErr) - return NULL; - - sipCpp->key = *sipVal; - - sipReleaseMappedType(sipVal,sipMappedType_string,sipValState); - - Py_INCREF(Py_None); - return Py_None; -} - - extern "C" {static PyObject *var_AmSipRequest_next_hop(PyObject *, PyObject *);} static PyObject *var_AmSipRequest_next_hop(PyObject *sipSelf,PyObject *sipPy) { @@ -716,7 +681,6 @@ static PyObject *var_AmSipRequest_cmd(PyObject *sipSelf,PyObject *sipPy) } PyMethodDef variables_AmSipRequest[] = { - {sipNm_py_sems_lib_key, var_AmSipRequest_key, 0, NULL}, {sipNm_py_sems_lib_next_hop, var_AmSipRequest_next_hop, 0, NULL}, {sipNm_py_sems_lib_route, var_AmSipRequest_route, 0, NULL}, {sipNm_py_sems_lib_body, var_AmSipRequest_body, 0, NULL}, diff --git a/apps/py_sems/sip/sippy_sems_libAmSipRequest.h b/apps/py_sems/sip/sippy_sems_libAmSipRequest.h index 5f60e5c2..eb510d28 100644 --- a/apps/py_sems/sip/sippy_sems_libAmSipRequest.h +++ b/apps/py_sems/sip/sippy_sems_libAmSipRequest.h @@ -8,7 +8,7 @@ #define _py_sems_libAmSipRequest_h #line 6 "AmSipRequest.sip" -#include "../../../core/AmSipRequest.h" +#include "../../../core/AmSipMsg.h" #line 13 "sippy_sems_libAmSipRequest.h" #define sipClass_AmSipRequest sipModuleAPI_py_sems_lib.em_types[11]