--- ./work/gnumeric-1.12.46/src/sheet-object-widget.c~	2020-09-22 11:56:00.381115000 +0800
+++ ./work/gnumeric-1.12.46/src/sheet-object-widget.c	2020-09-22 11:47:22.885380000 +0800
@@ -124,10 +124,10 @@
 {
 	GocGroup *group = GOC_GROUP (view);
 
-	if (group == NULL || group->children == NULL)
+	if (group == NULL || group->Xchildren == NULL)
 		return NULL;
 
-	return GOC_WIDGET (group->children->data);
+	return GOC_WIDGET (group->Xchildren->data);
 }
 
 static void
@@ -157,7 +157,7 @@
 so_widget_view_get_window (GocItem *item)
 {
 	GocGroup *group = GOC_GROUP (item);
-	return goc_item_get_window (GOC_ITEM (group->children->data));
+	return goc_item_get_window (GOC_ITEM (group->Xchildren->data));
 }
 
 static void
--- ./work/gnumeric-1.12.46/src/gnm-so-path.c~	2018-05-17 04:23:05.000000000 +0800
+++ ./work/gnumeric-1.12.46/src/gnm-so-path.c	2020-09-22 11:42:35.452244000 +0800
@@ -205,7 +205,7 @@
 			G_GNUC_UNUSED GParamSpec *pspec,
 			GnmSOPathView *group)
 {
-	GList *ptr = GOC_GROUP (group)->children;
+	GList *ptr = GOC_GROUP (group)->Xchildren;
 	for (; ptr && ptr->data; ptr = ptr->next)
 		if (GOC_IS_PATH (ptr->data))
 			cb_gnm_so_path_style_changed (GOC_ITEM (ptr->data), sop);
--- ./work/gnumeric-1.12.46/src/sheet-object-image.c~	2018-05-17 04:23:05.000000000 +0800
+++ ./work/gnumeric-1.12.46/src/sheet-object-image.c	2020-09-22 11:45:44.038368000 +0800
@@ -46,7 +46,7 @@
 static void
 so_image_view_set_bounds (SheetObjectView *sov, double const *coords, gboolean visible)
 {
-	GocItem *view = GOC_ITEM (GOC_GROUP (sov)->children->data);
+	GocItem *view = GOC_ITEM (GOC_GROUP (sov)->Xchildren->data);
 	double scale = goc_canvas_get_pixels_per_unit (view->canvas);
 
 	if (visible) {
--- ./work/gnumeric-1.12.46/src/widgets/gnm-filter-combo-view.c~	2018-05-17 04:23:05.000000000 +0800
+++ ./work/gnumeric-1.12.46/src/widgets/gnm-filter-combo-view.c	2020-09-22 11:49:39.903100000 +0800
@@ -334,7 +334,7 @@
 		if (h > 20.)	/* clip vertically */
 			h = 20.;
 		h /= scale;
-		goc_item_set (GOC_ITEM (view->children->data),
+		goc_item_set (GOC_ITEM (view->Xchildren->data),
 			/* put it inside the cell */
 			"x",	  ((coords[2] >= 0.) ? (coords[2] / scale - h + 1) : coords[0] / scale),
 			"y",	  coords [3] / scale - h + 1.,
--- ./work/gnumeric-1.12.46/src/widgets/gnm-validation-combo-view.c~	2018-05-17 04:23:05.000000000 +0800
+++ ./work/gnumeric-1.12.46/src/widgets/gnm-validation-combo-view.c	2020-09-22 11:50:26.221508000 +0800
@@ -189,7 +189,7 @@
 		if (h > 20.)	/* clip vertically */
 			h = 20.;
 		h /= scale;
-		goc_item_set (GOC_ITEM (view->children->data),
+		goc_item_set (GOC_ITEM (view->Xchildren->data),
 			/* put it outside the cell */
 			"x",	  ((coords[2] >= 0.)? coords[2] / scale: (coords[0] / scale - h + 1.)),
 			"y",	  coords [3] / scale - h + 1.,
--- ./work/gnumeric-1.12.46/src/widgets/gnm-sheet-slicer-combo-view.c~	2018-05-17 04:23:05.000000000 +0800
+++ ./work/gnumeric-1.12.46/src/widgets/gnm-sheet-slicer-combo-view.c	2020-09-22 11:50:00.526247000 +0800
@@ -167,7 +167,7 @@
 		if (h > 20.)	/* clip vertically */
 			h = 20.;
 		h /= scale;
-		goc_item_set (GOC_ITEM (view->children->data),
+		goc_item_set (GOC_ITEM (view->Xchildren->data),
 			/* put it outside the cell */
 			"x",	  ((coords[2] >= 0.) ? coords[2] / scale : (coords[0] / scale - h + 1.)),
 			"y",	  coords [3] / scale - h + 1.,
--- ./work/gnumeric-1.12.46/src/sheet-object-cell-comment.c~	2018-05-17 04:23:05.000000000 +0800
+++ ./work/gnumeric-1.12.46/src/sheet-object-cell-comment.c	2020-09-22 11:44:31.416487000 +0800
@@ -84,7 +84,7 @@
 {
 	CommentView *cv = (CommentView *)sov;
 	GocPoints *points = goc_points_new (3);
-	GocItem *item = GOC_ITEM (GOC_GROUP (sov)->children->data);
+	GocItem *item = GOC_ITEM (GOC_GROUP (sov)->Xchildren->data);
 	if (visible) {
 		SheetObject *so = sheet_object_view_get_so (sov);
 		SheetControlGUI const *scg = GNM_SIMPLE_CANVAS (item->canvas)->scg;
--- ./work/gnumeric-1.12.46/src/gnm-so-line.c~	2018-11-17 08:02:49.000000000 +0800
+++ ./work/gnumeric-1.12.46/src/gnm-so-line.c	2020-09-22 11:41:41.341976000 +0800
@@ -59,7 +59,7 @@
 static void
 so_line_view_set_bounds (SheetObjectView *sov, double const *coords, gboolean visible)
 {
-	GocItem	*view = GOC_ITEM (sov), *item = GOC_ITEM (GOC_GROUP (view)->children->data);
+	GocItem	*view = GOC_ITEM (sov), *item = GOC_ITEM (GOC_GROUP (view)->Xchildren->data);
 	SheetObject	*so = sheet_object_view_get_so (sov);
 	GOStyleLine const *style = &GNM_SO_LINE (so)->style->line;
 	double scale = goc_canvas_get_pixels_per_unit (view->canvas);
@@ -128,7 +128,7 @@
 			G_GNUC_UNUSED GParamSpec *pspec,
 			GocItem *item)
 {
-	item = GOC_ITEM (GOC_GROUP (item)->children->data);
+	item = GOC_ITEM (GOC_GROUP (item)->Xchildren->data);
 	goc_item_set (item,
 		      "start-arrow", &sol->start_arrow,
 		      "end-arrow", &sol->end_arrow,
--- ./work/gnumeric-1.12.46/src/sheet-object-component.c~	2020-09-22 11:45:19.431152000 +0800
+++ ./work/gnumeric-1.12.46/src/sheet-object-component.c	2020-09-22 11:48:20.065584000 +0800
@@ -491,8 +491,8 @@
 	for (; l; l = l->next)
 		if (l->data) {
 			GocGroup *group = GOC_GROUP (l->data);
-			if (group->children->data)
-				g_object_set (group->children->data, "object", component, NULL);
+			if (group->Xchildren->data)
+				g_object_set (group->Xchildren->data, "object", component, NULL);
 		}
 	if (component) {
 		g_object_ref (component);
--- ./work/gnumeric-1.12.46/src/gnm-so-polygon.c~	2020-09-22 11:42:18.204921000 +0800
+++ ./work/gnumeric-1.12.46/src/gnm-so-polygon.c	2020-09-22 11:43:07.723049000 +0800
@@ -129,7 +129,7 @@
 static void
 cb_gnm_so_polygon_style_changed (GocItem *view, GnmSOPolygon const *sop)
 {
-	GocItem *item = GOC_ITEM (GOC_GROUP (view)->children->data);
+	GocItem *item = GOC_ITEM (GOC_GROUP (view)->Xchildren->data);
 	GOStyle const *style = sop->style;
 	goc_item_set (item, "style", style, NULL);
 }