Revert r11370. Fix crash with grid in default template

Fixed bugs:
  - https://launchpad.net/bugs/1001724

(bzr r11386)

1 files changed, 14 insertions, 8 deletions

diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp
index 7e4d440ae..11bccf2a6 100644
--- a/src/display/canvas-bpath.cpp
+++ b/src/display/canvas-bpath.cpp
@@ -29,7 +29,7 @@
 
 static void sp_canvas_bpath_class_init (SPCanvasBPathClass *klass);
 static void sp_canvas_bpath_init (SPCanvasBPath *path);
-static void sp_canvas_bpath_dispose(GObject *object);
+static void sp_canvas_bpath_destroy (GtkObject *object);
 
 static void sp_canvas_bpath_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags);
 static void sp_canvas_bpath_render (SPCanvasItem *item, SPCanvasBuf *buf);
@@ -57,14 +57,19 @@ sp_canvas_bpath_get_type (void)
     return type;
 }
 
-static void sp_canvas_bpath_class_init(SPCanvasBPathClass *klass)
+static void
+sp_canvas_bpath_class_init (SPCanvasBPathClass *klass)
 {
-    GObjectClass *object_class = G_OBJECT_CLASS(klass);
-    SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass;
+    GtkObjectClass *object_class;
+    SPCanvasItemClass *item_class;
+
+    object_class = GTK_OBJECT_CLASS (klass);
+    item_class = (SPCanvasItemClass *) klass;
 
     parent_class = (SPCanvasItemClass*)g_type_class_peek_parent (klass);
 
-    object_class->dispose = sp_canvas_bpath_dispose;
+    object_class->destroy = sp_canvas_bpath_destroy;
+
     item_class->update = sp_canvas_bpath_update;
     item_class->render = sp_canvas_bpath_render;
     item_class->point = sp_canvas_bpath_point;
@@ -83,7 +88,8 @@ sp_canvas_bpath_init (SPCanvasBPath * bpath)
     bpath->stroke_miterlimit = 11.0;
 }
 
-static void sp_canvas_bpath_dispose(GObject *object)
+static void
+sp_canvas_bpath_destroy (GtkObject *object)
 {
     SPCanvasBPath *cbp = SP_CANVAS_BPATH (object);
 
@@ -91,8 +97,8 @@ static void sp_canvas_bpath_dispose(GObject *object)
         cbp->curve = cbp->curve->unref();
     }
 
-    if (G_OBJECT_CLASS (parent_class)->dispose)
-        (* G_OBJECT_CLASS (parent_class)->dispose) (object);
+    if (GTK_OBJECT_CLASS (parent_class)->destroy)
+        (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
 
 static void sp_canvas_bpath_update(SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags)