Gtk cleanup: gtk_object_set_data

(bzr r10363)

4 files changed, 62 insertions, 62 deletions

diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index b076c0f96..f278a0573 100644
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
@@ -217,8 +217,8 @@ sp_export_spinbutton_new ( gchar const *key, float val, float min, float max,
                            GCallback cb, GtkWidget *dlg )
 {
     GtkObject *adj = gtk_adjustment_new( val, min, max, step, page, 0 );
-    gtk_object_set_data( adj, "key", const_cast<gchar *>(key) );
-    gtk_object_set_data( GTK_OBJECT (dlg), (const gchar *)key, adj );
+    g_object_set_data( G_OBJECT (adj), "key", const_cast<gchar *>(key) );
+    g_object_set_data( G_OBJECT (dlg), (const gchar *)key, adj );
 
     if (us) {
         sp_unit_selector_add_adjustment ( SP_UNIT_SELECTOR (us),
@@ -289,7 +289,7 @@ sp_export_dialog_area_box (GtkWidget * dlg)
     unitbox->pack_end(*us, false, false, 0);
     Gtk::Label* l = new Gtk::Label(_("Units:"));
     unitbox->pack_end(*l, false, false, 3);
-    gtk_object_set_data (GTK_OBJECT (dlg), "units", us->gobj());
+    g_object_set_data (G_OBJECT (dlg), "units", us->gobj());
 
     Gtk::HBox* togglebox = new Gtk::HBox(true, 0);
 
@@ -297,7 +297,7 @@ sp_export_dialog_area_box (GtkWidget * dlg)
     for (int i = 0; i < SELECTION_NUMBER_OF; i++) {
         b = new Gtk::ToggleButton(_(selection_labels[i]), true);
         b->set_data("key", GINT_TO_POINTER(i));
-        gtk_object_set_data (GTK_OBJECT (dlg), selection_names[i], b->gobj());
+        g_object_set_data (G_OBJECT (dlg), selection_names[i], b->gobj());
         togglebox->pack_start(*b, false, true, 0);
         g_signal_connect ( G_OBJECT (b->gobj()), "clicked",
                              G_CALLBACK (sp_export_area_toggled), dlg );
@@ -457,7 +457,7 @@ sp_export_dialog (void)
         Gtk::VBox *vb_singleexport = new Gtk::VBox(false, 0);
         vb_singleexport->set_border_width(0);
         vb->pack_start(*vb_singleexport);
-        gtk_object_set_data(GTK_OBJECT(dlg), "vb_singleexport", vb_singleexport);
+        g_object_set_data(G_OBJECT(dlg), "vb_singleexport", vb_singleexport);
 
         /* Export area frame */
         {
@@ -602,8 +602,8 @@ sp_export_dialog (void)
 
             hb->pack_start (*fe, true, true, 0);
             file_box->add(*hb);
-            gtk_object_set_data (GTK_OBJECT (dlg), "filename", fe->gobj());
-            gtk_object_set_data (GTK_OBJECT (dlg), "filename-modified", (gpointer)FALSE);
+            g_object_set_data (G_OBJECT (dlg), "filename", fe->gobj());
+            g_object_set_data (G_OBJECT (dlg), "filename-modified", (gpointer)FALSE);
             original_name = g_strdup(fe->get_text().c_str());
             // pressing enter in the filename field is the same as clicking export:
             g_signal_connect ( G_OBJECT (fe->gobj()), "activate",
@@ -621,7 +621,7 @@ sp_export_dialog (void)
             Gtk::HBox* batch_box = new Gtk::HBox(FALSE, 5);
             GtkWidget *be = gtk_check_button_new_with_mnemonic(_("B_atch export all selected objects"));
             gtk_widget_set_sensitive(GTK_WIDGET(be), TRUE);
-            gtk_object_set_data(GTK_OBJECT(dlg), "batch_checkbox", be);
+            g_object_set_data(G_OBJECT(dlg), "batch_checkbox", be);
             batch_box->pack_start(*Glib::wrap(be), false, false);
             gtk_widget_set_tooltip_text(be, _("Export each selected object into its own PNG file, using export hints if any (caution, overwrites without asking!)"));
             batch_box->show_all();
@@ -633,7 +633,7 @@ sp_export_dialog (void)
             Gtk::HBox* hide_box = new Gtk::HBox(FALSE, 5);
             GtkWidget *he = gtk_check_button_new_with_mnemonic(_("Hide a_ll except selected"));
             gtk_widget_set_sensitive(GTK_WIDGET(he), TRUE);
-            gtk_object_set_data(GTK_OBJECT(dlg), "hide_checkbox", he);
+            g_object_set_data(G_OBJECT(dlg), "hide_checkbox", he);
             hide_box->pack_start(*Glib::wrap(he), false, false);
             gtk_widget_set_tooltip_text(he, _("In the exported image, hide all objects except those that are selected"));
             hide_box->show_all();
@@ -831,7 +831,7 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base)
     }
 
     /* Turn off the currently active button unless it's us */
-    gtk_object_set_data(GTK_OBJECT(base), "selection-type", (gpointer)key);
+    g_object_set_data(G_OBJECT(base), "selection-type", (gpointer)key);
 
     if (old_key != key) {
         gtk_toggle_button_set_active
@@ -1232,7 +1232,7 @@ sp_export_export_clicked (GtkButton */*button*/, GtkObject *base)
        selections and all that */
     g_free(original_name);
     original_name = g_strdup(filename_ext);
-    gtk_object_set_data (GTK_OBJECT (base), "filename-modified", (gpointer)FALSE);
+    g_object_set_data (G_OBJECT (base), "filename-modified", (gpointer)FALSE);
 
     gtk_widget_destroy (prog_dlg);
     g_object_set_data (G_OBJECT (base), "cancel", (gpointer) 0);
@@ -1541,7 +1541,7 @@ sp_export_detect_size(GtkObject * base) {
     selection_type old = (selection_type)(GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(base), "selection-type")));
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(gtk_object_get_data(base, selection_names[old])), FALSE);
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(gtk_object_get_data(base, selection_names[key])), TRUE);
-    gtk_object_set_data(GTK_OBJECT(base), "selection-type", (gpointer)key);
+    g_object_set_data(G_OBJECT(base), "selection-type", (gpointer)key);
 
     return;
 } /* sp_export_detect_size */
@@ -1561,7 +1561,7 @@ sp_export_area_x_value_changed (GtkAdjustment *adj, GtkObject *base)
         return;
     }
 
