Drop some GtkObject usage

(bzr r11370)

8 files changed, 55 insertions, 82 deletions

diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp
index 9aa119be9..79629c2e2 100644
--- a/src/display/canvas-arena.cpp
+++ b/src/display/canvas-arena.cpp
@@ -32,7 +32,7 @@ enum {
 
 static void sp_canvas_arena_class_init(SPCanvasArenaClass *klass);
 static void sp_canvas_arena_init(SPCanvasArena *group);
-static void sp_canvas_arena_destroy(GtkObject *object);
+static void sp_canvas_arena_dispose(GObject *object);
 
 static void sp_canvas_arena_item_deleted(SPCanvasArena *arena, Inkscape::DrawingItem *item);
 static void sp_canvas_arena_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags);
@@ -93,11 +93,8 @@ sp_canvas_arena_get_type (void)
 static void
 sp_canvas_arena_class_init (SPCanvasArenaClass *klass)
 {
-    GtkObjectClass *object_class;
-    SPCanvasItemClass *item_class;
-
-    object_class = (GtkObjectClass *) klass;
-    item_class = (SPCanvasItemClass *) klass;
+    GObjectClass *object_class = (GObjectClass *) klass;
+    SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass;
 
     parent_class = (SPCanvasItemClass*)g_type_class_peek_parent (klass);
 
@@ -109,8 +106,7 @@ sp_canvas_arena_class_init (SPCanvasArenaClass *klass)
                                            sp_marshal_INT__POINTER_POINTER,
                                            G_TYPE_INT, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
-    object_class->destroy = sp_canvas_arena_destroy;
-
+    object_class->dispose = sp_canvas_arena_dispose;
     item_class->update = sp_canvas_arena_update;
     item_class->render = sp_canvas_arena_render;
     item_class->point = sp_canvas_arena_point;
@@ -147,16 +143,15 @@ sp_canvas_arena_init (SPCanvasArena *arena)
     arena->active = NULL;
 }
 
