goffice r1796 - in trunk: . docs/reference/tmpl goffice/graph

[emmanuel svn gnome org]

Author: emmanuel
Date: 2007-08-11 15:31:51 +0100 (Sat, 11 Aug 2007)
New Revision: 1796
ViewCVS link: http://svn.gnome.org/viewcvs/goffice?rev=1796&view=rev

Removed:
   trunk/goffice/graph/gog-renderer-cairo.c
   trunk/goffice/graph/gog-renderer-cairo.h
   trunk/goffice/graph/gog-renderer-gnome-print.c
   trunk/goffice/graph/gog-renderer-gnome-print.h
   trunk/goffice/graph/gog-renderer-impl.h
   trunk/goffice/graph/gog-renderer-svg.c
   trunk/goffice/graph/gog-renderer-svg.h
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/docs/reference/tmpl/gog-renderer.sgml
   trunk/goffice/graph/Makefile.am
   trunk/goffice/graph/gog-graph.c
   trunk/goffice/graph/gog-renderer.c
   trunk/goffice/graph/gog-renderer.h
Log:
2007-08-02 Emmanuel Pacaud <emmanuel pacaud lapp in2p3 fr>

	Merge of GogRenderer and GogRendererCairo.

	* configure.in: explicitely require cairo, cairo-svg, cairo-pdf and
	cairo-ps 1.2.0.
	* goffice/graph/gog-renderer-cairo.[ch]: merge code in gog-renderer.
	* goffice/graph/gog-renderer-svg.[ch]: deleted.
	* goffice/graph/gog-renderer-gnome-print.[ch]: removed.
	* goffice/graph/gog-renderer-impl.h: removed.
	* goffice/graph/Makefile.am: update.
	* goffice/graph/gog-graph.c (gog_graph_export_image): GogRendererCairo
	doesn't exist anymore.
	(gog_graph_render_to_cairo): ditto.
	* goffice/graph/gog-renderer.c: merge cairo implementation.

Conflicts:

	ChangeLog
	goffice/graph/gog-renderer-cairo.c
	goffice/graph/gog-renderer.c