-    gtk_object_set_data ( base, "update", GUINT_TO_POINTER (TRUE) );
+    g_object_set_data ( G_OBJECT(base), "update", GUINT_TO_POINTER (TRUE) );
 
     x0 = sp_export_value_get_px (base, "x0");
     x1 = sp_export_value_get_px (base, "x1");
@@ -1588,7 +1588,7 @@ sp_export_area_x_value_changed (GtkAdjustment *adj, GtkObject *base)
 
     sp_export_detect_size(base);
 
-    gtk_object_set_data (base, "update", GUINT_TO_POINTER (FALSE));
+    g_object_set_data ( G_OBJECT (base), "update", GUINT_TO_POINTER (FALSE));
 
     return;
 } // end of sp_export_area_x_value_changed()
@@ -1608,7 +1608,7 @@ sp_export_area_y_value_changed (GtkAdjustment *adj, GtkObject *base)
         return;
     }
 
-    gtk_object_set_data (base, "update", GUINT_TO_POINTER (TRUE));
+    g_object_set_data ( G_OBJECT (base), "update", GUINT_TO_POINTER (TRUE));
 
     y0 = sp_export_value_get_px (base, "y0");
     y1 = sp_export_value_get_px (base, "y1");
@@ -1634,7 +1634,7 @@ sp_export_area_y_value_changed (GtkAdjustment *adj, GtkObject *base)
 
     sp_export_detect_size(base);
 
