7 files changed, 19 insertions, 7 deletions
diff --git a/src/box.c b/src/box.c
index 2b4f5ef..a6cdb85 100644
--- a/src/box.c
+++ b/src/box.c
@@ -47,7 +47,8 @@ enum {
 static void
 ganv_box_init(GanvBox* box)
 {
-	box->impl = GANV_BOX_GET_PRIVATE(box);
+	box->impl = G_TYPE_INSTANCE_GET_PRIVATE(
+		box, GANV_TYPE_BOX, GanvBoxImpl);
 
 	memset(&box->impl->coords, '\0', sizeof(GanvBoxCoords));
 	box->impl->coords.border_width = box->node.impl->border_width;
diff --git a/src/circle.c b/src/circle.c
index c04e2d1..3c461c3 100644
--- a/src/circle.c
+++ b/src/circle.c
@@ -35,7 +35,8 @@ enum {
 static void
 ganv_circle_init(GanvCircle* circle)
 {
-	circle->impl = GANV_CIRCLE_GET_PRIVATE(circle);
+	circle->impl = G_TYPE_INSTANCE_GET_PRIVATE(
+		circle, GANV_TYPE_CIRCLE, GanvCircleImpl);
 
 	memset(&circle->impl->coords, '\0', sizeof(GanvCircleCoords));
 	circle->impl->coords.radius = 8.0;
diff --git a/src/edge.c b/src/edge.c
index 89c99fa..d2cbe5b 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -59,7 +59,9 @@ static GnomeCanvasItemClass* parent_class;
 static void
 ganv_edge_init(GanvEdge* edge)
 {
-	GanvEdgeImpl* impl = GANV_EDGE_GET_PRIVATE(edge);
+	GanvEdgeImpl* impl = G_TYPE_INSTANCE_GET_PRIVATE(
+		edge, GANV_TYPE_EDGE, GanvEdgeImpl);
+
 	edge->impl = impl;
 
 	impl->tail = NULL;
diff --git a/src/module.c b/src/module.c
index c4e72b1..21fca0a 100644
--- a/src/module.c
+++ b/src/module.c
@@ -47,7 +47,9 @@ enum {
 static void
 ganv_module_init(GanvModule* module)
 {
-	GanvModuleImpl* impl = GANV_MODULE_GET_PRIVATE(module);
+	GanvModuleImpl* impl = G_TYPE_INSTANCE_GET_PRIVATE(
+		module, GANV_TYPE_MODULE, GanvModuleImpl);
+
 	module->impl = impl;
 
 	GANV_NODE(module)->impl->can_head = FALSE;
diff --git a/src/node.c b/src/node.c
index 5dabd2a..7d2c7b9 100644
--- a/src/node.c
+++ b/src/node.c
@@ -55,7 +55,9 @@ on_event(GanvNode* node, GdkEvent* event)
 static void
 ganv_node_init(GanvNode* node)
 {
-	GanvNodeImpl* impl = GANV_NODE_GET_PRIVATE(node);
+	GanvNodeImpl* impl = G_TYPE_INSTANCE_GET_PRIVATE(
+		node, GANV_TYPE_NODE, GanvNodeImpl);
+
 	node->impl = impl;
 
 	impl->partner      = NULL;
diff --git a/src/port.c b/src/port.c
index dc4aed7..63efd2e 100644
--- a/src/port.c
+++ b/src/port.c
@@ -38,7 +38,9 @@ enum {
 static void
 ganv_port_init(GanvPort* port)
 {
-	port->impl           = GANV_PORT_GET_PRIVATE(port);
+	port->impl = G_TYPE_INSTANCE_GET_PRIVATE(
+		port, GANV_TYPE_PORT, GanvPortImpl);
+
 	port->impl->is_input = TRUE;
 }
 
diff --git a/src/text.c b/src/text.c
index b2e956c..0a616d2 100644
--- a/src/text.c
+++ b/src/text.c
@@ -45,7 +45,9 @@ enum {
 static void
 ganv_text_init(GanvText* text)
 {
-	GanvTextImpl* impl = GANV_TEXT_GET_PRIVATE(text);
+	GanvTextImpl* impl = G_TYPE_INSTANCE_GET_PRIVATE(
+		text, GANV_TYPE_TEXT, GanvTextImpl);
+
 	text->impl = impl;
 
 	memset(&impl->coords, '\0', sizeof(GanvTextCoords));