[gnumeric] compilation: match goffice changes.

[Morten Welinder <mortenw src gnome org>]

commit 027bc98f7847c6ef7a80c4b55abaf77e578d98b0
Author: Morten Welinder <terra gnome org>
Date:   Thu Oct 15 15:53:04 2009 -0400

    compilation: match goffice changes.

 plugins/excel/ms-excel-read.c  |   36 +++++++++++++++++-------------------
 plugins/excel/ms-excel-write.c |    2 +-
 src/gnm-so-line.c              |    7 +++----
 src/wbc-gtk-actions.c          |    3 +--
 src/xml-sax-read.c             |    3 +--
 5 files changed, 23 insertions(+), 28 deletions(-)
---
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index 4a559f7..690163f 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -445,7 +445,6 @@ handle_arrow_head (SheetObject *so, const char *prop_name,
 		   MSObjAttrID wid, MSObjAttrID lid)
 {
 	GOArrow arrow;
-	GOColor col = GO_COLOR_BLACK;
 	int w = ms_obj_attr_get_int (attrs, wid, 1);
 	int l = ms_obj_attr_get_int (attrs, lid, 1);
 
@@ -458,32 +457,31 @@ handle_arrow_head (SheetObject *so, const char *prop_name,
 		break;
 	default:
 	case 1: /* Regular */
-		go_arrow_init (&arrow, GO_ARROW_TRIANGLE, col,
-			       3.5 * (l + 1),
-			       3.5 * (l + 1),
-			       2.5 * (w + 1));
+		go_arrow_init_kite (&arrow,
+				    3.5 * (l + 1),
+				    3.5 * (l + 1),
+				    2.5 * (w + 1));
 		break;
 	case 2: /* Stealth */
-		go_arrow_init (&arrow, GO_ARROW_TRIANGLE, col,
-			       2.5 * (l + 1),
-			       4.0 * (l + 1),
-			       2.0 * (w + 1));
+		go_arrow_init_kite (&arrow,
+				    2.5 * (l + 1),
+				    4.0 * (l + 1),
+				    2.0 * (w + 1));
 		break;
 	case 3: /* Diamond */
-		go_arrow_init (&arrow, GO_ARROW_TRIANGLE, col,
-			       5 * (l + 1),
-			       2.5 * (l + 1),
-			       2.5 * (w + 1));
+		go_arrow_init_kite (&arrow,
+				    5 * (l + 1),
+				    2.5 * (l + 1),
+				    2.5 * (w + 1));
 		break;
 	case 4: /* Oval */
-		go_arrow_init (&arrow, GO_ARROW_OVAL, col,
-			       (l + 1) * 2.5, (w + 1) * 2.5, 0);
+		go_arrow_init_oval (&arrow, (l + 1) * 2.5, (w + 1) * 2.5);
 		break;
 	case 5: /* Open -- Approximation! */
-		go_arrow_init (&arrow, GO_ARROW_TRIANGLE, col,
-			       1.0 * (l + 1),
-			       2.5 * (l + 1),
-			       1.5 * (w + 1));
+		go_arrow_init_kite (&arrow,
+				    1.0 * (l + 1),
+				    2.5 * (l + 1),
+				    1.5 * (w + 1));
 		break;
 	}
 
diff --git a/plugins/excel/ms-excel-write.c b/plugins/excel/ms-excel-write.c
index 43f355b..b9b00a4 100644
--- a/plugins/excel/ms-excel-write.c
+++ b/plugins/excel/ms-excel-write.c
@@ -4555,7 +4555,7 @@ write_arrow (GOArrow const *arrow, GString *escher, gsize optmark,
 	case GO_ARROW_NONE:
 		typ = 0;
 		break;
-	case GO_ARROW_TRIANGLE:
+	case GO_ARROW_KITE:
 		if (fabs (arrow->a - arrow->b) < 0.01) {
 			typ = 1;
 			l = (int)CLAMP ((arrow->a / 3.5) - 1, 0.0, 2.0);
diff --git a/src/gnm-so-line.c b/src/gnm-so-line.c
index 1090092..e1c39c0 100644
--- a/src/gnm-so-line.c
+++ b/src/gnm-so-line.c
@@ -160,7 +160,7 @@ draw_arrow (GOArrow *arrow, cairo_t *cr,
 	case GO_ARROW_NONE:
 		return;
 
-	case GO_ARROW_TRIANGLE:
+	case GO_ARROW_KITE:
 		cairo_save (cr);
 		cairo_translate (cr, *x, *y);
 		cairo_rotate (cr, phi);
@@ -301,9 +301,8 @@ gnm_so_line_prep_sax_parser (SheetObject *so, GsfXMLIn *xin,
 
 	/* 2 == arrow */
 	if (type == 2 && arrow_a >= 0. && arrow_b >= 0. && arrow_c >= 0.)
-		go_arrow_init (&sol->end_arrow,
-			       GO_ARROW_TRIANGLE, GO_COLOR_BLACK,
-			       arrow_a, arrow_b, arrow_c);
+		go_arrow_init_kite (&sol->end_arrow,
+				    arrow_a, arrow_b, arrow_c);
 }
 
 static void
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index 057ae9c..d076680 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -1239,8 +1239,7 @@ static GNM_ACTION_DEF (cmd_create_line)
 	{ create_object (wbcg, GNM_SO_LINE_TYPE, NULL); }
 static GNM_ACTION_DEF (cmd_create_arrow) {
 	GOArrow arrow;
-	go_arrow_init (&arrow, GO_ARROW_TRIANGLE, GO_COLOR_BLACK,
-		       8., 10., 3.);
+	go_arrow_init_kite (&arrow, 8., 10., 3.);
 	create_object (wbcg, GNM_SO_LINE_TYPE, "end-arrow", &arrow, NULL);
 }
 static GNM_ACTION_DEF (cmd_create_rectangle)
diff --git a/src/xml-sax-read.c b/src/xml-sax-read.c
index cc7ea31..95fb42d 100644
--- a/src/xml-sax-read.c
+++ b/src/xml-sax-read.c
@@ -2159,8 +2159,7 @@ xml_sax_read_obj (GsfXMLIn *xin, gboolean needs_cleanup,
 		so = g_object_new (GNM_SO_LINE_TYPE, NULL);
 	else if (!strcmp (type_name, "Arrow")) {
 		GOArrow arrow;
-		go_arrow_init (&arrow, GO_ARROW_TRIANGLE, GO_COLOR_BLACK,
-			       8., 10., 3.);
+		go_arrow_init_kite (&arrow, 8., 10., 3.);
 		so = g_object_new (GNM_SO_LINE_TYPE,
 				   "end-arrow", &arrow,
 				   NULL);