-    gtk_object_set_data (base, "update", GUINT_TO_POINTER (FALSE));
+    g_object_set_data ( G_OBJECT (base), "update", GUINT_TO_POINTER (FALSE));
 
     return;
 } // end of sp_export_area_y_value_changed()
@@ -1653,7 +1653,7 @@ sp_export_area_width_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
         return;
     }
 
-    gtk_object_set_data (base, "update", GUINT_TO_POINTER (TRUE));
+    g_object_set_data ( G_OBJECT (base), "update", GUINT_TO_POINTER (TRUE));
 
     x0 = sp_export_value_get_px (base, "x0");
     x1 = sp_export_value_get_px (base, "x1");
@@ -1671,7 +1671,7 @@ sp_export_area_width_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
     sp_export_value_set_px (base, "x1", x0 + width);
     sp_export_value_set (base, "bmwidth", bmwidth);
 
-    gtk_object_set_data (base, "update", GUINT_TO_POINTER (FALSE));
+    g_object_set_data (G_OBJECT (base), "update", GUINT_TO_POINTER (FALSE));
 
     return;
 } // end of sp_export_area_width_value_changed()
@@ -1691,7 +1691,7 @@ sp_export_area_height_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
         return;
     }
 
-    gtk_object_set_data (base, "update", GUINT_TO_POINTER (TRUE));
+    g_object_set_data (G_OBJECT (base), "update", GUINT_TO_POINTER (TRUE));
 
     y0 = sp_export_value_get_px (base, "y0");
     y1 = sp_export_value_get_px (base, "y1");
@@ -1708,7 +1708,7 @@ sp_export_area_height_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
     sp_export_value_set_px (base, "y1", y0 + height);
     sp_export_value_set (base, "bmheight", bmheight);
 
-    gtk_object_set_data (base, "update", GUINT_TO_POINTER (FALSE));
+    g_object_set_data (G_OBJECT (base), "update", GUINT_TO_POINTER (FALSE));
 
     return;
 } // end of sp_export_area_height_value_changed()
@@ -1773,7 +1773,7 @@ sp_export_bitmap_width_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
        return;
     }
 
-    gtk_object_set_data (base, "update", GUINT_TO_POINTER (TRUE));
+    g_object_set_data (G_OBJECT (base), "update", GUINT_TO_POINTER (TRUE));
 
     x0 = sp_export_value_get_px (base, "x0");
     x1 = sp_export_value_get_px (base, "x1");
@@ -1789,7 +1789,7 @@ sp_export_bitmap_width_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
 
     sp_export_set_image_y (base);
 
-    gtk_object_set_data (base, "update", GUINT_TO_POINTER (FALSE));
+    g_object_set_data (G_OBJECT (base), "update", GUINT_TO_POINTER (FALSE));
 
     return;
 } // end of sp_export_bitmap_width_value_changed()
@@ -1808,7 +1808,7 @@ sp_export_bitmap_height_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
        return;
     }
 
-    gtk_object_set_data (base, "update", GUINT_TO_POINTER (TRUE));
+    g_object_set_data (G_OBJECT (base), "update", GUINT_TO_POINTER (TRUE));
 
     y0 = sp_export_value_get_px (base, "y0");
     y1 = sp_export_value_get_px (base, "y1");
@@ -1824,7 +1824,7 @@ sp_export_bitmap_height_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
 
     sp_export_set_image_x (base);
 
-    gtk_object_set_data (base, "update", GUINT_TO_POINTER (FALSE));
+    g_object_set_data (G_OBJECT (base), "update", GUINT_TO_POINTER (FALSE));
 
     return;
 } // end of sp_export_bitmap_width_value_changed()
@@ -1870,7 +1870,7 @@ sp_export_xdpi_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
        return;
     }
 
-    gtk_object_set_data (base, "update", GUINT_TO_POINTER (TRUE));
+    g_object_set_data (G_OBJECT (base), "update", GUINT_TO_POINTER (TRUE));
 
     x0 = sp_export_value_get_px (base, "x0");
     x1 = sp_export_value_get_px (base, "x1");
