Gtk cleanup: gtk_object_get_data

(bzr r10365)

15 files changed, 162 insertions, 162 deletions

diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index eb2b3a093..bbc7d10c5 100644
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
@@ -231,7 +231,7 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
     gint ret = FALSE;
 
     SPGuide *guide = SP_GUIDE(data);
-    SPDesktop *desktop = static_cast<SPDesktop*>(gtk_object_get_data(GTK_OBJECT(item->canvas), "SPDesktop"));
+    SPDesktop *desktop = static_cast<SPDesktop*>(g_object_get_data(G_OBJECT(item->canvas), "SPDesktop"));
 
     switch (event->type) {
     case GDK_2BUTTON_PRESS:
diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
index df9ea3be7..79a378710 100644
--- a/src/dialogs/clonetiler.cpp
+++ b/src/dialogs/clonetiler.cpp
@@ -1588,21 +1588,21 @@ static void clonetiler_reset_recursive(GtkWidget *w)
 {
     if (w && GTK_IS_OBJECT(w)) {
         {
-            int r = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT(w), "zeroable"));
+            int r = GPOINTER_TO_INT (g_object_get_data(G_OBJECT(w), "zeroable"));
             if (r && GTK_IS_SPIN_BUTTON(w)) { // spinbutton
                 GtkAdjustment *a = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON(w));
                 gtk_adjustment_set_value (a, 0);
             }
         }
         {
-            int r = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT(w), "oneable"));
+            int r = GPOINTER_TO_INT (g_object_get_data(G_OBJECT(w), "oneable"));
             if (r && GTK_IS_SPIN_BUTTON(w)) { // spinbutton
                 GtkAdjustment *a = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON(w));
                 gtk_adjustment_set_value (a, 1);
             }
         }
         {
-            int r = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT(w), "uncheckable"));
+            int r = GPOINTER_TO_INT (g_object_get_data(G_OBJECT(w), "uncheckable"));
             if (r && GTK_IS_TOGGLE_BUTTON(w)) { // checkbox
                 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(w), FALSE);
             }
diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index f278a0573..77447b658 100644
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
@@ -388,7 +388,7 @@ gchar* create_filepath_from_id (const gchar *id, const gchar *file_entry_text) {
 static void
 batch_export_clicked (GtkWidget *widget, GtkObject *base)
 {
-    Gtk::Widget *vb_singleexport = (Gtk::Widget *)gtk_object_get_data(base, "vb_singleexport");
+    Gtk::Widget *vb_singleexport = (Gtk::Widget *)g_object_get_data(G_OBJECT(base), "vb_singleexport");
     if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widget))) {
         vb_singleexport->set_sensitive(false);
     } else {
@@ -678,8 +678,8 @@ static void
 sp_export_update_checkbuttons (GtkObject *base)
 {
     gint num = g_slist_length((GSList *) sp_desktop_selection(SP_ACTIVE_DESKTOP)->itemList());
-    GtkWidget *be = (GtkWidget *)gtk_object_get_data(base, "batch_checkbox");
-    GtkWidget *he = (GtkWidget *)gtk_object_get_data(base, "hide_checkbox");
+    GtkWidget *be = (GtkWidget *)g_object_get_data(G_OBJECT(base), "batch_checkbox");
+    GtkWidget *he = (GtkWidget *)g_object_get_data(G_OBJECT(base), "hide_checkbox");
     if (num >= 2) {
         gtk_widget_set_sensitive (be, true);
         gtk_button_set_label (GTK_BUTTON(be), g_strdup_printf (ngettext("B_atch export %d selected object","B_atch export %d selected objects",num), num));
@@ -744,25 +744,25 @@ sp_export_selection_changed ( Inkscape::Application *inkscape,
                               GtkObject *base )
 {
     selection_type current_key;
-    current_key = (selection_type)(GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(base), "selection-type")));
+    current_key = (selection_type)(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(base), "selection-type")));
 
     if ((current_key == SELECTION_DRAWING || current_key == SELECTION_PAGE) &&
             (sp_desktop_selection(SP_ACTIVE_DESKTOP))->isEmpty() == false &&
             was_empty) {
         gtk_toggle_button_set_active
-            ( GTK_TOGGLE_BUTTON ( gtk_object_get_data (base, selection_names[SELECTION_SELECTION])),
+            ( GTK_TOGGLE_BUTTON ( g_object_get_data (G_OBJECT(base), selection_names[SELECTION_SELECTION])),
               TRUE );
     }
     was_empty = (sp_desktop_selection(SP_ACTIVE_DESKTOP))->isEmpty();
 
-    current_key = (selection_type)(GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(base), "selection-type")));
+    current_key = (selection_type)(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(base), "selection-type")));
 
     if (inkscape &&
             SP_IS_INKSCAPE (inkscape) &&
             selection &&
             SELECTION_CUSTOM != current_key) {
         GtkToggleButton * button;
-        button = (GtkToggleButton *)gtk_object_get_data(base, selection_names[current_key]);
+        button = (GtkToggleButton *)g_object_get_data(G_OBJECT(base), selection_names[current_key]);
         sp_export_area_toggled(button, base);
     }
 
@@ -776,7 +776,7 @@ sp_export_selection_modified ( Inkscape::Application */*inkscape*/,
                                GtkObject *base )
 {
     selection_type current_key;
-    current_key = (selection_type)(GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(base), "selection-type")));
+    current_key = (selection_type)(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(base), "selection-type")));
 
     switch (current_key) {
         case SELECTION_DRAWING:
@@ -811,12 +811,12 @@ sp_export_selection_modified ( Inkscape::Application */*inkscape*/,
 static void
 sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base)
 {
-    if (gtk_object_get_data (base, "update"))
+    if (g_object_get_data (G_OBJECT(base), "update"))
         return;
 
     selection_type key, old_key;
-    key = (selection_type)(GPOINTER_TO_INT(gtk_object_get_data (GTK_OBJECT (tb), "key")));
-    old_key = (selection_type)(GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(base), "selection-type")));
+    key = (selection_type)(GPOINTER_TO_INT(g_object_get_data(G_OBJECT (tb), "key")));
+    old_key = (selection_type)(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(base), "selection-type")));
 
     /* Ignore all "turned off" events unless we're the only active button */
     if (!gtk_toggle_button_get_active (tb) ) {
@@ -835,7 +835,7 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base)
 
     if (old_key != key) {
         gtk_toggle_button_set_active
-            ( GTK_TOGGLE_BUTTON ( gtk_object_get_data (base, selection_names[old_key])),
+            ( GTK_TOGGLE_BUTTON ( g_object_get_data (G_OBJECT(base), selection_names[old_key])),
               FALSE );
     }
 
@@ -898,12 +898,12 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base)
     } // end of if ( SP_ACTIVE_DESKTOP )
 
 