-static void
-sp_canvas_arena_destroy (GtkObject *object)
+static void sp_canvas_arena_dispose(GObject *object)
 {
     SPCanvasArena *arena = SP_CANVAS_ARENA (object);
 
     delete arena->observer;
     arena->drawing.~Drawing();
 
-    if (GTK_OBJECT_CLASS (parent_class)->destroy)
-        (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+    if (G_OBJECT_CLASS(parent_class)->dispose)
+        (* G_OBJECT_CLASS(parent_class)->dispose) (object);
 }
 
 static void
diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp
index 11bccf2a6..7e4d440ae 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_destroy (GtkObject *object);
+static void sp_canvas_bpath_dispose(GObject *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,19 +57,14 @@ 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)
 {
-    GtkObjectClass *object_class;
-    SPCanvasItemClass *item_class;
-
-    object_class = GTK_OBJECT_CLASS (klass);
-    item_class = (SPCanvasItemClass *) klass;
+    GObjectClass *object_class = G_OBJECT_CLASS(klass);
+    SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass;
 
     parent_class = (SPCanvasItemClass*)g_type_class_peek_parent (klass);
 
-    object_class->destroy = sp_canvas_bpath_destroy;
-
+    object_class->dispose = sp_canvas_bpath_dispose;
     item_class->update = sp_canvas_bpath_update;
     item_class->render = sp_canvas_bpath_render;
     item_class->point = sp_canvas_bpath_point;
@@ -88,8 +83,7 @@ sp_canvas_bpath_init (SPCanvasBPath * bpath)
     bpath->stroke_miterlimit = 11.0;
 }
 
-static void
-sp_canvas_bpath_destroy (GtkObject *object)
+static void sp_canvas_bpath_dispose(GObject *object)
 {
     SPCanvasBPath *cbp = SP_CANVAS_BPATH (object);
 
@@ -97,8 +91,8 @@ sp_canvas_bpath_destroy (GtkObject *object)
         cbp->curve = cbp->curve->unref();
     }
 
-    if (GTK_OBJECT_CLASS (parent_class)->destroy)
-        (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+    if (G_OBJECT_CLASS (parent_class)->dispose)
+        (* G_OBJECT_CLASS (parent_class)->dispose) (object);
 }
 
 static void sp_canvas_bpath_update(SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags)
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index 92a1b0fb8..c08ce037c 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -57,7 +57,7 @@ static gchar const *const grid_svgname[] = {
 // Grid CanvasItem
 static void grid_canvasitem_class_init (GridCanvasItemClass *klass);
 static void grid_canvasitem_init (GridCanvasItem *grid);
-static void grid_canvasitem_destroy (GtkObject *object);
+static void grid_canvasitem_dispose(GObject *object);
 
 static void grid_canvasitem_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags);
 static void grid_canvasitem_render (SPCanvasItem *item, SPCanvasBuf *buf);
@@ -89,15 +89,12 @@ grid_canvasitem_get_type (void)
 static void
 grid_canvasitem_class_init (GridCanvasItemClass *klass)
 {
-    GtkObjectClass *object_class;
-    SPCanvasItemClass *item_class;
-
-    object_class = (GtkObjectClass *) klass;
-    item_class = (SPCanvasItemClass *) klass;
+    GObjectClass *object_class = (GObjectClass *) klass;
+    SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass;
 
     parent_class = (SPCanvasItemClass*)g_type_class_peek_parent (klass);
 
-    object_class->destroy = grid_canvasitem_destroy;
+    object_class->dispose = grid_canvasitem_dispose;
 
     item_class->update = grid_canvasitem_update;
     item_class->render = grid_canvasitem_render;
@@ -109,14 +106,13 @@ grid_canvasitem_init (GridCanvasItem *griditem)
     griditem->grid = NULL;
 }
 
-static void
-grid_canvasitem_destroy (GtkObject *object)
+static void grid_canvasitem_dispose(GObject *object)
 {
     g_return_if_fail (object != NULL);
     g_return_if_fail (INKSCAPE_IS_GRID_CANVASITEM (object));
 
-    if (GTK_OBJECT_CLASS (parent_class)->destroy)
-        (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+    if (G_OBJECT_CLASS (parent_class)->dispose)
+        (* G_OBJECT_CLASS (parent_class)->dispose) (object);
 }
 
 /**
@@ -184,7 +180,7 @@ CanvasGrid::~CanvasGrid()
     }
 
     while (canvasitems) {
-        gtk_object_destroy(GTK_OBJECT(canvasitems->data));
+        g_object_unref(G_OBJECT(canvasitems->data));
         canvasitems = g_slist_remove(canvasitems, canvasitems->data);
     }
 }
diff --git a/src/display/canvas-text.cpp b/src/display/canvas-text.cpp
index f7a8713b6..b792b775d 100644
--- a/src/display/canvas-text.cpp
+++ b/src/display/canvas-text.cpp
@@ -28,7 +28,7 @@
 
 static void sp_canvastext_class_init (SPCanvasTextClass *klass);
 static void sp_canvastext_init (SPCanvasText *canvastext);
-static void sp_canvastext_destroy (GtkObject *object);
+static void sp_canvastext_dispose(GObject *object);
 
 static void sp_canvastext_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags);
 static void sp_canvastext_render (SPCanvasItem *item, SPCanvasBuf *buf);
@@ -59,12 +59,12 @@ sp_canvastext_get_type (void)
 static void
 sp_canvastext_class_init (SPCanvasTextClass *klass)
 {
-    GtkObjectClass *object_class = (GtkObjectClass *) klass;
+    GObjectClass *object_class = (GObjectClass *) klass;
     SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass;
 
     parent_class_ct = (SPCanvasItemClass*)g_type_class_peek_parent (klass);
 
-    object_class->destroy = sp_canvastext_destroy;
+    object_class->dispose = sp_canvastext_dispose;
 
     item_class->update = sp_canvastext_update;
     item_class->render = sp_canvastext_render;
@@ -93,8 +93,7 @@ sp_canvastext_init (SPCanvasText *canvastext)
     canvastext->border = 3; // must be a constant, and not proportional to any width, height, or fontsize to allow alignment with other text boxes
 }
 
-static void
-sp_canvastext_destroy (GtkObject *object)
+static void sp_canvastext_dispose(GObject *object)
 {
     g_return_if_fail (object != NULL);
     g_return_if_fail (SP_IS_CANVASTEXT (object));
@@ -105,8 +104,8 @@ sp_canvastext_destroy (GtkObject *object)
     canvastext->text = NULL;
     canvastext->item = NULL;
 
-    if (GTK_OBJECT_CLASS (parent_class_ct)->destroy)
-        (* GTK_OBJECT_CLASS (parent_class_ct)->destroy) (object);
+    if (G_OBJECT_CLASS (parent_class_ct)->dispose)
+        (* G_OBJECT_CLASS (parent_class_ct)->dispose) (object);
 }
 
 static void
diff --git a/src/display/gnome-canvas-acetate.cpp b/src/display/gnome-canvas-acetate.cpp
index 0891836b5..75bcdfb2d 100644
--- a/src/display/gnome-canvas-acetate.cpp
+++ b/src/display/gnome-canvas-acetate.cpp
@@ -17,7 +17,7 @@
 
 static void sp_canvas_acetate_class_init (SPCanvasAcetateClass *klass);
 static void sp_canvas_acetate_init (SPCanvasAcetate *acetate);
-static void sp_canvas_acetate_destroy (GtkObject *object);
+static void sp_canvas_acetate_dispose(GObject *object);
 
 static void sp_canvas_acetate_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags);
 static double sp_canvas_acetate_point (SPCanvasItem *item, Geom::Point p, SPCanvasItem **actual_item);
@@ -45,16 +45,12 @@ GType sp_canvas_acetate_get_type (void)
 
 static void sp_canvas_acetate_class_init (SPCanvasAcetateClass *klass)
 {
-	GtkObjectClass *object_class;
-	SPCanvasItemClass *item_class;
-
-	object_class = (GtkObjectClass *) klass;
-	item_class = (SPCanvasItemClass *) klass;
+	GObjectClass *object_class = (GObjectClass *) klass;
+	SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass;
 
 	parent_class = (SPCanvasItemClass*)g_type_class_peek_parent (klass);
 
-	object_class->destroy = sp_canvas_acetate_destroy;
-
+	object_class->dispose = sp_canvas_acetate_dispose;
 	item_class->update = sp_canvas_acetate_update;
 	item_class->point = sp_canvas_acetate_point;
 }
@@ -64,13 +60,13 @@ static void sp_canvas_acetate_init (SPCanvasAcetate */*acetate*/)
     /* Nothing here */
 }
 