@@ -1895,7 +1895,7 @@ sp_export_xdpi_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
 
     sp_export_set_image_y (base);
 
-    gtk_object_set_data (base, "update", GUINT_TO_POINTER (FALSE));
+    g_object_set_data (G_OBJECT (base), "update", GUINT_TO_POINTER (FALSE));
 
     return;
 } // end of sp_export_xdpi_value_changed()
@@ -1923,12 +1923,12 @@ sp_export_xdpi_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
 static void
 sp_export_set_area ( GtkObject *base, double x0, double y0, double x1, double y1 )
 {
-    gtk_object_set_data ( base, "update", GUINT_TO_POINTER (TRUE) );
+    g_object_set_data (G_OBJECT (base), "update", GUINT_TO_POINTER (TRUE) );
     sp_export_value_set_px (base, "x1", x1);
     sp_export_value_set_px (base, "y1", y1);
     sp_export_value_set_px (base, "x0", x0);
     sp_export_value_set_px (base, "y0", y0);
-    gtk_object_set_data ( base, "update", GUINT_TO_POINTER (FALSE) );
+    g_object_set_data (G_OBJECT (base), "update", GUINT_TO_POINTER (FALSE) );
 
     sp_export_area_x_value_changed ((GtkAdjustment *)gtk_object_get_data (base, "x1"), base);
     sp_export_area_y_value_changed ((GtkAdjustment *)gtk_object_get_data (base, "y1"), base);
@@ -2037,10 +2037,10 @@ sp_export_filename_modified (GtkObject * object, gpointer data)
     GtkWidget * export_dialog = (GtkWidget *)data;
 
     if (!strcmp(original_name, gtk_entry_get_text(GTK_ENTRY(text_entry)))) {
-        gtk_object_set_data (GTK_OBJECT (export_dialog), "filename-modified", (gpointer)FALSE);
+        g_object_set_data (G_OBJECT (export_dialog), "filename-modified", (gpointer)FALSE);
 //        printf("Modified: FALSE\n");
     } else {
-        gtk_object_set_data (GTK_OBJECT (export_dialog), "filename-modified", (gpointer)TRUE);
+        g_object_set_data (G_OBJECT (export_dialog), "filename-modified", (gpointer)TRUE);
 //        printf("Modified: TRUE\n");
     }
 
diff --git a/src/dialogs/find.cpp b/src/dialogs/find.cpp
index 62c551523..dae2dc373 100644
--- a/src/dialogs/find.cpp
+++ b/src/dialogs/find.cpp
@@ -423,7 +423,7 @@ sp_find_new_searchfield (GtkWidget *dlg, GtkWidget *vb, const gchar *label, cons
     GtkWidget *tf = gtk_entry_new ();
     gtk_entry_set_max_length (GTK_ENTRY (tf), 64);
     gtk_box_pack_start (GTK_BOX (hb), tf, TRUE, TRUE, 0);
-    gtk_object_set_data (GTK_OBJECT (dlg), id, tf);
+    g_object_set_data (G_OBJECT (dlg), id, tf);
     gtk_widget_set_tooltip_text (tf, tip);
     g_signal_connect ( G_OBJECT (tf), "activate", G_CALLBACK (sp_find_dialog_find), dlg );
     gtk_label_set_mnemonic_widget   (GTK_LABEL(l), tf);
@@ -494,7 +494,7 @@ sp_find_types_checkbox (GtkWidget *w, const gchar *data, gboolean active,
         GtkWidget *b  = gtk_check_button_new_with_label (label);
         gtk_widget_show (b);
         gtk_toggle_button_set_active ((GtkToggleButton *) b, active);
-        gtk_object_set_data (GTK_OBJECT (w), data, b);
+        g_object_set_data (G_OBJECT (w), data, b);
         gtk_widget_set_tooltip_text (b, tip);
         if (toggled)
             g_signal_connect (G_OBJECT (b), "toggled", G_CALLBACK (toggled), w);
@@ -592,7 +592,7 @@ sp_find_types ()
                 gtk_box_pack_start (GTK_BOX (hb), c, FALSE, FALSE, 0);
             }
 
-            gtk_object_set_data (GTK_OBJECT (vb), "shapes-pane", hb);
+            g_object_set_data (G_OBJECT (vb), "shapes-pane", hb);
 
             gtk_box_pack_start (GTK_BOX (vb_all), hb, FALSE, FALSE, 0);
             gtk_widget_hide_all (hb);
@@ -633,7 +633,7 @@ sp_find_types ()
         }
 
         gtk_box_pack_start (GTK_BOX (vb), vb_all, FALSE, FALSE, 0);
-        gtk_object_set_data (GTK_OBJECT (vb), "all-pane", vb_all);
+        g_object_set_data (G_OBJECT (vb), "all-pane", vb_all);
         gtk_widget_hide_all (vb_all);
     }
 
