[cairo-commit] pycairo/cairo pycairo-path.c, 1.8, 1.9 pycairo-private.h, 1.39, 1.40 cairomodule.c, 1.57, 1.58

[Steve Chaplin]

Committed by: stevech1097

Update of /cvs/cairo/pycairo/cairo
In directory kemper:/tmp/cvs-serv7966/cairo

Modified Files:
	pycairo-path.c pycairo-private.h cairomodule.c 
Log Message:
'SC'

Index: pycairo-path.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-path.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pycairo-path.c	19 Aug 2005 02:46:55 -0000	1.8
+++ pycairo-path.c	21 Sep 2006 12:15:10 -0000	1.9
@@ -230,7 +230,7 @@
     PycairoPath *pypath; /* Set to NULL when iterator is exhausted */
 } PycairoPathiter;
 
-static PyTypeObject PycairoPathiter_Type;
+PyTypeObject PycairoPathiter_Type;
 
 
 static void
@@ -303,7 +303,7 @@
     return NULL;
 }
 
-static PyTypeObject PycairoPathiter_Type = {
+PyTypeObject PycairoPathiter_Type = {
     PyObject_HEAD_INIT(NULL)
     0,                                  /* ob_size */
     "cairo.Pathiter",                   /* tp_name */
@@ -330,7 +330,7 @@
     0,                                  /* tp_clear */
     0,                                  /* tp_richcompare */
     0,                                  /* tp_weaklistoffset */
-    PyObject_SelfIter,			/* tp_iter */
+    0, /* PyObject_SelfIter, */		/* tp_iter */
     (iternextfunc)pathiter_next,	/* tp_iternext */
     0,					/* tp_methods */
 };

Index: pycairo-private.h
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-private.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- pycairo-private.h	11 Jun 2006 07:17:26 -0000	1.39
+++ pycairo-private.h	21 Sep 2006 12:15:10 -0000	1.40
@@ -62,6 +62,8 @@
 extern PyTypeObject PycairoPath_Type;
 PyObject *PycairoPath_FromPath (cairo_path_t *path);
 
+extern PyTypeObject PycairoPathiter_Type;
+
 extern PyTypeObject PycairoPattern_Type;
 extern PyTypeObject PycairoSolidPattern_Type;
 extern PyTypeObject PycairoSurfacePattern_Type;

Index: cairomodule.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/cairomodule.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- cairomodule.c	21 Aug 2006 03:32:28 -0000	1.57
+++ cairomodule.c	21 Sep 2006 12:15:10 -0000	1.58
@@ -169,6 +169,7 @@
     PycairoPath_Type.tp_base = &PyBaseObject_Type;
     if (PyType_Ready(&PycairoPath_Type) < 0)
 	return;
+    PycairoPathiter_Type.tp_iter=&PyObject_SelfIter;
 
     PycairoPattern_Type.tp_base = &PyBaseObject_Type;
     if (PyType_Ready(&PycairoPattern_Type) < 0)