-static void sp_canvas_acetate_destroy (GtkObject *object)
+static void sp_canvas_acetate_dispose(GObject *object)
 {
 	g_return_if_fail (object != NULL);
 	g_return_if_fail (GNOME_IS_CANVAS_ACETATE (object));
 
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+	if (G_OBJECT_CLASS (parent_class)->dispose)
+		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
 }
 
 static void sp_canvas_acetate_update( SPCanvasItem *item, Geom::Affine const &/*affine*/, unsigned int /*flags*/ )
diff --git a/src/display/sodipodi-ctrl.cpp b/src/display/sodipodi-ctrl.cpp
index 725ead0d6..e57d4e932 100644
--- a/src/display/sodipodi-ctrl.cpp
+++ b/src/display/sodipodi-ctrl.cpp
@@ -28,7 +28,7 @@ enum {
 
 static void sp_ctrl_class_init (SPCtrlClass *klass);
 static void sp_ctrl_init (SPCtrl *ctrl);
-static void sp_ctrl_destroy (GtkObject *object);
+static void sp_ctrl_dispose(GObject *object);
 static void sp_ctrl_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void sp_ctrl_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
 static void sp_ctrl_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags);
@@ -63,19 +63,14 @@ sp_ctrl_get_type (void)
 static void
 sp_ctrl_class_init (SPCtrlClass *klass)
 {
-    GtkObjectClass *object_class;
-    SPCanvasItemClass *item_class;
-    GObjectClass *g_object_class;
-
-    object_class = (GtkObjectClass *) klass;
-    item_class = (SPCanvasItemClass *) klass;
-    g_object_class = (GObjectClass *) klass;
+    SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass;
+    GObjectClass *g_object_class = (GObjectClass *) klass;
 
     parent_class = (SPCanvasItemClass *)g_type_class_peek_parent (klass);
 
     g_object_class->set_property = sp_ctrl_set_property;
     g_object_class->get_property = sp_ctrl_get_property;
-    object_class->destroy = sp_ctrl_destroy;
+    g_object_class->dispose = sp_ctrl_dispose;
 
     g_object_class_install_property (g_object_class,
             ARG_SHAPE, g_param_spec_int ("shape", "shape", "Shape", 0, G_MAXINT, SP_CTRL_SHAPE_SQUARE, (GParamFlags) G_PARAM_READWRITE));
@@ -268,8 +263,7 @@ sp_ctrl_init (SPCtrl *ctrl)
     ctrl->_point = Geom::Point(0,0);
 }
 