@@ -699,7 +699,7 @@ sp_find_dialog_old (void)
         gtk_widget_show_all (vb);
 
         GtkWidget *types = sp_find_types ();
-        gtk_object_set_data (GTK_OBJECT (dlg), "types", types);
+        g_object_set_data (G_OBJECT (dlg), "types", types);
         gtk_box_pack_start (GTK_BOX (vb), types, FALSE, FALSE, 0);
 
         {
@@ -711,7 +711,7 @@ sp_find_dialog_old (void)
             GtkWidget *b  = gtk_check_button_new_with_mnemonic (_("Search in s_election"));
             gtk_widget_show (b);
             gtk_toggle_button_set_active ((GtkToggleButton *) b, FALSE);
-            gtk_object_set_data (GTK_OBJECT (dlg), "inselection", b);
+            g_object_set_data (G_OBJECT (dlg), "inselection", b);
             gtk_widget_set_tooltip_text (b, _("Limit search to the current selection"));
             gtk_box_pack_start (GTK_BOX (vb), b, FALSE, FALSE, 0);
             }
@@ -720,7 +720,7 @@ sp_find_dialog_old (void)
             GtkWidget *b  = gtk_check_button_new_with_mnemonic (_("Search in current _layer"));
             gtk_widget_show (b);
             gtk_toggle_button_set_active ((GtkToggleButton *) b, FALSE);
-            gtk_object_set_data (GTK_OBJECT (dlg), "inlayer", b);
+            g_object_set_data (G_OBJECT (dlg), "inlayer", b);
             gtk_widget_set_tooltip_text (b, _("Limit search to the current layer"));
             gtk_box_pack_start (GTK_BOX (vb), b, FALSE, FALSE, 0);
             }
@@ -729,7 +729,7 @@ sp_find_dialog_old (void)
             GtkWidget *b  = gtk_check_button_new_with_mnemonic (_("Include _hidden"));
             gtk_widget_show (b);
             gtk_toggle_button_set_active ((GtkToggleButton *) b, FALSE);
-            gtk_object_set_data (GTK_OBJECT (dlg), "includehidden", b);
+            g_object_set_data (G_OBJECT (dlg), "includehidden", b);
             gtk_widget_set_tooltip_text (b, _("Include hidden objects in search"));
             gtk_box_pack_start (GTK_BOX (vb), b, FALSE, FALSE, 0);
             }
@@ -738,7 +738,7 @@ sp_find_dialog_old (void)
             GtkWidget *b  = gtk_check_button_new_with_mnemonic (_("Include l_ocked"));
             gtk_widget_show (b);
             gtk_toggle_button_set_active ((GtkToggleButton *) b, FALSE);
-            gtk_object_set_data (GTK_OBJECT (dlg), "includelocked", b);
+            g_object_set_data (G_OBJECT (dlg), "includelocked", b);
             gtk_widget_set_tooltip_text (b, _("Include locked objects in search"));
             gtk_box_pack_start (GTK_BOX (vb), b, FALSE, FALSE, 0);
             }