-    if (SP_ACTIVE_DESKTOP && !gtk_object_get_data(GTK_OBJECT(base), "filename-modified")) {
+    if (SP_ACTIVE_DESKTOP && !g_object_get_data(G_OBJECT(base), "filename-modified")) {
         GtkWidget * file_entry;
         const gchar * filename = NULL;
         float xdpi = 0.0, ydpi = 0.0;
 
-        file_entry = (GtkWidget *)gtk_object_get_data (base, "filename");
+        file_entry = (GtkWidget *)g_object_get_data (G_OBJECT(base), "filename");
 
         switch (key) {
             case SELECTION_PAGE:
@@ -1089,8 +1089,8 @@ sp_export_export_clicked (GtkButton */*button*/, GtkObject *base)
     SPNamedView *nv = sp_desktop_namedview(SP_ACTIVE_DESKTOP);
     SPDocument *doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
 
-    GtkWidget *be = (GtkWidget *)gtk_object_get_data(base, "batch_checkbox");
-    GtkWidget *he = (GtkWidget *)gtk_object_get_data(base, "hide_checkbox");
+    GtkWidget *be = (GtkWidget *)g_object_get_data(G_OBJECT(base), "batch_checkbox");
+    GtkWidget *he = (GtkWidget *)g_object_get_data(G_OBJECT(base), "hide_checkbox");
     bool hide = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (he));
     if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (be))) {
         // Batch export of selected objects
@@ -1162,7 +1162,7 @@ sp_export_export_clicked (GtkButton */*button*/, GtkObject *base)
 
     } else {
 
-    GtkWidget *fe = (GtkWidget *)gtk_object_get_data(base, "filename");
+    GtkWidget *fe = (GtkWidget *)g_object_get_data(G_OBJECT(base), "filename");
     gchar const *filename = gtk_entry_get_text(GTK_ENTRY(fe));
 
     float const x0 = sp_export_value_get_px(base, "x0");
@@ -1238,7 +1238,7 @@ sp_export_export_clicked (GtkButton */*button*/, GtkObject *base)
     g_object_set_data (G_OBJECT (base), "cancel", (gpointer) 0);
 
     /* Setup the values in the document */
-    switch ((selection_type)(GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(base), "selection-type")))) {
+    switch ((selection_type)(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(base), "selection-type")))) {
         case SELECTION_PAGE:
         case SELECTION_DRAWING: {
             SPDocument * doc = SP_ACTIVE_DOCUMENT;
@@ -1475,7 +1475,7 @@ sp_export_detect_size(GtkObject * base) {
     Geom::Rect current_bbox(x, y);
     //std::cout << "Current " << current_bbox;
 
-    this_test[0] = (selection_type)(GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(base), "selection-type")));
+    this_test[0] = (selection_type)(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(base), "selection-type")));
     for (int i = 0; i < SELECTION_NUMBER_OF; i++) {
         this_test[i + 1] = test_order[i];
     }
@@ -1538,9 +1538,9 @@ sp_export_detect_size(GtkObject * base) {
 
     /* We're now using a custom size, not a fixed one */
     /* printf("Detecting state: %s\n", selection_names[key]); */
-    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);
+    selection_type old = (selection_type)(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(base), "selection-type")));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(base), selection_names[old])), FALSE);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(base), selection_names[key])), TRUE);
     g_object_set_data(G_OBJECT(base), "selection-type", (gpointer)key);
 
     return;
@@ -1552,11 +1552,11 @@ sp_export_area_x_value_changed (GtkAdjustment *adj, GtkObject *base)
 {
     float x0, x1, xdpi, width;
 
-    if (gtk_object_get_data (base, "update"))
+    if (g_object_get_data (G_OBJECT(base), "update"))
         return;
 
-    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data
-            (base, "units")))
+    if (sp_unit_selector_update_test ((SPUnitSelector *)g_object_get_data
+            (G_OBJECT(base), "units")))
     {
         return;
     }
@@ -1572,7 +1572,7 @@ sp_export_area_x_value_changed (GtkAdjustment *adj, GtkObject *base)
     if (width < SP_EXPORT_MIN_SIZE) {
         const gchar *key;
         width = SP_EXPORT_MIN_SIZE;
-        key = (const gchar *)gtk_object_get_data (GTK_OBJECT (adj), "key");
+        key = (const gchar *)g_object_get_data(G_OBJECT (adj), "key");
 
         if (!strcmp (key, "x0")) {
             x1 = x0 + width * DPI_BASE / xdpi;
@@ -1599,11 +1599,11 @@ sp_export_area_y_value_changed (GtkAdjustment *adj, GtkObject *base)
 {
     float y0, y1, ydpi, height;
 
-    if (gtk_object_get_data (base, "update"))
+    if (g_object_get_data (G_OBJECT(base), "update"))
         return;
 
-    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data
-           (base, "units")))
+    if (sp_unit_selector_update_test ((SPUnitSelector *)g_object_get_data
+           (G_OBJECT(base), "units")))
     {
         return;
     }
@@ -1619,7 +1619,7 @@ sp_export_area_y_value_changed (GtkAdjustment *adj, GtkObject *base)
     if (height < SP_EXPORT_MIN_SIZE) {
         const gchar *key;
         height = SP_EXPORT_MIN_SIZE;
-        key = (const gchar *)gtk_object_get_data (GTK_OBJECT (adj), "key");
+        key = (const gchar *)g_object_get_data(G_OBJECT (adj), "key");
         if (!strcmp (key, "y0")) {
             y1 = y0 + height * DPI_BASE / ydpi;
             sp_export_value_set_px (base, "y1", y1);
@@ -1645,11 +1645,11 @@ sp_export_area_width_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
 {
     float x0, x1, xdpi, width, bmwidth;
 
-    if (gtk_object_get_data (base, "update"))
+    if (g_object_get_data (G_OBJECT(base), "update"))
         return;
 
-    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data
-           (base, "units"))) {
+    if (sp_unit_selector_update_test ((SPUnitSelector *)g_object_get_data
+           (G_OBJECT(base), "units"))) {
         return;
     }
 
@@ -1683,11 +1683,11 @@ sp_export_area_height_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
 
     float y0, y1, ydpi, height, bmheight;
 
-    if (gtk_object_get_data (base, "update"))
+    if (g_object_get_data (G_OBJECT(base), "update"))
         return;
 
-    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data
-           (base, "units"))) {
+    if (sp_unit_selector_update_test ((SPUnitSelector *)g_object_get_data
+           (G_OBJECT(base), "units"))) {
         return;
     }
 
@@ -1765,11 +1765,11 @@ sp_export_bitmap_width_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
 {
     float x0, x1, bmwidth, xdpi;
 
-    if (gtk_object_get_data (base, "update"))
+    if (g_object_get_data (G_OBJECT(base), "update"))
         return;
 
-    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data
-           (base, "units"))) {
+    if (sp_unit_selector_update_test ((SPUnitSelector *)g_object_get_data
+           (G_OBJECT(base), "units"))) {
        return;
     }
 
@@ -1800,11 +1800,11 @@ sp_export_bitmap_height_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
 {
     float y0, y1, bmheight, xdpi;
 
-    if (gtk_object_get_data (base, "update"))
+    if (g_object_get_data (G_OBJECT(base), "update"))
         return;
 
-    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data
-           (base, "units"))) {
+    if (sp_unit_selector_update_test ((SPUnitSelector *)g_object_get_data
+           (G_OBJECT(base), "units"))) {
        return;
     }
 
@@ -1862,11 +1862,11 @@ sp_export_xdpi_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
 {
     float x0, x1, xdpi, bmwidth;
 
-    if (gtk_object_get_data (base, "update"))
+    if (g_object_get_data (G_OBJECT(base), "update"))
         return;
 
-    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data
-           (base, "units"))) {
+    if (sp_unit_selector_update_test ((SPUnitSelector *)g_object_get_data
+           (G_OBJECT(base), "units"))) {
        return;
     }
 
@@ -1930,8 +1930,8 @@ sp_export_set_area ( GtkObject *base, double x0, double y0, double x1, double y1
     sp_export_value_set_px (base, "y0", y0);
     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);
+    sp_export_area_x_value_changed ((GtkAdjustment *)g_object_get_data (G_OBJECT(base), "x1"), base);
+    sp_export_area_y_value_changed ((GtkAdjustment *)g_object_get_data (G_OBJECT(base), "y1"), base);
 
     return;
 }
@@ -1951,7 +1951,7 @@ sp_export_value_set ( GtkObject *base, const gchar *key, double val )
 {
     GtkAdjustment *adj;
 
-    adj = (GtkAdjustment *)gtk_object_get_data (base, key);
+    adj = (GtkAdjustment *)g_object_get_data (G_OBJECT(base), key);
 
     gtk_adjustment_set_value (adj, val);
 }
@@ -1970,7 +1970,7 @@ sp_export_value_set ( GtkObject *base, const gchar *key, double val )
 static void
 sp_export_value_set_px (GtkObject *base, const gchar *key, double val)
 {
-    const SPUnit *unit = sp_unit_selector_get_unit ((SPUnitSelector *)gtk_object_get_data (base, "units") );
+    const SPUnit *unit = sp_unit_selector_get_unit ((SPUnitSelector *)g_object_get_data (G_OBJECT(base), "units") );
 
     sp_export_value_set (base, key, sp_pixels_get_units (val, *unit));
 
@@ -1991,7 +1991,7 @@ sp_export_value_get ( GtkObject *base, const gchar *key )
 {
     GtkAdjustment *adj;
 
-    adj = (GtkAdjustment *)gtk_object_get_data (base, key);
+    adj = (GtkAdjustment *)g_object_get_data (G_OBJECT(base), key);
 
     return adj->value;
 }
@@ -2012,7 +2012,7 @@ static float
 sp_export_value_get_px ( GtkObject *base, const gchar *key )
 {
     float value = sp_export_value_get(base, key);
-    const SPUnit *unit = sp_unit_selector_get_unit ((SPUnitSelector *)gtk_object_get_data (base, "units"));
+    const SPUnit *unit = sp_unit_selector_get_unit ((SPUnitSelector *)g_object_get_data (G_OBJECT(base), "units"));
 
     return sp_units_get_pixels (value, *unit);
 } // end of sp_export_value_get_px()
diff --git a/src/dialogs/find.cpp b/src/dialogs/find.cpp
index dae2dc373..b30671114 100644
--- a/src/dialogs/find.cpp
+++ b/src/dialogs/find.cpp
@@ -193,7 +193,7 @@ bool item_attr_match(SPItem *item, const gchar *name, bool exact)
 GSList *
 filter_onefield (GSList *l, GObject *dlg, const gchar *field, bool (*match_function)(SPItem *, const gchar *, bool), bool exact)
 {
-    GtkWidget *widget = GTK_WIDGET (gtk_object_get_data (GTK_OBJECT (dlg), field));
+    GtkWidget *widget = GTK_WIDGET (g_object_get_data(G_OBJECT (dlg), field));
     const gchar *text = gtk_entry_get_text (GTK_ENTRY(widget));
 
     if (strlen (text) != 0) {
@@ -215,7 +215,7 @@ filter_onefield (GSList *l, GObject *dlg, const gchar *field, bool (*match_funct
 bool
 type_checkbox (GtkWidget *widget, const gchar *data)
 {
-    return  gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (widget), data)));
+    return  gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (widget), data)));
 }
 
 bool
