Revert r11370. Fix crash with grid in default template

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

(bzr r11386)

1 files changed, 6 insertions, 6 deletions

diff --git a/src/display/sodipodi-ctrlrect.cpp b/src/display/sodipodi-ctrlrect.cpp
index 7063f2102..3b50d0b5d 100644
--- a/src/display/sodipodi-ctrlrect.cpp
+++ b/src/display/sodipodi-ctrlrect.cpp
@@ -28,7 +28,7 @@
 
 static void sp_ctrlrect_class_init(SPCtrlRectClass *c);
 static void sp_ctrlrect_init(CtrlRect *ctrlrect);
-static void sp_ctrlrect_dispose(GObject *object);
+static void sp_ctrlrect_destroy(GtkObject *object);
 
 static void sp_ctrlrect_update(SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags);
 static void sp_ctrlrect_render(SPCanvasItem *item, SPCanvasBuf *buf);
@@ -61,12 +61,12 @@ GType sp_ctrlrect_get_type()
 
 static void sp_ctrlrect_class_init(SPCtrlRectClass *c)
 {
-    GObjectClass *object_class = (GObjectClass *) c;
+    GtkObjectClass *object_class = (GtkObjectClass *) c;
     SPCanvasItemClass *item_class = (SPCanvasItemClass *) c;
 
     parent_class = (SPCanvasItemClass*) g_type_class_peek_parent(c);
 
-    object_class->dispose = sp_ctrlrect_dispose;
+    object_class->destroy = sp_ctrlrect_destroy;
 
     item_class->update = sp_ctrlrect_update;
     item_class->render = sp_ctrlrect_render;
@@ -77,10 +77,10 @@ static void sp_ctrlrect_init(CtrlRect *cr)
     cr->init();
 }
 
-static void sp_ctrlrect_dispose(GObject *object)
+static void sp_ctrlrect_destroy(GtkObject *object)
 {
-    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);
     }
 }