diff --git a/src/dialogs/item-properties.cpp b/src/dialogs/item-properties.cpp
index 3f757e81f..34e7746fa 100644
--- a/src/dialogs/item-properties.cpp
+++ b/src/dialogs/item-properties.cpp
@@ -114,7 +114,7 @@ sp_item_widget_new (void)
     gtk_table_attach ( GTK_TABLE (t), l, 0, 1, 0, 1,
                        (GtkAttachOptions)( GTK_SHRINK | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
-    gtk_object_set_data (GTK_OBJECT (spw), "id_label", l);
+    g_object_set_data (G_OBJECT (spw), "id_label", l);
 
     /* Create the entry box for the object id */
     tf = gtk_entry_new ();
@@ -123,7 +123,7 @@ sp_item_widget_new (void)
     gtk_table_attach ( GTK_TABLE (t), tf, 1, 2, 0, 1,
                        (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
-    gtk_object_set_data (GTK_OBJECT (spw), "id", tf);
+    g_object_set_data (G_OBJECT (spw), "id", tf);
     gtk_label_set_mnemonic_widget (GTK_LABEL(l), tf);
 
     // pressing enter in the id field is the same as clicking Set:
@@ -137,7 +137,7 @@ sp_item_widget_new (void)
     gtk_table_attach ( GTK_TABLE (t), l, 0, 1, 1, 2,
                        (GtkAttachOptions)( GTK_SHRINK | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
-    gtk_object_set_data (GTK_OBJECT (spw), "label_label", l);
+    g_object_set_data (G_OBJECT (spw), "label_label", l);
 
     /* Create the entry box for the object label */
     tf = gtk_entry_new ();
@@ -146,7 +146,7 @@ sp_item_widget_new (void)
     gtk_table_attach ( GTK_TABLE (t), tf, 1, 2, 1, 2,
                        (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
-    gtk_object_set_data (GTK_OBJECT (spw), "label", tf);
+    g_object_set_data (G_OBJECT (spw), "label", tf);
     gtk_label_set_mnemonic_widget (GTK_LABEL(l), tf);
 
     // pressing enter in the label field is the same as clicking Set:
@@ -158,7 +158,7 @@ sp_item_widget_new (void)
     gtk_table_attach ( GTK_TABLE (t), l, 0, 1, 2, 3,
                        (GtkAttachOptions)( GTK_SHRINK | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
-    gtk_object_set_data (GTK_OBJECT (spw), "title_label", l);
+    g_object_set_data (G_OBJECT (spw), "title_label", l);
 
     /* Create the entry box for the object title */
     tf = gtk_entry_new ();
@@ -167,7 +167,7 @@ sp_item_widget_new (void)
     gtk_table_attach ( GTK_TABLE (t), tf, 1, 3, 2, 3,
                        (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
-    gtk_object_set_data (GTK_OBJECT (spw), "title", tf);
+    g_object_set_data (G_OBJECT (spw), "title", tf);
     gtk_label_set_mnemonic_widget (GTK_LABEL(l), tf);
 
     /* Create the frame for the object description */
@@ -184,14 +184,14 @@ sp_item_widget_new (void)
     gtk_widget_set_sensitive (GTK_WIDGET (textframe), FALSE);
     gtk_container_add (GTK_CONTAINER (f), textframe);
     gtk_frame_set_shadow_type (GTK_FRAME (textframe), GTK_SHADOW_IN);
-    gtk_object_set_data(GTK_OBJECT(spw), "desc_frame", textframe);
+    g_object_set_data(G_OBJECT(spw), "desc_frame", textframe);
 
     tf = gtk_text_view_new();
     gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tf), GTK_WRAP_WORD);
     desc_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(tf));
     gtk_text_buffer_set_text(desc_buffer, "", -1);
     gtk_container_add (GTK_CONTAINER (textframe), tf);
-    gtk_object_set_data (GTK_OBJECT (spw), "desc", tf);
+    g_object_set_data (G_OBJECT (spw), "desc", tf);
     gtk_label_set_mnemonic_widget (GTK_LABEL (gtk_frame_get_label_widget (GTK_FRAME (f))), tf);
 
     /* Check boxes */
@@ -208,7 +208,7 @@ sp_item_widget_new (void)
                        (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
     g_signal_connect (G_OBJECT(cb), "toggled", G_CALLBACK(sp_item_widget_hidden_toggled), spw);
-    gtk_object_set_data(GTK_OBJECT(spw), "hidden", cb);
+    g_object_set_data(G_OBJECT(spw), "hidden", cb);
 
     /* Button for setting the object's id, label, title and description. */
     pb = gtk_button_new_with_mnemonic (_("_Set"));
@@ -227,13 +227,13 @@ sp_item_widget_new (void)
     g_signal_connect ( G_OBJECT (cb), "toggled",
                          G_CALLBACK (sp_item_widget_sensitivity_toggled),
                          spw );
-    gtk_object_set_data (GTK_OBJECT (spw), "sensitive", cb);
+    g_object_set_data (G_OBJECT (spw), "sensitive", cb);
 
     /* Create the frame for interactivity options */
     int_label = gtk_label_new_with_mnemonic (_("_Interactivity"));
     int_expander = gtk_expander_new (NULL);
     gtk_expander_set_label_widget (GTK_EXPANDER (int_expander),int_label);
-    gtk_object_set_data (GTK_OBJECT (spw), "interactivity", int_expander);
+    g_object_set_data (G_OBJECT (spw), "interactivity", int_expander);
 
     gtk_box_pack_start (GTK_BOX (vb), int_expander, FALSE, FALSE, 0);
 
@@ -285,7 +285,7 @@ sp_item_widget_setup ( SPWidget *spw, Inkscape::Selection *selection )
         gtk_widget_set_sensitive (GTK_WIDGET (spw), TRUE);
     }
 
-    gtk_object_set_data (GTK_OBJECT (spw), "blocked", GUINT_TO_POINTER (TRUE));
+    g_object_set_data (G_OBJECT (spw), "blocked", GUINT_TO_POINTER (TRUE));
 
     SPItem *item = selection->singleItem();
 
@@ -362,13 +362,13 @@ sp_item_widget_setup ( SPWidget *spw, Inkscape::Selection *selection )
 
         int_table = sp_attribute_table_new (obj, 10, int_labels, int_labels);
         gtk_widget_show_all (int_table);
-        gtk_object_set_data(GTK_OBJECT(spw), "interactivity_table", int_table);
+        g_object_set_data(G_OBJECT(spw), "interactivity_table", int_table);
 
         gtk_container_add (GTK_CONTAINER (w), int_table);
 
     }
 
-    gtk_object_set_data (GTK_OBJECT (spw), "blocked", GUINT_TO_POINTER (FALSE));
+    g_object_set_data (G_OBJECT (spw), "blocked", GUINT_TO_POINTER (FALSE));
 
 
 } // end of sp_item_widget_setup()
@@ -384,14 +384,14 @@ sp_item_widget_sensitivity_toggled (GtkWidget *widget, SPWidget *spw)
     SPItem *item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->singleItem();
     g_return_if_fail (item != NULL);
 
-    gtk_object_set_data (GTK_OBJECT (spw), "blocked", GUINT_TO_POINTER (TRUE));
+    g_object_set_data (G_OBJECT (spw), "blocked", GUINT_TO_POINTER (TRUE));
 
     item->setLocked(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)));
 
     DocumentUndo::done(SP_ACTIVE_DOCUMENT, SP_VERB_DIALOG_ITEM,
 		       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))? _("Lock object") : _("Unlock object"));
 
-    gtk_object_set_data (GTK_OBJECT (spw), "blocked", GUINT_TO_POINTER (FALSE));
+    g_object_set_data (G_OBJECT (spw), "blocked", GUINT_TO_POINTER (FALSE));
 }
 
 void
@@ -403,14 +403,14 @@ sp_item_widget_hidden_toggled(GtkWidget *widget, SPWidget *spw)
     SPItem *item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->singleItem();
     g_return_if_fail (item != NULL);
 
-    gtk_object_set_data (GTK_OBJECT (spw), "blocked", GUINT_TO_POINTER (TRUE));
+    g_object_set_data (G_OBJECT (spw), "blocked", GUINT_TO_POINTER (TRUE));
 
     item->setExplicitlyHidden(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)));
 
     DocumentUndo::done(SP_ACTIVE_DOCUMENT, SP_VERB_DIALOG_ITEM,
 		       gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))? _("Hide object") : _("Unhide object"));
 
