More GtkObject fixes

(bzr r11383)

3 files changed, 20 insertions, 26 deletions

diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 61438a7d7..70ec5c069 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -100,7 +100,7 @@ enum {
 /* SPDesktopWidget */
 
 static void sp_desktop_widget_class_init (SPDesktopWidgetClass *klass);
-static void sp_desktop_widget_destroy (GtkObject *object);
+static void sp_desktop_widget_dispose(GObject *object);
 
 static void sp_desktop_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
 static void sp_desktop_widget_realize (GtkWidget *widget);
@@ -300,10 +300,10 @@ sp_desktop_widget_class_init (SPDesktopWidgetClass *klass)
 {
     dtw_parent_class = (SPViewWidgetClass*)g_type_class_peek_parent (klass);
 
-    GtkObjectClass *object_class = (GtkObjectClass *) klass;
+    GObjectClass *object_class = (GObjectClass *) klass;
     GtkWidgetClass *widget_class = (GtkWidgetClass *) klass;
 
-    object_class->destroy = sp_desktop_widget_destroy;
+    object_class->dispose = sp_desktop_widget_dispose;
 
     widget_class->size_allocate = sp_desktop_widget_size_allocate;
     widget_class->realize = sp_desktop_widget_realize;
@@ -650,8 +650,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
 /**
  * Called before SPDesktopWidget destruction.
  */
-static void
-sp_desktop_widget_destroy (GtkObject *object)
+static void sp_desktop_widget_dispose(GObject *object)
 {
     SPDesktopWidget *dtw = SP_DESKTOP_WIDGET (object);
 
@@ -678,8 +677,8 @@ sp_desktop_widget_destroy (GtkObject *object)
 
     dtw->modified_connection.~connection();
 
-    if (GTK_OBJECT_CLASS (dtw_parent_class)->destroy) {
-        (* GTK_OBJECT_CLASS (dtw_parent_class)->destroy) (object);
+    if (G_OBJECT_CLASS (dtw_parent_class)->dispose) {
+        (* G_OBJECT_CLASS (dtw_parent_class)->dispose) (object);
     }
 }
 
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index c1147f9b0..2bea8577f 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -70,7 +70,7 @@ enum {
 
 static void sp_paint_selector_class_init(SPPaintSelectorClass *klass);
 static void sp_paint_selector_init(SPPaintSelector *slider);
-static void sp_paint_selector_destroy(GtkObject *object);
+static void sp_paint_selector_dispose(GObject *object);
 
 static GtkWidget *sp_paint_selector_style_button_add(SPPaintSelector *psel, gchar const *px, SPPaintSelector::Mode mode, gchar const *tip);
 static void sp_paint_selector_style_button_toggled(GtkToggleButton *tb, SPPaintSelector *psel);
@@ -157,7 +157,7 @@ GType sp_paint_selector_get_type(void)
 static void
 sp_paint_selector_class_init(SPPaintSelectorClass *klass)
 {
-    GtkObjectClass *object_class = (GtkObjectClass *) klass;
+    GObjectClass *object_class = (GObjectClass *) klass;
 
     parent_class = (GtkVBoxClass*)g_type_class_peek_parent(klass);
 
@@ -204,7 +204,7 @@ sp_paint_selector_class_init(SPPaintSelectorClass *klass)
                                                     g_cclosure_marshal_VOID__UINT,
                                                     G_TYPE_NONE, 1, G_TYPE_UINT);
 
-    object_class->destroy = sp_paint_selector_destroy;
+    object_class->dispose = sp_paint_selector_dispose;
 }
 
 #define XPAD 4
@@ -304,16 +304,15 @@ sp_paint_selector_init(SPPaintSelector *psel)
     psel->alpha = 1.0;
 }
 
-static void
-sp_paint_selector_destroy(GtkObject *object)
+static void sp_paint_selector_dispose(GObject *object)
 {
     SPPaintSelector *psel = SP_PAINT_SELECTOR(object);
 
     // clean up our long-living pattern menu
     g_object_set_data(G_OBJECT(psel),"patternmenu",NULL);
 
-    if (((GtkObjectClass *) parent_class)->destroy)
-        (* ((GtkObjectClass *) parent_class)->destroy)(object);
+    if (((GObjectClass *) parent_class)->dispose)
+        (* ((GObjectClass *) parent_class)->dispose)(object);
 }
 
 static GtkWidget *sp_paint_selector_style_button_add(SPPaintSelector *psel,
diff --git a/src/widgets/sp-color-gtkselector.cpp b/src/widgets/sp-color-gtkselector.cpp
index 5766e84c0..c3a92ddf2 100644
--- a/src/widgets/sp-color-gtkselector.cpp
+++ b/src/widgets/sp-color-gtkselector.cpp
@@ -7,7 +7,7 @@
 
 static void sp_color_gtkselector_class_init (SPColorGtkselectorClass *klass);
 static void sp_color_gtkselector_init (SPColorGtkselector *csel);
-static void sp_color_gtkselector_destroy (GtkObject *object);
+static void sp_color_gtkselector_dispose(GObject *object);
 
 static void sp_color_gtkselector_show_all (GtkWidget *widget);
 static void sp_color_gtkselector_hide_all (GtkWidget *widget);
@@ -48,11 +48,10 @@ static void
 sp_color_gtkselector_class_init (SPColorGtkselectorClass *klass)
 {
 	static const gchar* nameset[] = {N_("System"), 0};
-	GtkObjectClass *object_class;
+	GObjectClass *object_class = (GObjectClass *) klass;
 	GtkWidgetClass *widget_class;
 	SPColorSelectorClass *selector_class;
 
-	object_class = (GtkObjectClass *) klass;
 	widget_class = (GtkWidgetClass *) klass;
 	selector_class = SP_COLOR_SELECTOR_CLASS (klass);
 
@@ -61,7 +60,7 @@ sp_color_gtkselector_class_init (SPColorGtkselectorClass *klass)
 	selector_class->name = nameset;
 	selector_class->submode_count = 1;
 
-	object_class->destroy = sp_color_gtkselector_destroy;
+	object_class->dispose = sp_color_gtkselector_dispose;
 
 	widget_class->show_all = sp_color_gtkselector_show_all;
 	widget_class->hide_all = sp_color_gtkselector_hide_all;
@@ -79,21 +78,18 @@ void sp_color_gtkselector_init (SPColorGtkselector *csel)
 
 void ColorGtkselector::init()
 {
-	GtkWidget *gtksel;
-
-	gtksel = gtk_color_selection_new();
+	GtkWidget *gtksel = gtk_color_selection_new();
 	gtk_widget_show (gtksel);
 	_gtkThing = GTK_COLOR_SELECTION (gtksel);
 	gtk_box_pack_start (GTK_BOX (_csel), gtksel, TRUE, TRUE, 0);
 
-	_sigId = g_signal_connect( GTK_OBJECT(gtksel), "color-changed", G_CALLBACK( _gtkChanged ), _csel);
+	_sigId = g_signal_connect(gtksel, "color-changed", G_CALLBACK( _gtkChanged ), _csel);
 }
 
-static void
-sp_color_gtkselector_destroy (GtkObject *object)
+static void sp_color_gtkselector_dispose(GObject *object)
 {
-	if (((GtkObjectClass *) (parent_class))->destroy)
-		(* ((GtkObjectClass *) (parent_class))->destroy) (object);
+	if (((GObjectClass *) (parent_class))->dispose)
+		(* ((GObjectClass *) (parent_class))->dispose) (object);
 }
 
 static void