-static void
-sp_ctrl_destroy (GtkObject *object)
+static void sp_ctrl_dispose(GObject *object)
 {
     SPCtrl *ctrl;
 
@@ -283,8 +277,8 @@ sp_ctrl_destroy (GtkObject *object)
         ctrl->cache = NULL;
     }
 
-    if (GTK_OBJECT_CLASS (parent_class)->destroy)
-        (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+    if (G_OBJECT_CLASS(parent_class)->dispose)
+        (* G_OBJECT_CLASS(parent_class)->dispose) (object);
 }
 
 static void
diff --git a/src/display/sodipodi-ctrlrect.cpp b/src/display/sodipodi-ctrlrect.cpp
index 3b50d0b5d..7063f2102 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_destroy(GtkObject *object);
+static void sp_ctrlrect_dispose(GObject *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)
 {
-    GtkObjectClass *object_class = (GtkObjectClass *) c;
+    GObjectClass *object_class = (GObjectClass *) c;
     SPCanvasItemClass *item_class = (SPCanvasItemClass *) c;
 
     parent_class = (SPCanvasItemClass*) g_type_class_peek_parent(c);
 
-    object_class->destroy = sp_ctrlrect_destroy;
+    object_class->dispose = sp_ctrlrect_dispose;
 
     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_destroy(GtkObject *object)
+static void sp_ctrlrect_dispose(GObject *object)
 {
-    if (GTK_OBJECT_CLASS(parent_class)->destroy) {
-        (* GTK_OBJECT_CLASS(parent_class)->destroy)(object);
+    if (G_OBJECT_CLASS(parent_class)->dispose) {
+        (* G_OBJECT_CLASS(parent_class)->dispose)(object);
     }
 }
 
diff --git a/src/svg-view-widget.cpp b/src/svg-view-widget.cpp
index ac74f893f..402b65f53 100644
--- a/src/svg-view-widget.cpp
+++ b/src/svg-view-widget.cpp
@@ -24,7 +24,7 @@
 
 static void sp_svg_view_widget_class_init (SPSVGSPViewWidgetClass *klass);
 static void sp_svg_view_widget_init (SPSVGSPViewWidget *widget);
-static void sp_svg_view_widget_destroy (GtkObject *object);
+static void sp_svg_view_widget_dispose(GObject *object);
 
 static void sp_svg_view_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
 static void sp_svg_view_widget_size_request (GtkWidget *widget, GtkRequisition *req);
@@ -69,13 +69,13 @@ GType sp_svg_view_widget_get_type(void)
  */
 static void sp_svg_view_widget_class_init(SPSVGSPViewWidgetClass *klass)
 {
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 	SPViewWidgetClass *vw_class = SP_VIEW_WIDGET_CLASS (klass);
 
 	widget_parent_class = static_cast<SPViewWidgetClass *>(g_type_class_peek_parent (klass));
 
-	object_class->destroy = sp_svg_view_widget_destroy;
+	object_class->dispose = sp_svg_view_widget_dispose;
 
 	widget_class->size_allocate = sp_svg_view_widget_size_allocate;
 #if GTK_CHECK_VERSION(3,0,0)
@@ -128,15 +128,14 @@ static void sp_svg_view_widget_init(SPSVGSPViewWidget *vw)
 /*
  * Destructor callback for SPSVGSPViewWidget objects.
  */
-static void
-sp_svg_view_widget_destroy (GtkObject *object)
+static void sp_svg_view_widget_dispose(GObject *object)
 {
 	SPSVGSPViewWidget *vw = SP_SVG_VIEW_WIDGET (object);
 
 	vw->canvas = NULL;
 
-	if (((GtkObjectClass *) (widget_parent_class))->destroy) {
-		(* ((GtkObjectClass *) (widget_parent_class))->destroy) (object);
+	if (((GObjectClass *) (widget_parent_class))->dispose) {
+		(* ((GObjectClass *) (widget_parent_class))->dispose) (object);
         }
 }