-    gtk_object_set_data (GTK_OBJECT (spw), "blocked", GUINT_TO_POINTER (FALSE));
+    g_object_set_data (G_OBJECT (spw), "blocked", GUINT_TO_POINTER (FALSE));
 }
 
 static void
@@ -422,7 +422,7 @@ sp_item_widget_label_changed( GtkWidget */*widget*/, SPWidget *spw )
     SPItem *item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->singleItem();
     g_return_if_fail (item != NULL);
 
-    gtk_object_set_data (GTK_OBJECT (spw), "blocked", GUINT_TO_POINTER (TRUE));
+    g_object_set_data (G_OBJECT (spw), "blocked", GUINT_TO_POINTER (TRUE));
 
     /* Retrieve the label widget for the object's id */
     GtkWidget *id_entry = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (spw), "id"));
@@ -477,7 +477,7 @@ sp_item_widget_label_changed( GtkWidget */*widget*/, SPWidget *spw )
 			   _("Set object description"));
     g_free(desc);
 
-    gtk_object_set_data (GTK_OBJECT (spw), "blocked", GUINT_TO_POINTER (FALSE));
+    g_object_set_data (G_OBJECT (spw), "blocked", GUINT_TO_POINTER (FALSE));
 
 } // end of sp_item_widget_label_changed()
 
