[cairo-commit] pycairo/cairo Makefile.am, 1.6, 1.7 cairogtkmodule.c, 1.6, 1.7 pycairo-context.c, 1.15, 1.16 pycairo-font.c, 1.4, 1.5 pycairo-pattern.c, 1.8, 1.9 pycairo-surface.c, 1.8, 1.9

[Steve Chaplin]

Committed by: stevech1097

Update of /cvs/cairo/pycairo/cairo
In directory gabe:/tmp/cvs-serv9828/cairo

Modified Files:
	Makefile.am cairogtkmodule.c pycairo-context.c pycairo-font.c 
	pycairo-pattern.c pycairo-surface.c 
Log Message:
SC 10/12/2004

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	14 Nov 2004 03:22:18 -0000	1.6
+++ Makefile.am	10 Dec 2004 15:16:40 -0000	1.7
@@ -36,3 +36,11 @@
 numpy_la_SOURCES = \
   caironumpymodule.c
 
+if HAVE_LIBSVG_CAIRO
+pycairoexec_LTLIBRARIES += svg.la
+svg_la_LDFLAGS = -module -avoid-version -export-symbols-regex initsvg
+svg_la_LIBADD  = $(CAIRO_LIBS) $(LIBSVG_CAIRO_LIBS)
+svg_la_SOURCES = \
+  pycairosvg-context.c \
+  cairosvgmodule.c
+endif

Index: cairogtkmodule.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/cairogtkmodule.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cairogtkmodule.c	10 Dec 2004 13:03:35 -0000	1.6
+++ cairogtkmodule.c	10 Dec 2004 15:16:40 -0000	1.7
@@ -35,6 +35,7 @@
 #  include <config.h>
 #endif
 #include "pycairo.h"
+#include "pycairo-misc.h"
 #include <cairo.h>
 #include <pygtk/pygtk.h>
 #include <gdk/gdkx.h>
@@ -99,8 +100,7 @@
     if (pycairo_check_status(cairo_status(context->ctx)))
 	return NULL;
 
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 static PyObject *

Index: pycairo-context.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-context.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- pycairo-context.c	10 Dec 2004 13:03:35 -0000	1.15
+++ pycairo-context.c	10 Dec 2004 15:16:40 -0000	1.16
@@ -36,6 +36,7 @@
 #  include <config.h>
 #endif
 #include "pycairo-private.h"
+#include "pycairo-misc.h"
 
 PyObject *
 pycairo_context_wrap(cairo_t *ctx)

Index: pycairo-font.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-font.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pycairo-font.c	10 Dec 2004 13:03:35 -0000	1.4
+++ pycairo-font.c	10 Dec 2004 15:16:40 -0000	1.5
@@ -35,6 +35,7 @@
 #  include <config.h>
 #endif
 #include "pycairo-private.h"
+#include "pycairo-misc.h"
 
 PyObject *
 pycairo_font_wrap(cairo_font_t *font)

Index: pycairo-pattern.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-pattern.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pycairo-pattern.c	10 Dec 2004 13:03:35 -0000	1.8
+++ pycairo-pattern.c	10 Dec 2004 15:16:40 -0000	1.9
@@ -35,6 +35,7 @@
 #  include <config.h>
 #endif
 #include "pycairo-private.h"
+#include "pycairo-misc.h"
 
 
 /* wrap an existing cairo_pattern_t in a PyCairoPattern object */

Index: pycairo-surface.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-surface.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pycairo-surface.c	10 Dec 2004 13:03:35 -0000	1.8
+++ pycairo-surface.c	10 Dec 2004 15:16:40 -0000	1.9
@@ -36,6 +36,7 @@
 #  include <config.h>
 #endif
 #include "pycairo-private.h"
+#include "pycairo-misc.h"
 
 PyObject *
 pycairo_surface_wrap(cairo_surface_t *surface)