@@ -260,9 +260,9 @@ item_type_match (SPItem *item, GtkWidget *widget)
 GSList *
 filter_types (GSList *l, GObject *dlg, bool (*match_function)(SPItem *, GtkWidget *))
 {
-    GtkWidget *widget = GTK_WIDGET (gtk_object_get_data (GTK_OBJECT (dlg), "types"));
+    GtkWidget *widget = GTK_WIDGET (g_object_get_data(G_OBJECT (dlg), "types"));
 
-    GtkWidget *alltypes = GTK_WIDGET (gtk_object_get_data (GTK_OBJECT (widget), "all"));
+    GtkWidget *alltypes = GTK_WIDGET (g_object_get_data(G_OBJECT (widget), "all"));
     if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (alltypes)))
         return l;
 
@@ -341,18 +341,18 @@ void sp_find_dialog_find(GObject *, GObject *dlg)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
 
-    bool hidden = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (dlg), "includehidden")));
-    bool locked = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (dlg), "includelocked")));
+    bool hidden = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (dlg), "includehidden")));
+    bool locked = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (dlg), "includelocked")));
 
     GSList *l = NULL;
-    if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (dlg), "inselection")))) {
-        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (dlg), "inlayer")))) {
+    if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (dlg), "inselection")))) {
+        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (dlg), "inlayer")))) {
             l = all_selection_items (desktop->selection, l, desktop->currentLayer(), hidden, locked);
         } else {
             l = all_selection_items (desktop->selection, l, NULL, hidden, locked);
         }
     } else {
-        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (dlg), "inlayer")))) {
+        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (dlg), "inlayer")))) {
             l = all_items (desktop->currentLayer(), l, hidden, locked);
         } else {
             l = all_items(sp_desktop_document(desktop)->getRoot(), l, hidden, locked);
@@ -389,7 +389,7 @@ void sp_find_dialog_find(GObject *, GObject *dlg)
 void
 sp_find_reset_searchfield (GObject *dlg, const gchar *field)
 {
-    GtkWidget *widget = GTK_WIDGET (gtk_object_get_data (GTK_OBJECT (dlg), field));
+    GtkWidget *widget = GTK_WIDGET (g_object_get_data(G_OBJECT (dlg), field));
     gtk_entry_set_text (GTK_ENTRY(widget), "");
 }
 
@@ -402,8 +402,8 @@ sp_find_dialog_reset (GObject *, GObject *dlg)
     sp_find_reset_searchfield (dlg, "style");
     sp_find_reset_searchfield (dlg, "attr");
 
-    GtkWidget *types = GTK_WIDGET (gtk_object_get_data (GTK_OBJECT (dlg), "types"));
-    GtkToggleButton *tb = GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (types), "all"));
+    GtkWidget *types = GTK_WIDGET (g_object_get_data(G_OBJECT (dlg), "types"));
+    GtkToggleButton *tb = GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (types), "all"));
     gtk_toggle_button_toggled (tb);
     gtk_toggle_button_set_active (tb, TRUE);
 }
@@ -444,22 +444,22 @@ sp_find_new_button (GtkWidget *dlg, GtkWidget *hb, const gchar *label, const gch
 void
 toggle_alltypes (GtkToggleButton *tb, gpointer data)
 {
-    GtkWidget *alltypes_pane =  GTK_WIDGET (gtk_object_get_data (GTK_OBJECT (data), "all-pane"));
+    GtkWidget *alltypes_pane =  GTK_WIDGET (g_object_get_data(G_OBJECT (data), "all-pane"));
     if (gtk_toggle_button_get_active (tb)) {
         gtk_widget_hide_all (alltypes_pane);
     } else {
         gtk_widget_show_all (alltypes_pane);
 
         // excplicit toggle to make sure its handler gets called, no matter what was the original state
-        gtk_toggle_button_toggled (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (data), "shapes")));
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (data), "shapes")), TRUE);
-
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (data), "paths")), TRUE);
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (data), "texts")), TRUE);
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (data), "groups")), TRUE);
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (data), "clones")), TRUE);
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (data), "images")), TRUE);
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (data), "offsets")), TRUE);
+        gtk_toggle_button_toggled (GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (data), "shapes")));
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (data), "shapes")), TRUE);
+
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (data), "paths")), TRUE);
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (data), "texts")), TRUE);
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (data), "groups")), TRUE);
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (data), "clones")), TRUE);
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (data), "images")), TRUE);
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (data), "offsets")), TRUE);
     }
     sp_find_squeeze_window();
 }
