[drgeo/goffice: 78/82] needs libgoffice-0.3 >= 0.3.1. ported to new goffice api.



commit 6b8371b0ca876722f24fba12eb6f5af2fdc9bcaa
Author: Jean Brefort <jean brefort normalesup org>
Date:   Mon May 8 16:36:51 2006 +0000

    needs libgoffice-0.3 >= 0.3.1. ported to new goffice api.
    
    2006-05-08  Jean Brefort  <jean brefort normalesup org>
    
    	* configure.ac: needs libgoffice-0.3 >= 0.3.1.
    	* goffice/drgeo.cc: ported to new goffice api.

 ChangeLog        |    5 +++++
 configure.ac     |    2 +-
 goffice/drgeo.cc |    6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index cc14e3a..124cc61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,11 @@
 
 	* configure.ac: Addef fi to ALL_LINGUAS
 
+2006-05-08  Jean Brefort  <jean brefort normalesup org>
+
+	* configure.ac: needs libgoffice-0.3 >= 0.3.1.
+	* goffice/drgeo.cc: ported to new goffice api.
+
 2006-04-17  Kjartan Maraas  <kmaraas gnome org>
 
 	* configure.ac: Remove obsolete entry for no_NO
diff --git a/configure.ac b/configure.ac
index a4b1238..27dbec8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ dnl **********************************************************************
 dnl * CHECK FOR GOFFICE STUFF						 *
 dnl **********************************************************************
 
-PKG_CHECK_MODULES(GODRGEO, libgoffice-0.3 >= 0.3.0, [go_has_component=yes], [go_has_component=no])
+PKG_CHECK_MODULES(GODRGEO, libgoffice-0.3 >= 0.3.1, [go_has_component=yes], [go_has_component=no])
 if test $go_has_component = yes; then
 	AC_SUBST(GODRGEO_CFLAGS)
 	AC_SUBST(GODRGEO_LIBS)
diff --git a/goffice/drgeo.cc b/goffice/drgeo.cc
index b22b9d9..14948c6 100644
--- a/goffice/drgeo.cc
+++ b/goffice/drgeo.cc
@@ -68,7 +68,7 @@ static GObjectClass *godrgeo_parent_klass;
 
 static gboolean
 go_drgeo_component_get_data (GOComponent *component, gpointer *data, int *length,
-									void (**clearfunc) (gpointer))
+									void (**clearfunc) (gpointer), gpointer *user_data)
 {
 	GODrGeoComponent *godrgeo = GO_DRGEO_COMPONENT (component);
 	xmlDocPtr xml = NULL;
@@ -116,12 +116,12 @@ go_drgeo_component_update_bounds (GODrGeoComponent *godrgeo)
 }
 
 static void
-go_drgeo_component_set_data (GOComponent *component, char const *data, int length)
+go_drgeo_component_set_data (GOComponent *component)
 {
 	GODrGeoComponent *godrgeo = GO_DRGEO_COMPONENT (component);
 	xmlDocPtr xml;
 	char *old_num_locale;
-	if (!(xml = xmlParseMemory(data, length)) ||
+	if (!(xml = xmlParseMemory(component->data, component->length)) ||
 		xml->children == NULL ||
 		strcmp((char*)xml->children->name, "drgenius")) {
 		if (xml)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]