[frontierkernel-commits] Frontier/Common/source langpython.c,1.2.4.29,1.2.4.30

[David B. <dav...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15932

Modified Files:
      Tag: sidewinder-branch
	langpython.c 
Log Message:
changed name of UserTalk object type to UserTalkObject to avoid conflict with UserTalk module global

Index: langpython.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v
retrieving revision 1.2.4.29
retrieving revision 1.2.4.30
diff -C2 -d -r1.2.4.29 -r1.2.4.30
*** langpython.c	18 Dec 2004 22:31:20 -0000	1.2.4.29
--- langpython.c	18 Dec 2004 22:38:02 -0000	1.2.4.30
***************
*** 1635,1639 ****
      PyObject_HEAD_INIT(NULL)
      0,                               /*ob_size*/
!     "frontier.UserTalk",             /*tp_name*/
      sizeof(frontier_UserTalkObject), /*tp_basicsize*/
      0,                               /*tp_itemsize*/
--- 1635,1639 ----
      PyObject_HEAD_INIT(NULL)
      0,                               /*ob_size*/
!     "frontier.UserTalkObject",       /*tp_name*/
      sizeof(frontier_UserTalkObject), /*tp_basicsize*/
      0,                               /*tp_itemsize*/
***************
*** 1704,1708 ****
                       addType(m, &frontier_InternalValueType, "InternalValue") &&
                       addType(m, &frontier_ExternalValueType, "ExternalValue") &&
!                      addType(m, &frontier_UserTalkType, "UserTalk");
                       
      if (!result)
--- 1704,1708 ----
                       addType(m, &frontier_InternalValueType, "InternalValue") &&
                       addType(m, &frontier_ExternalValueType, "ExternalValue") &&
!                      addType(m, &frontier_UserTalkType, "UserTalkObject");
                       
      if (!result)
***************
*** 1805,1809 ****
      frontier_UserTalkObject *obj;
      
!     class = PyObject_GetAttrString(frontierModule, "UserTalk");
      obj = PyObject_New(frontier_UserTalkObject, (PyTypeObject *)class);
      
--- 1805,1809 ----
      frontier_UserTalkObject *obj;
      
!     class = PyObject_GetAttrString(frontierModule, "UserTalkObject");
      obj = PyObject_New(frontier_UserTalkObject, (PyTypeObject *)class);