@@ -467,15 +467,15 @@ toggle_alltypes (GtkToggleButton *tb, gpointer data)
 void
 toggle_shapes (GtkToggleButton *tb, gpointer data)
 {
-    GtkWidget *shapes_pane =  GTK_WIDGET (gtk_object_get_data (GTK_OBJECT (data), "shapes-pane"));
+    GtkWidget *shapes_pane =  GTK_WIDGET (g_object_get_data(G_OBJECT (data), "shapes-pane"));
     if (gtk_toggle_button_get_active (tb)) {
         gtk_widget_hide_all (shapes_pane);
     } else {
         gtk_widget_show_all (shapes_pane);
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (data), "rects")), FALSE);
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (data), "ellipses")), FALSE);
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (data), "stars")), FALSE);
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (data), "spirals")), FALSE);
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (data), "rects")), FALSE);
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (data), "ellipses")), FALSE);
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (data), "stars")), FALSE);
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (g_object_get_data(G_OBJECT (data), "spirals")), FALSE);
     }
     sp_find_squeeze_window();
 }
diff --git a/src/dialogs/item-properties.cpp b/src/dialogs/item-properties.cpp
index 34e7746fa..0c81d8b3c 100644
--- a/src/dialogs/item-properties.cpp
+++ b/src/dialogs/item-properties.cpp
@@ -275,7 +275,7 @@ sp_item_widget_setup ( SPWidget *spw, Inkscape::Selection *selection )
 {
     g_assert (selection != NULL);
 
-    if (gtk_object_get_data (GTK_OBJECT (spw), "blocked"))
+    if (g_object_get_data(G_OBJECT (spw), "blocked"))
         return;
 
     if (!selection->singleItem()) {
@@ -290,46 +290,46 @@ sp_item_widget_setup ( SPWidget *spw, Inkscape::Selection *selection )
     SPItem *item = selection->singleItem();
 
     /* Sensitive */
-    GtkWidget *w = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (spw), "sensitive"));
+    GtkWidget *w = GTK_WIDGET(g_object_get_data(G_OBJECT (spw), "sensitive"));
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), item->isLocked());
 
     /* Hidden */
-    w = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (spw), "hidden"));
+    w = GTK_WIDGET(g_object_get_data(G_OBJECT (spw), "hidden"));
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), item->isExplicitlyHidden());
 
     if (item->cloned) {
 
         /* ID */
-        w = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (spw), "id"));
+        w = GTK_WIDGET(g_object_get_data(G_OBJECT (spw), "id"));
         gtk_entry_set_text (GTK_ENTRY (w), "");
         gtk_widget_set_sensitive (w, FALSE);
-        w = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (spw), "id_label"));
+        w = GTK_WIDGET(g_object_get_data(G_OBJECT (spw), "id_label"));
         gtk_label_set_text (GTK_LABEL (w), _("Ref"));
 
         /* Label */
-        w = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (spw), "label"));
+        w = GTK_WIDGET(g_object_get_data(G_OBJECT (spw), "label"));
         gtk_entry_set_text (GTK_ENTRY (w), "");
         gtk_widget_set_sensitive (w, FALSE);
-        w = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (spw), "label_label"));
+        w = GTK_WIDGET(g_object_get_data(G_OBJECT (spw), "label_label"));
         gtk_label_set_text (GTK_LABEL (w), _("Ref"));
 
     } else {
         SPObject *obj = (SPObject*)item;
 
         /* ID */
-        w = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (spw), "id"));
+        w = GTK_WIDGET(g_object_get_data(G_OBJECT (spw), "id"));
         gtk_entry_set_text (GTK_ENTRY (w), obj->getId());
         gtk_widget_set_sensitive (w, TRUE);
-        w = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (spw), "id_label"));
+        w = GTK_WIDGET(g_object_get_data(G_OBJECT (spw), "id_label"));
         gtk_label_set_markup_with_mnemonic (GTK_LABEL (w), _("_ID:"));
 
         /* Label */
-        w = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (spw), "label"));
+        w = GTK_WIDGET(g_object_get_data(G_OBJECT (spw), "label"));
         gtk_entry_set_text (GTK_ENTRY (w), obj->defaultLabel());
         gtk_widget_set_sensitive (w, TRUE);
 
         /* Title */
-        w = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(spw), "title"));
+        w = GTK_WIDGET(g_object_get_data(G_OBJECT(spw), "title"));
         gchar *title = obj->title();
         if (title) {
             gtk_entry_set_text(GTK_ENTRY(w), title);
@@ -339,7 +339,7 @@ sp_item_widget_setup ( SPWidget *spw, Inkscape::Selection *selection )
         gtk_widget_set_sensitive(w, TRUE);
 
         /* Description */
-        w = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(spw), "desc"));
+        w = GTK_WIDGET(g_object_get_data(G_OBJECT(spw), "desc"));
         GtkTextBuffer *buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(w));
         gchar *desc = obj->desc();
         if (desc) {
@@ -348,12 +348,12 @@ sp_item_widget_setup ( SPWidget *spw, Inkscape::Selection *selection )
         } else {
             gtk_text_buffer_set_text(buf, "", 0);
         }
-        w = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(spw), "desc_frame"));
+        w = GTK_WIDGET(g_object_get_data(G_OBJECT(spw), "desc_frame"));
         gtk_widget_set_sensitive(w, TRUE);
 
-        w = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(spw), "interactivity"));
+        w = GTK_WIDGET(g_object_get_data(G_OBJECT(spw), "interactivity"));
 
-        GtkWidget* int_table = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(spw), "interactivity_table"));
+        GtkWidget* int_table = GTK_WIDGET(g_object_get_data(G_OBJECT(spw), "interactivity_table"));
         if (int_table){
             gtk_container_remove(GTK_CONTAINER(w), int_table);
         }