diff --git a/src/dialogs/spellcheck.cpp b/src/dialogs/spellcheck.cpp
index 1d475a5c3..ebe87ede9 100644
--- a/src/dialogs/spellcheck.cpp
+++ b/src/dialogs/spellcheck.cpp
@@ -191,7 +191,7 @@ sp_spellcheck_new_button (GtkWidget *dlg, GtkWidget *hb, const gchar *label, con
     gtk_widget_set_tooltip_text (b, tip);
     gtk_box_pack_start (GTK_BOX (hb), b, TRUE, TRUE, 0);
     g_signal_connect ( G_OBJECT (b), "clicked", G_CALLBACK (function), dlg );
-    gtk_object_set_data (GTK_OBJECT (dlg), cookie, b);
+    g_object_set_data (G_OBJECT (dlg), cookie, b);
     gtk_widget_show (b);
 }
 
@@ -935,7 +935,7 @@ sp_spellcheck_dialog (void)
         {
             GtkWidget *hb = gtk_hbox_new (FALSE, 0);
             GtkWidget *l = gtk_label_new (NULL);
-            gtk_object_set_data (GTK_OBJECT (dlg), "banner", l);
+            g_object_set_data (G_OBJECT (dlg), "banner", l);
             gtk_box_pack_start (GTK_BOX (hb), l, FALSE, FALSE, 0);
             gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, 0);
         }
@@ -948,7 +948,7 @@ sp_spellcheck_dialog (void)
 
             GtkListStore *model = gtk_list_store_new (1, G_TYPE_STRING);
             GtkWidget *tree_view = gtk_tree_view_new ();
-            gtk_object_set_data (GTK_OBJECT (dlg), "suggestions", tree_view);
+            g_object_set_data (G_OBJECT (dlg), "suggestions", tree_view);
             gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window),
                                                    tree_view);
             gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), GTK_TREE_MODEL (model));