[goffice] Little cleanups.

[Jean BrÃfort <jbrefort src gnome org>]

commit c5085292569dd19c15dc84cfcccda5f5af38896c
Author: Jean Brefort <jean brefort normalesup org>
Date:   Thu Aug 4 13:25:02 2011 +0200

    Little cleanups.

 ChangeLog                    |    6 ++++++
 goffice/data/go-data-impl.h  |    6 +++---
 goffice/graph/gog-renderer.c |    7 +------
 3 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index dbce4a8..2613e60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-04  Jean Brefort  <jean brefort normalesup org>
+
+	* goffice/data/go-data-impl.h: fix get_markup method declaration.
+	* goffice/graph/gog-renderer.c (gog_renderer_draw_text),
+	(gog_renderer_get_text_OBR): removed obsolete variables.
+
 2011-08-03  Jean Brefort  <jean brefort normalesup org>
 
 	* goffice/canvas/goc-polygon.c (goc_polygon_set_property): make it
diff --git a/goffice/data/go-data-impl.h b/goffice/data/go-data-impl.h
index 5ffe415..3d90369 100644
--- a/goffice/data/go-data-impl.h
+++ b/goffice/data/go-data-impl.h
@@ -73,7 +73,7 @@ typedef struct {
 	GODataClass base;
 	double       (*get_value)  (GODataScalar *scalar);
 	char const  *(*get_str)	   (GODataScalar *scalar);
-	PangoAttrList *(*get_markup) (GODataScalar *data);
+	PangoAttrList const *(*get_markup) (GODataScalar *data);
 } GODataScalarClass;
 
 #define GO_DATA_VECTOR_LEN_CACHED GO_DATA_SIZE_CACHED
@@ -92,7 +92,7 @@ typedef struct {
 	void	 (*load_values) (GODataVector *vec);
 	double	 (*get_value)   (GODataVector *vec, unsigned i);
 	char	*(*get_str)	(GODataVector *vec, unsigned i);
-	PangoAttrList *(*get_markup) (GODataVector *data, unsigned i);
+	PangoAttrList const *(*get_markup) (GODataVector *data, unsigned i);
 } GODataVectorClass;
 
 #define	GO_DATA_MATRIX_SIZE_CACHED GO_DATA_SIZE_CACHED
@@ -112,7 +112,7 @@ typedef struct {
 	void	 (*load_values) (GODataMatrix *vec);
 	double	 (*get_value)   (GODataMatrix *mat, unsigned i, unsigned j);
 	char	*(*get_str)	(GODataMatrix *mat, unsigned i, unsigned j);
-	PangoAttrList *(*get_markup) (GODataMatrix *mat, unsigned i, unsigned j);
+	PangoAttrList const *(*get_markup) (GODataMatrix *mat, unsigned i, unsigned j);
 } GODataMatrixClass;
 
 G_END_DECLS
diff --git a/goffice/graph/gog-renderer.c b/goffice/graph/gog-renderer.c
index 3eebd9a..c391b1f 100644
--- a/goffice/graph/gog-renderer.c
+++ b/goffice/graph/gog-renderer.c
@@ -878,7 +878,6 @@ gog_renderer_draw_text (GogRenderer *rend, char const *text,
 			GogViewAllocation const *pos, GOAnchorType anchor,
 			gboolean use_markup)
 {
-	cairo_t *cairo;
 	GOString *str;
 	PangoAttrList *attr_list = NULL;
 	char *m_text = NULL;
@@ -889,7 +888,6 @@ gog_renderer_draw_text (GogRenderer *rend, char const *text,
 	if (*text == '\0')
 		return;
 
-	cairo = rend->cairo;
 	if (use_markup && pango_parse_markup  (text, -1, 0,
 					       &attr_list, &m_text,
 					       NULL, NULL))
@@ -967,7 +965,6 @@ void
 gog_renderer_get_text_OBR (GogRenderer *rend, char const *text,
 			   gboolean use_markup, GOGeometryOBR *obr)
 {
-	cairo_t *cairo;
 	GOString *str;
 	PangoAttrList *attr_list = NULL;
 	char *m_text = NULL;
@@ -975,8 +972,6 @@ gog_renderer_get_text_OBR (GogRenderer *rend, char const *text,
 	g_return_if_fail (GOG_IS_RENDERER (rend));
 	g_return_if_fail (text != NULL);
 
-	cairo = rend->cairo;
-
 	if (use_markup && pango_parse_markup  (text, -1, 0,
 					       &attr_list, &m_text,
 					       NULL, NULL))
@@ -1008,7 +1003,7 @@ gog_renderer_get_text_AABR (GogRenderer *rend, char const *text,
 /**
  * gog_renderer_get_gostring_AABR :
  * @rend: #GogRenderer
- * @string: the string to draw
+ * @str: the string to draw
  * @aabr: #GOGeometryAABR to store the Axis Aligned Bounding Rectangle of @text.
  **/
 void