@@ -378,7 +378,7 @@ sp_item_widget_setup ( SPWidget *spw, Inkscape::Selection *selection )
 static void
 sp_item_widget_sensitivity_toggled (GtkWidget *widget, SPWidget *spw)
 {
-    if (gtk_object_get_data (GTK_OBJECT (spw), "blocked"))
+    if (g_object_get_data(G_OBJECT (spw), "blocked"))
         return;
 
     SPItem *item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->singleItem();
@@ -397,7 +397,7 @@ sp_item_widget_sensitivity_toggled (GtkWidget *widget, SPWidget *spw)
 void
 sp_item_widget_hidden_toggled(GtkWidget *widget, SPWidget *spw)
 {
-    if (gtk_object_get_data (GTK_OBJECT (spw), "blocked"))
+    if (g_object_get_data(G_OBJECT (spw), "blocked"))
         return;
 
     SPItem *item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->singleItem();
@@ -416,7 +416,7 @@ sp_item_widget_hidden_toggled(GtkWidget *widget, SPWidget *spw)
 static void
 sp_item_widget_label_changed( GtkWidget */*widget*/, SPWidget *spw )
 {
-    if (gtk_object_get_data (GTK_OBJECT (spw), "blocked"))
+    if (g_object_get_data(G_OBJECT (spw), "blocked"))
         return;
 
     SPItem *item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->singleItem();
@@ -425,10 +425,10 @@ sp_item_widget_label_changed( GtkWidget */*widget*/, SPWidget *spw )
     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"));
+    GtkWidget *id_entry = GTK_WIDGET(g_object_get_data(G_OBJECT (spw), "id"));
     gchar *id = (gchar *) gtk_entry_get_text (GTK_ENTRY (id_entry));
     g_strcanon (id, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_.:", '_');
-    GtkWidget *id_label = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (spw), "id_label"));
+    GtkWidget *id_label = GTK_WIDGET(g_object_get_data(G_OBJECT (spw), "id_label"));
     if (!strcmp (id, item->getId())) {
         gtk_label_set_markup_with_mnemonic (GTK_LABEL (id_label), _("_ID:"));
     } else if (!*id || !isalnum (*id)) {
@@ -445,7 +445,7 @@ sp_item_widget_label_changed( GtkWidget */*widget*/, SPWidget *spw )
     }
 
     /* Retrieve the label widget for the object's label */
-    GtkWidget *label_entry = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (spw), "label"));
+    GtkWidget *label_entry = GTK_WIDGET(g_object_get_data(G_OBJECT (spw), "label"));
     gchar *label = (gchar *)gtk_entry_get_text (GTK_ENTRY (label_entry));
     g_assert(label != NULL);
 
@@ -460,14 +460,14 @@ sp_item_widget_label_changed( GtkWidget */*widget*/, SPWidget *spw )
     }
 
     /* Retrieve the title */
-    GtkWidget *w = GTK_WIDGET(gtk_object_get_data(GTK_OBJECT(spw), "title"));
+    GtkWidget *w = GTK_WIDGET(g_object_get_data(G_OBJECT(spw), "title"));
     gchar *title = (gchar *)gtk_entry_get_text(GTK_ENTRY (w));
     if (obj->setTitle(title))
         DocumentUndo::done(SP_ACTIVE_DOCUMENT, SP_VERB_DIALOG_ITEM,
 			   _("Set object title"));
 
     /* Retrieve the description */
-    GtkTextView *tv = GTK_TEXT_VIEW(gtk_object_get_data(GTK_OBJECT(spw), "desc"));
+    GtkTextView *tv = GTK_TEXT_VIEW(g_object_get_data(G_OBJECT(spw), "desc"));
     GtkTextBuffer *buf = gtk_text_view_get_buffer(tv);
     GtkTextIter start, end;
     gtk_text_buffer_get_bounds(buf, &start, &end);
diff --git a/src/dialogs/spellcheck.cpp b/src/dialogs/spellcheck.cpp
index ebe87ede9..5de0bc6fe 100644
--- a/src/dialogs/spellcheck.cpp
+++ b/src/dialogs/spellcheck.cpp
@@ -287,7 +287,7 @@ SPItem *spellcheck_get_text (SPObject *root)
 void
 spellcheck_sensitive (const gchar *cookie, gboolean gray)
 {
-   GtkWidget *l = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (dlg), cookie));
+   GtkWidget *l = GTK_WIDGET(g_object_get_data(G_OBJECT (dlg), cookie));
    gtk_widget_set_sensitive(l, gray);
 }
 
@@ -445,7 +445,7 @@ spellcheck_finished ()
     spellcheck_sensitive("b_start", TRUE);
 
     {
-        GtkWidget *l = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (dlg), "banner"));
+        GtkWidget *l = GTK_WIDGET(g_object_get_data(G_OBJECT (dlg), "banner"));
         gchar *label;
         if (_stops)
             label = g_strdup_printf(_("<b>Finished</b>, <b>%d</b> words added to dictionary"), _adds);
@@ -557,7 +557,7 @@ spellcheck_next_word()
 
         // display it in window
         {
-            GtkWidget *l = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (dlg), "banner"));
+            GtkWidget *l = GTK_WIDGET(g_object_get_data(G_OBJECT (dlg), "banner"));
             Glib::ustring langs = _lang;
             if (_lang2)
                 langs = langs + ", " + _lang2;
@@ -641,7 +641,7 @@ spellcheck_next_word()
         // get suggestions
         {
             GtkTreeView *tree_view =
-                GTK_TREE_VIEW(gtk_object_get_data (GTK_OBJECT (dlg), "suggestions"));
+                GTK_TREE_VIEW(g_object_get_data(G_OBJECT (dlg), "suggestions"));
             GtkListStore *model = gtk_list_store_new (1, G_TYPE_STRING);
             gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), GTK_TREE_MODEL (model));
 
@@ -714,7 +714,7 @@ spellcheck_delete_last_rect ()
 void
 do_spellcheck ()
 {
-    GtkWidget *l = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (dlg), "banner"));
+    GtkWidget *l = GTK_WIDGET(g_object_get_data(G_OBJECT (dlg), "banner"));
     gtk_label_set_markup (GTK_LABEL(l), _("<i>Checking...</i>"));
     gtk_widget_queue_draw(GTK_WIDGET(dlg));
     gdk_window_process_updates(GTK_WIDGET(dlg)->window, TRUE);
@@ -770,7 +770,7 @@ sp_spellcheck_accept (GObject *, GObject *dlg)
 {
     // insert chosen suggestion
     GtkTreeView *tv =
-        GTK_TREE_VIEW(gtk_object_get_data (GTK_OBJECT (dlg), "suggestions"));
+        GTK_TREE_VIEW(g_object_get_data(G_OBJECT (dlg), "suggestions"));
     GtkTreeSelection *ts = gtk_tree_view_get_selection(tv);
     GtkTreeModel *model = 0;
     GtkTreeIter   iter;
@@ -820,7 +820,7 @@ sp_spellcheck_add (GObject */*obj*/, GObject */*dlg*/)
 {
     _adds++;
     GtkComboBox *cbox =
-        GTK_COMBO_BOX(gtk_object_get_data (GTK_OBJECT (dlg), "addto_langs"));
+        GTK_COMBO_BOX(g_object_get_data(G_OBJECT (dlg), "addto_langs"));
     gint num = gtk_combo_box_get_active(cbox);
     switch (num) {
         case 0:
diff --git a/src/helper/unit-menu.cpp b/src/helper/unit-menu.cpp
index 80ea216b3..dc65c3d14 100644
--- a/src/helper/unit-menu.cpp
+++ b/src/helper/unit-menu.cpp
@@ -163,7 +163,7 @@ sp_unit_selector_get_unit(SPUnitSelector const *us)
 static void
 spus_unit_activate(GtkWidget *widget, SPUnitSelector *us)
 {
-    SPUnit const *unit = (SPUnit const *) gtk_object_get_data(GTK_OBJECT(widget), "unit");
+    SPUnit const *unit = (SPUnit const *) g_object_get_data(G_OBJECT(widget), "unit");
     g_return_if_fail(unit != NULL);
 
 #ifdef UNIT_SELECTOR_VERBOSE
diff --git a/src/ui/context-menu.cpp b/src/ui/context-menu.cpp
index 2f41b3fde..4d2c242a6 100644
--- a/src/ui/context-menu.cpp
+++ b/src/ui/context-menu.cpp
@@ -189,7 +189,7 @@ sp_item_properties(GtkMenuItem *menuitem, SPItem *item)
 
     g_assert(SP_IS_ITEM(item));
 
-    desktop = (SPDesktop*)gtk_object_get_data(GTK_OBJECT(menuitem), "desktop");
+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
     g_return_if_fail(desktop != NULL);
 
     sp_desktop_selection(desktop)->set(item);
@@ -205,7 +205,7 @@ sp_set_mask(GtkMenuItem *menuitem, SPItem *item)
 
     g_assert(SP_IS_ITEM(item));
 
-    desktop = (SPDesktop*)gtk_object_get_data(GTK_OBJECT(menuitem), "desktop");
+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
     g_return_if_fail(desktop != NULL);
 
 	sp_selection_set_mask(desktop, false, false);
@@ -219,7 +219,7 @@ sp_release_mask(GtkMenuItem *menuitem, SPItem *item)
 
     g_assert(SP_IS_ITEM(item));
 
-    desktop = (SPDesktop*)gtk_object_get_data(GTK_OBJECT(menuitem), "desktop");
+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
     g_return_if_fail(desktop != NULL);
 
     sp_selection_unset_mask(desktop, false);
@@ -233,7 +233,7 @@ sp_set_clip(GtkMenuItem *menuitem, SPItem *item)
 
     g_assert(SP_IS_ITEM(item));
 
-    desktop = (SPDesktop*)gtk_object_get_data(GTK_OBJECT(menuitem), "desktop");
+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
     g_return_if_fail(desktop != NULL);
 
 	sp_selection_set_mask(desktop, true, false);
@@ -247,7 +247,7 @@ sp_release_clip(GtkMenuItem *menuitem, SPItem *item)
 
     g_assert(SP_IS_ITEM(item));
 
-    desktop = (SPDesktop*)gtk_object_get_data(GTK_OBJECT(menuitem), "desktop");
+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
     g_return_if_fail(desktop != NULL);
 
     sp_selection_unset_mask(desktop, true);
@@ -261,7 +261,7 @@ sp_item_select_this(GtkMenuItem *menuitem, SPItem *item)
 
     g_assert(SP_IS_ITEM(item));
 
-    desktop = (SPDesktop*)gtk_object_get_data(GTK_OBJECT(menuitem), "desktop");
+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
     g_return_if_fail(desktop != NULL);
 
     sp_desktop_selection(desktop)->set(item);
@@ -273,7 +273,7 @@ sp_item_create_link(GtkMenuItem *menuitem, SPItem *item)
     g_assert(SP_IS_ITEM(item));
     g_assert(!SP_IS_ANCHOR(item));
 
-    SPDesktop *desktop = (SPDesktop*)gtk_object_get_data(GTK_OBJECT(menuitem), "desktop");
+    SPDesktop *desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
     g_return_if_fail(desktop != NULL);
 
     Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
@@ -325,7 +325,7 @@ sp_item_group_ungroup_activate(GtkMenuItem *menuitem, SPGroup *group)
 
     g_assert(SP_IS_GROUP(group));
 
-    desktop = (SPDesktop*)gtk_object_get_data(GTK_OBJECT(menuitem), "desktop");
+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
     g_return_if_fail(desktop != NULL);
 
     children = NULL;
@@ -495,7 +495,7 @@ static void sp_image_image_edit(GtkMenuItem *menuitem, SPAnchor *anchor)
  
     if ( errThing ) {
         g_warning("Problem launching editor (%d). %s", errThing->code, errThing->message);
-        SPDesktop *desktop = (SPDesktop*)gtk_object_get_data(GTK_OBJECT(menuitem), "desktop");
+        SPDesktop *desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
         desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, errThing->message);
         g_error_free(errThing);
         errThing = 0;
@@ -511,7 +511,7 @@ sp_fill_settings(GtkMenuItem *menuitem, SPItem *item)
 
     g_assert(SP_IS_ITEM(item));
 
-    desktop = (SPDesktop*)gtk_object_get_data(GTK_OBJECT(menuitem), "desktop");
+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
     g_return_if_fail(desktop != NULL);
 
     if (sp_desktop_selection(desktop)->isEmpty()) {
@@ -548,7 +548,7 @@ sp_text_settings(GtkMenuItem *menuitem, SPItem *item)
 
     g_assert(SP_IS_ITEM(item));
 
-    desktop = (SPDesktop*)gtk_object_get_data(GTK_OBJECT(menuitem), "desktop");
+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
     g_return_if_fail(desktop != NULL);
 
     if (sp_desktop_selection(desktop)->isEmpty()) {
@@ -567,7 +567,7 @@ sp_spellcheck_settings(GtkMenuItem *menuitem, SPItem *item)
 
     g_assert(SP_IS_ITEM(item));
 
-    desktop = (SPDesktop*)gtk_object_get_data(GTK_OBJECT(menuitem), "desktop");
+    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
     g_return_if_fail(desktop != NULL);
 
     if (sp_desktop_selection(desktop)->isEmpty()) {
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 98c678194..e7bc3691b 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -629,7 +629,7 @@ sp_desktop_widget_destroy (GtkObject *object)
 void
 SPDesktopWidget::updateTitle(gchar const* uri)
 {
-    Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
+    Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window");
 
     if (window) {
         gchar const *fname = ( TRUE
@@ -907,7 +907,7 @@ SPDesktopWidget::shutdown()
             switch (response) {
             case GTK_RESPONSE_YES:
             {
-                Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
+                Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window");
 
                 doc->doRef();
                 sp_namedview_document_from_window(desktop);
@@ -968,7 +968,7 @@ SPDesktopWidget::shutdown()
             {
                 doc->doRef();
 
-                Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
+                Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window");
 
                 if (sp_file_save_dialog(*window, doc, Inkscape::Extension::FILE_SAVE_METHOD_INKSCAPE_SVG)) {
                     doc->doUnref();
@@ -1080,7 +1080,7 @@ SPDesktopWidget::getWindowGeometry (gint &x, gint &y, gint &w, gint &h)
     gboolean vis = gtk_widget_get_visible (GTK_WIDGET(this));
     (void)vis; // TODO figure out why it is here but not used.
 
-    Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
+    Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window");
 
     if (window)
     {
@@ -1092,7 +1092,7 @@ SPDesktopWidget::getWindowGeometry (gint &x, gint &y, gint &w, gint &h)
 void
 SPDesktopWidget::setWindowPosition (Geom::Point p)
 {
-    Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
+    Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window");
 
     if (window)
     {
@@ -1103,7 +1103,7 @@ SPDesktopWidget::setWindowPosition (Geom::Point p)
 void
 SPDesktopWidget::setWindowSize (gint w, gint h)
 {
-    Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
+    Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window");
 
     if (window)
     {
@@ -1121,7 +1121,7 @@ SPDesktopWidget::setWindowSize (gint w, gint h)
 void
 SPDesktopWidget::setWindowTransient (void *p, int transient_policy)
 {
-    Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
+    Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window");
     if (window)
     {
         GtkWindow *w = (GtkWindow *) window->gobj();
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index ceb6f5c06..310002b54 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -610,7 +610,7 @@ static void sp_grad_edit_select(GtkOptionMenu *mnu, GtkWidget *tbl)
     GtkWidget *offspin = GTK_WIDGET(g_object_get_data(G_OBJECT(tbl), "offspn"));
     GtkWidget *offslide =GTK_WIDGET(g_object_get_data(G_OBJECT(tbl), "offslide"));
 
-    GtkAdjustment *adj = static_cast<GtkAdjustment*>(gtk_object_get_data(GTK_OBJECT(tbl), "offset"));
+    GtkAdjustment *adj = static_cast<GtkAdjustment*>(g_object_get_data(G_OBJECT(tbl), "offset"));
 
     bool isEndStop = false;
 
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 60ce6beff..fa4684825 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -127,7 +127,7 @@ static SPGradientSelector *getGradientFromData(SPPaintSelector const *psel)
             grad = swatchsel->getGradientSelector();
         }
     } else {
-        grad = reinterpret_cast<SPGradientSelector*>(gtk_object_get_data(GTK_OBJECT(psel->selector), "gradient-selector"));
+        grad = reinterpret_cast<SPGradientSelector*>(g_object_get_data(G_OBJECT(psel->selector), "gradient-selector"));
     }
     return grad;
 }
@@ -323,7 +323,7 @@ static void
 sp_paint_selector_style_button_toggled(GtkToggleButton *tb, SPPaintSelector *psel)
 {
     if (!psel->update && gtk_toggle_button_get_active(tb)) {
-        psel->setMode(static_cast<SPPaintSelector::Mode>(GPOINTER_TO_UINT(gtk_object_get_data(GTK_OBJECT(tb), "mode"))));
+        psel->setMode(static_cast<SPPaintSelector::Mode>(GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(tb), "mode"))));
     }
 }
 
@@ -440,7 +440,7 @@ void SPPaintSelector::setColorAlpha(SPColor const &color, float alpha)
         setMode(MODE_COLOR_RGB);
     }
 
-    csel = reinterpret_cast<SPColorSelector*>(gtk_object_get_data(GTK_OBJECT(selector), "color-selector"));
+    csel = reinterpret_cast<SPColorSelector*>(g_object_get_data(G_OBJECT(selector), "color-selector"));
     rgba = color.toRGBA32( alpha );
     csel->base->setColorAlpha( color, alpha );
 }
@@ -646,7 +646,7 @@ static void sp_paint_selector_set_mode_color(SPPaintSelector *psel, SPPaintSelec
 
     if ((psel->mode == SPPaintSelector::MODE_COLOR_RGB) || (psel->mode == SPPaintSelector::MODE_COLOR_CMYK)) {
         /* Already have color selector */
-        csel = (GtkWidget*)gtk_object_get_data(GTK_OBJECT(psel->selector), "color-selector");
+        csel = (GtkWidget*)g_object_get_data(G_OBJECT(psel->selector), "color-selector");
     } else {
 
         sp_paint_selector_clear_frame(psel);
@@ -716,7 +716,7 @@ static void sp_paint_selector_set_mode_gradient(SPPaintSelector *psel, SPPaintSe
 
     if ((psel->mode == SPPaintSelector::MODE_GRADIENT_LINEAR) || (psel->mode == SPPaintSelector::MODE_GRADIENT_RADIAL)) {
         /* Already have gradient selector */
-        gsel = (GtkWidget*)gtk_object_get_data(GTK_OBJECT(psel->selector), "gradient-selector");
+        gsel = (GtkWidget*)g_object_get_data(G_OBJECT(psel->selector), "gradient-selector");
     } else {
         sp_paint_selector_clear_frame(psel);
         /* Create new gradient selector */
@@ -943,7 +943,7 @@ void SPPaintSelector::updatePatternList( SPPattern *pattern )
 
     /* Set history */
 
-    if (pattern && !gtk_object_get_data(GTK_OBJECT(mnu), "update")) {
+    if (pattern && !g_object_get_data(G_OBJECT(mnu), "update")) {
 
         g_object_set_data(G_OBJECT(mnu), "update", GINT_TO_POINTER(TRUE));
 
@@ -984,7 +984,7 @@ static void sp_paint_selector_set_mode_pattern(SPPaintSelector *psel, SPPaintSel
 
     if (psel->mode == SPPaintSelector::MODE_PATTERN) {
         /* Already have pattern menu */
-        tbl = (GtkWidget*)gtk_object_get_data(GTK_OBJECT(psel->selector), "pattern-selector");
+        tbl = (GtkWidget*)g_object_get_data(G_OBJECT(psel->selector), "pattern-selector");
     } else {
         sp_paint_selector_clear_frame(psel);
 
diff --git a/src/widgets/sp-color-scales.cpp b/src/widgets/sp-color-scales.cpp
index 2b80fac9a..146ea9e1e 100644
--- a/src/widgets/sp-color-scales.cpp
+++ b/src/widgets/sp-color-scales.cpp
@@ -538,7 +538,7 @@ guint ColorScales::getSubmode() const
 
 void ColorScales::_adjustmentAnyChanged( GtkAdjustment *adjustment, SPColorScales *cs )
 {
-	gint channel = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (adjustment), "channel"));
+	gint channel = GPOINTER_TO_INT (g_object_get_data(G_OBJECT (adjustment), "channel"));
 
 	_adjustmentChanged(cs, channel);
 }
diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp
index 70fa3a54d..994d954cc 100644
--- a/src/widgets/spinbutton-events.cpp
+++ b/src/widgets/spinbutton-events.cpp
@@ -27,7 +27,7 @@ spinbutton_focus_in (GtkWidget *w, GdkEventKey */*event*/, gpointer /*data*/)
 {
 	gdouble *ini;
 
-	ini = (gdouble *) gtk_object_get_data (GTK_OBJECT (w), "ini");
+	ini = (gdouble *) g_object_get_data(G_OBJECT (w), "ini");
 	if (ini) g_free (ini); // free the old value if any
 
 	// retrieve the value
@@ -43,7 +43,7 @@ spinbutton_focus_in (GtkWidget *w, GdkEventKey */*event*/, gpointer /*data*/)
 void
 spinbutton_undo (GtkWidget *w)
 {
-	gdouble *ini = (gdouble *) gtk_object_get_data (GTK_OBJECT (w), "ini");
+	gdouble *ini = (gdouble *) g_object_get_data(G_OBJECT (w), "ini");
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), *ini);
 }
 
@@ -51,11 +51,11 @@ void
 spinbutton_defocus (GtkObject *container)
 {
 	// defocus spinbuttons by moving focus to the canvas, unless "stay" is on
-	gboolean stay = GPOINTER_TO_INT(gtk_object_get_data (GTK_OBJECT (container), "stay"));
+	gboolean stay = GPOINTER_TO_INT(g_object_get_data(G_OBJECT (container), "stay"));
 	if (stay) {
 		g_object_set_data (G_OBJECT (container), "stay", GINT_TO_POINTER (FALSE));
 	} else {
-		GtkWidget *canvas = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (container), "dtw");
+		GtkWidget *canvas = (GtkWidget *) g_object_get_data(G_OBJECT (container), "dtw");
 		if (canvas) {
 			gtk_widget_grab_focus (GTK_WIDGET(canvas));
 		}
diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp
index a5c60c382..2225f2c57 100644
--- a/src/widgets/spw-utilities.cpp
+++ b/src/widgets/spw-utilities.cpp
@@ -235,7 +235,7 @@ sp_search_by_data_recursive (GtkWidget *w, gpointer key)
 	gpointer r = NULL;
 
 	if (w && GTK_IS_OBJECT(w)) {
-		r = gtk_object_get_data (GTK_OBJECT(w), (gchar *) key);
+		r = g_object_get_data(G_OBJECT(w), (gchar *) key);
 	}
 	if (r) return r;
 
@@ -260,7 +260,7 @@ sp_search_by_value_recursive (GtkWidget *w, gchar *key, gchar *value)
 	GtkWidget *child;
 
 	if (w && GTK_IS_OBJECT(w)) {
-		r = (gchar *) gtk_object_get_data (GTK_OBJECT(w), key);
+		r = (gchar *) g_object_get_data(G_OBJECT(w), key);
 	}
 	if (r && !strcmp (r, value)) return w;
 
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index ad2ca7244..bfdd4a916 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -2808,10 +2808,10 @@ static void star_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const *n
     bool isFlatSided = prefs->getBool("/tools/shapes/star/isflatsided", true);
 
     if (!strcmp(name, "inkscape:randomized")) {
-        adj = GTK_ADJUSTMENT( gtk_object_get_data(GTK_OBJECT(tbl), "randomized") );
+        adj = GTK_ADJUSTMENT( g_object_get_data(G_OBJECT(tbl), "randomized") );
         gtk_adjustment_set_value(adj, sp_repr_get_double_attribute(repr, "inkscape:randomized", 0.0));
     } else if (!strcmp(name, "inkscape:rounded")) {
-        adj = GTK_ADJUSTMENT( gtk_object_get_data(GTK_OBJECT(tbl), "rounded") );
+        adj = GTK_ADJUSTMENT( g_object_get_data(G_OBJECT(tbl), "rounded") );
         gtk_adjustment_set_value(adj, sp_repr_get_double_attribute(repr, "inkscape:rounded", 0.0));
     } else if (!strcmp(name, "inkscape:flatsided")) {
         GtkAction* prop_action = GTK_ACTION( g_object_get_data(G_OBJECT(tbl), "prop_action") );
@@ -2825,7 +2825,7 @@ static void star_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const *n
             gtk_action_set_sensitive( prop_action, FALSE );
         }
     } else if ((!strcmp(name, "sodipodi:r1") || !strcmp(name, "sodipodi:r2")) && (!isFlatSided) ) {
-        adj = (GtkAdjustment*)gtk_object_get_data(GTK_OBJECT(tbl), "proportion");
+        adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(tbl), "proportion");
         gdouble r1 = sp_repr_get_double_attribute(repr, "sodipodi:r1", 1.0);
         gdouble r2 = sp_repr_get_double_attribute(repr, "sodipodi:r2", 1.0);
         if (r2 < r1) {
@@ -2834,7 +2834,7 @@ static void star_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const *n
             gtk_adjustment_set_value(adj, r1/r2);
         }
     } else if (!strcmp(name, "sodipodi:sides")) {
-        adj = (GtkAdjustment*)gtk_object_get_data(GTK_OBJECT(tbl), "magnitude");
+        adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(tbl), "magnitude");
         gtk_adjustment_set_value(adj, sp_repr_get_int_attribute(repr, "sodipodi:sides", 0));
     }
 
@@ -3480,21 +3480,21 @@ static void box3d_resync_toolbar(Inkscape::XML::Node *persp_repr, GObject *data)
         return;
     }
     {
-        adj = GTK_ADJUSTMENT(gtk_object_get_data(GTK_OBJECT(tbl), "box3d_angle_x"));
+        adj = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(tbl), "box3d_angle_x"));
         act = GTK_ACTION(g_object_get_data(G_OBJECT(tbl), "box3d_angle_x_action"));
         tact = &INK_TOGGLE_ACTION(g_object_get_data(G_OBJECT(tbl), "box3d_vp_x_state_action"))->action;
 
         box3d_set_button_and_adjustment(persp, Proj::X, adj, act, tact);
     }
     {
-        adj = GTK_ADJUSTMENT(gtk_object_get_data(GTK_OBJECT(tbl), "box3d_angle_y"));
+        adj = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(tbl), "box3d_angle_y"));
         act = GTK_ACTION(g_object_get_data(G_OBJECT(tbl), "box3d_angle_y_action"));
         tact = &INK_TOGGLE_ACTION(g_object_get_data(G_OBJECT(tbl), "box3d_vp_y_state_action"))->action;
 
         box3d_set_button_and_adjustment(persp, Proj::Y, adj, act, tact);
     }
     {
-        adj = GTK_ADJUSTMENT(gtk_object_get_data(GTK_OBJECT(tbl), "box3d_angle_z"));
+        adj = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(tbl), "box3d_angle_z"));
         act = GTK_ACTION(g_object_get_data(G_OBJECT(tbl), "box3d_angle_z_action"));
         tact = &INK_TOGGLE_ACTION(g_object_get_data(G_OBJECT(tbl), "box3d_vp_z_state_action"))->action;
 
@@ -3861,15 +3861,15 @@ static void sp_spl_tb_defaults(GtkWidget * /*widget*/, GtkObject *obj)
     gdouble exp = 1.0;
     gdouble t0 = 0.0;
 
-    adj = (GtkAdjustment*)gtk_object_get_data(obj, "revolution");
+    adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(obj), "revolution");
     gtk_adjustment_set_value(adj, rev);
     gtk_adjustment_value_changed(adj);
 
-    adj = (GtkAdjustment*)gtk_object_get_data(obj, "expansion");
+    adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(obj), "expansion");
     gtk_adjustment_set_value(adj, exp);
     gtk_adjustment_value_changed(adj);
 
-    adj = (GtkAdjustment*)gtk_object_get_data(obj, "t0");
+    adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(obj), "t0");
     gtk_adjustment_set_value(adj, t0);
     gtk_adjustment_value_changed(adj);
 
@@ -3895,13 +3895,13 @@ static void spiral_tb_event_attr_changed(Inkscape::XML::Node *repr,
     g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE));
 
     GtkAdjustment *adj;
-    adj = (GtkAdjustment*)gtk_object_get_data(GTK_OBJECT(tbl), "revolution");
+    adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(tbl), "revolution");
     gtk_adjustment_set_value(adj, (sp_repr_get_double_attribute(repr, "sodipodi:revolution", 3.0)));
 
-    adj = (GtkAdjustment*)gtk_object_get_data(GTK_OBJECT(tbl), "expansion");
+    adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(tbl), "expansion");
     gtk_adjustment_set_value(adj, (sp_repr_get_double_attribute(repr, "sodipodi:expansion", 1.0)));
 
-    adj = (GtkAdjustment*)gtk_object_get_data(GTK_OBJECT(tbl), "t0");
+    adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(tbl), "t0");
     gtk_adjustment_set_value(adj, (sp_repr_get_double_attribute(repr, "sodipodi:t0", 0.0)));
 
     g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE));
@@ -4186,7 +4186,7 @@ static void sp_pencil_tb_defaults(GtkWidget * /*widget*/, GtkObject *obj)
     // fixme: make settable
     gdouble tolerance = 4;
 
-    adj = (GtkAdjustment*)gtk_object_get_data(obj, "tolerance");
+    adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(obj), "tolerance");
     gtk_adjustment_set_value(adj, tolerance);
     gtk_adjustment_value_changed(adj);
 
@@ -8180,7 +8180,7 @@ static void connector_tb_event_attr_changed(Inkscape::XML::Node *repr,
 
     if ( !g_object_get_data(G_OBJECT(tbl), "freeze")
          && (strcmp(name, "inkscape:connector-spacing") == 0) ) {
-        GtkAdjustment *adj = static_cast<GtkAdjustment*>(gtk_object_get_data(GTK_OBJECT(tbl), "spacing"));
+        GtkAdjustment *adj = static_cast<GtkAdjustment*>(g_object_get_data(G_OBJECT(tbl), "spacing"));
         gdouble spacing = defaultConnSpacing;
         sp_repr_get_double(repr, "inkscape:connector-spacing", &spacing);