Merge from trunk

(bzr r9508.1.89)

14 files changed, 373 insertions, 445 deletions

diff --git a/src/dialogs/CMakeLists.txt b/src/dialogs/CMakeLists.txt
index 9bcb1cd5a..6586b78af 100644
--- a/src/dialogs/CMakeLists.txt
+++ b/src/dialogs/CMakeLists.txt
@@ -1,25 +1,28 @@
-SET(dialogs_SRC
-clonetiler.cpp
-dialog-events.cpp
-export.cpp
-extensions.cpp
-fill-style.cpp
-find.cpp
-guidelinedialog.cpp
-iconpreview.cpp
-in-dt-coordsys.cpp
-item-properties.cpp
-layer-properties.cpp
-layers-panel.cpp
-object-attributes.cpp
-rdf.cpp
-sp-attribute-widget.cpp
-stroke-style.cpp
-swatches.cpp
-text-edit.cpp
-unclump.cpp
-xml-tree.cpp
+
+set(dialogs_SRC
+	clonetiler.cpp
+	dialog-events.cpp
+	export.cpp
+	find.cpp
+	item-properties.cpp
+	object-attributes.cpp
+	spellcheck.cpp
+	text-edit.cpp
+	xml-tree.cpp
+
+
+	# -------
+	# Headers
+	clonetiler.h
+	dialog-events.h
+	export.h
+	find.h
+	item-properties.h
+	object-attributes.h
+	spellcheck.h
+	text-edit.h
+	xml-tree.h
 )
-ADD_LIBRARY(dialogs STATIC ${dialogs_SRC})
-TARGET_LINK_LIBRARIES(dialogs
-2geom ${INKSCAPE_LIBS})
+
+# add_inkscape_lib(dialogs_LIB "${dialogs_SRC}")
+add_inkscape_source("${dialogs_SRC}")
diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
index 81204f27b..60ec4f9f7 100644
--- a/src/dialogs/clonetiler.cpp
+++ b/src/dialogs/clonetiler.cpp
@@ -47,6 +47,7 @@
 #include "verbs.h"
 #include "widgets/icon.h"
 #include "xml/repr.h"
+#include "sp-root.h"
 
 using Inkscape::DocumentUndo;
 
@@ -83,8 +84,7 @@ static sigc::connection _color_changed_connection;
 
 static Inkscape::UI::Widget::ColorPicker *color_picker;
 
-static void
-clonetiler_dialog_destroy( GtkObject */*object*/, gpointer /*data*/ )
+static void clonetiler_dialog_destroy(GtkObject */*object*/, gpointer /*data*/)
 {
     sp_signal_disconnect_by_data (INKSCAPE, dlg);
     _color_changed_connection.disconnect();
@@ -96,14 +96,17 @@ clonetiler_dialog_destroy( GtkObject */*object*/, gpointer /*data*/ )
 
 }
 
-static gboolean
-clonetiler_dialog_delete (GtkObject */*object*/, GdkEvent * /*event*/, gpointer /*data*/)
+static gboolean clonetiler_dialog_delete(GtkObject */*object*/, GdkEvent * /*event*/, gpointer /*data*/)
 {
     gtk_window_get_position ((GtkWindow *) dlg, &x, &y);
     gtk_window_get_size ((GtkWindow *) dlg, &w, &h);
 
-    if (x<0) x=0;
-    if (y<0) y=0;
+    if (x < 0) {
+        x = 0;
+    }
+    if (y < 0) {
+        y = 0;
+    }
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     prefs->setInt(prefs_path + "x", x);
@@ -115,8 +118,7 @@ clonetiler_dialog_delete (GtkObject */*object*/, GdkEvent * /*event*/, gpointer
 
 }
 
-static void
-on_picker_color_changed (guint rgba)
+static void on_picker_color_changed(guint rgba)
 {
     static bool is_updating = false;
     if (is_updating || !SP_ACTIVE_DESKTOP)
@@ -132,10 +134,9 @@ on_picker_color_changed (guint rgba)
     is_updating = false;
 }
 
-static guint clonetiler_number_of_clones (SPObject *obj);
+static guint clonetiler_number_of_clones(SPObject *obj);
 
-static void
-clonetiler_change_selection (Inkscape::Application * /*inkscape*/, Inkscape::Selection *selection, GtkWidget *dlg)
+static void clonetiler_change_selection(Inkscape::Application * /*inkscape*/, Inkscape::Selection *selection, GtkWidget *dlg)
 {
     GtkWidget *buttons = (GtkWidget *) g_object_get_data (G_OBJECT(dlg), "buttons_on_tiles");
     GtkWidget *status = (GtkWidget *) g_object_get_data (G_OBJECT(dlg), "status");
@@ -164,15 +165,16 @@ clonetiler_change_selection (Inkscape::Application * /*inkscape*/, Inkscape::Sel
     }
 }
 
-static void
-clonetiler_external_change (Inkscape::Application * /*inkscape*/, GtkWidget *dlg)
+static void clonetiler_external_change(Inkscape::Application * /*inkscape*/, GtkWidget *dlg)
 {
     clonetiler_change_selection (NULL, sp_desktop_selection(SP_ACTIVE_DESKTOP), dlg);
 }
 
-static void clonetiler_disconnect_gsignal (GObject *widget, gpointer source) {
-    if (source && G_IS_OBJECT(source))
+static void clonetiler_disconnect_gsignal(GObject *widget, gpointer source)
+{
+    if (source && G_IS_OBJECT(source)) {
         sp_signal_disconnect_by_data (source, widget);
+    }
 }
 
 
@@ -197,9 +199,7 @@ enum {
 };
 
 
-static Geom::Affine
-clonetiler_get_transform (
-
+static Geom::Affine clonetiler_get_transform(
     // symmetry group
     int type,
 
@@ -801,8 +801,7 @@ clonetiler_get_transform (
     return Geom::identity();
 }
 
-static bool
-clonetiler_is_a_clone_of (SPObject *tile, SPObject *obj)
+static bool clonetiler_is_a_clone_of(SPObject *tile, SPObject *obj)
 {
     bool result = false;
     char *id_href = NULL;
@@ -835,8 +834,7 @@ static NRArenaItem *trace_root;
 static gdouble trace_zoom;
 static SPDocument *trace_doc;
 
-static void
-clonetiler_trace_hide_tiled_clones_recursively (SPObject *from)
+static void clonetiler_trace_hide_tiled_clones_recursively(SPObject *from)
 {
     if (!trace_arena)
         return;
@@ -848,8 +846,7 @@ clonetiler_trace_hide_tiled_clones_recursively (SPObject *from)
     }
 }
 
-static void
-clonetiler_trace_setup (SPDocument *doc, gdouble zoom, SPItem *original)
+static void clonetiler_trace_setup(SPDocument *doc, gdouble zoom, SPItem *original)
 {
     trace_arena = NRArena::create();
     /* Create ArenaItem and set transform */
@@ -867,11 +864,11 @@ clonetiler_trace_setup (SPDocument *doc, gdouble zoom, SPItem *original)
     trace_zoom = zoom;
 }
 
-static guint32
-clonetiler_trace_pick (Geom::Rect box)
+static guint32 clonetiler_trace_pick(Geom::Rect box)
 {
-    if (!trace_arena)
+    if (!trace_arena) {
         return 0;
+    }
 
     Geom::Affine t(Geom::Scale(trace_zoom, trace_zoom));
     nr_arena_item_set_transform(trace_root, &t);
@@ -906,8 +903,7 @@ clonetiler_trace_pick (Geom::Rect box)
     return SP_RGBA32_F_COMPOSE (R, G, B, A);
 }
 
-static void
-clonetiler_trace_finish ()
+static void clonetiler_trace_finish()
 {
     if (trace_doc) {
         SP_ITEM(trace_doc->getRoot())->invoke_hide(trace_visionkey);
@@ -918,12 +914,12 @@ clonetiler_trace_finish ()
     }
 }
 
-static void
-clonetiler_unclump( GtkWidget */*widget*/, void * )
+static void clonetiler_unclump(GtkWidget */*widget*/, void *)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if (desktop == NULL)
+    if (desktop == NULL) {
         return;
+    }
 
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
 
@@ -954,8 +950,7 @@ clonetiler_unclump( GtkWidget */*widget*/, void * )
                        _("Unclump tiled clones"));
 }
 
-static guint
-clonetiler_number_of_clones (SPObject *obj)
+static guint clonetiler_number_of_clones(SPObject *obj)
 {
     SPObject *parent = obj->parent;
 
@@ -970,12 +965,12 @@ clonetiler_number_of_clones (SPObject *obj)
     return n;
 }
 
-static void
-clonetiler_remove( GtkWidget */*widget*/, void *, bool do_undo = true )
+static void clonetiler_remove(GtkWidget */*widget*/, void *, bool do_undo = true)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if (desktop == NULL)
+    if (desktop == NULL) {
         return;
+    }
 
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
 
@@ -1008,8 +1003,7 @@ clonetiler_remove( GtkWidget */*widget*/, void *, bool do_undo = true )
     }
 }
 
-static Geom::Rect
-transform_rect( Geom::Rect const &r, Geom::Affine const &m)
+static Geom::Rect transform_rect(Geom::Rect const &r, Geom::Affine const &m)
 {
     using Geom::X;
     using Geom::Y;
@@ -1030,22 +1024,23 @@ transform_rect( Geom::Rect const &r, Geom::Affine const &m)
 Randomizes \a val by \a rand, with 0 < val < 1 and all values (including 0, 1) having the same
 probability of being displaced.
  */
-static double
-randomize01 (double val, double rand)
+static double randomize01(double val, double rand)
 {
     double base = MIN (val - rand, 1 - 2*rand);
-    if (base < 0) base = 0;
+    if (base < 0) {
+        base = 0;
+    }
     val = base + g_random_double_range (0, MIN (2 * rand, 1 - base));
     return CLAMP(val, 0, 1); // this should be unnecessary with the above provisions, but just in case...
 }
 
 
-static void
-clonetiler_apply( GtkWidget */*widget*/, void * )
+static void clonetiler_apply(GtkWidget */*widget*/, void *)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if (desktop == NULL)
+    if (desktop == NULL) {
         return;
+    }
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
 
@@ -1395,11 +1390,11 @@ clonetiler_apply( GtkWidget */*widget*/, void * )
             }
 
             if (opacity < 1e-6) { // invisibly transparent, skip
-                    continue;
+                continue;
             }
 
             if (fabs(t[0]) + fabs (t[1]) + fabs(t[2]) + fabs(t[3]) < 1e-6) { // too small, skip
-                    continue;
+                continue;
             }
 
             // Create the clone
@@ -1472,8 +1467,7 @@ clonetiler_apply( GtkWidget */*widget*/, void * )
                        _("Create tiled clones"));
 }
 
-static GtkWidget *
-clonetiler_new_tab (GtkWidget *nb, const gchar *label)
+static GtkWidget * clonetiler_new_tab(GtkWidget *nb, const gchar *label)
 {
     GtkWidget *l = gtk_label_new_with_mnemonic (label);
     GtkWidget *vb = gtk_vbox_new (FALSE, VB_MARGIN);
@@ -1482,76 +1476,74 @@ clonetiler_new_tab (GtkWidget *nb, const gchar *label)
     return vb;
 }
 
-static void
-clonetiler_checkbox_toggled (GtkToggleButton *tb, gpointer *data)
+static void clonetiler_checkbox_toggled(GtkToggleButton *tb, gpointer *data)
 {
     const gchar *attr = (const gchar *) data;
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     prefs->setBool(prefs_path + attr, gtk_toggle_button_get_active(tb));
 }
 
-static GtkWidget *
-clonetiler_checkbox (GtkTooltips *tt, const char *tip, const char *attr)
+static GtkWidget * clonetiler_checkbox(const char *tip, const char *attr)
 {
     GtkWidget *hb = gtk_hbox_new(FALSE, VB_MARGIN);
 
     GtkWidget *b = gtk_check_button_new ();
-    gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, tip, NULL);
+    gtk_widget_set_tooltip_text (b, tip);
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     bool value = prefs->getBool(prefs_path + attr);
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(b), value);
 
     gtk_box_pack_end (GTK_BOX (hb), b, FALSE, TRUE, 0);
-    gtk_signal_connect ( GTK_OBJECT (b), "clicked",
-                         GTK_SIGNAL_FUNC (clonetiler_checkbox_toggled), (gpointer) attr);
+    g_signal_connect ( G_OBJECT (b), "clicked",
+                         G_CALLBACK (clonetiler_checkbox_toggled), (gpointer) attr);
 
     g_object_set_data (G_OBJECT(b), "uncheckable", GINT_TO_POINTER(TRUE));
 
     return hb;
 }
 
-
-static void
-clonetiler_value_changed (GtkAdjustment *adj, gpointer data)
+static void clonetiler_value_changed(GtkAdjustment *adj, gpointer data)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     const gchar *pref = (const gchar *) data;
     prefs->setDouble(prefs_path + pref, adj->value);
 }
 
-static GtkWidget *
-clonetiler_spinbox (GtkTooltips *tt, const char *tip, const char *attr, double lower, double upper, const gchar *suffix, bool exponent = false)
+static GtkWidget * clonetiler_spinbox(const char *tip, const char *attr, double lower, double upper, const gchar *suffix, bool exponent = false)
 {
     GtkWidget *hb = gtk_hbox_new(FALSE, 0);
 
     {
         GtkObject *a;
-        if (exponent)
-            a = gtk_adjustment_new(1.0, lower, upper, 0.01, 0.05, 0.1);
-        else
-            a = gtk_adjustment_new(0.0, lower, upper, 0.1, 0.5, 2);
+        if (exponent) {
+            a = gtk_adjustment_new(1.0, lower, upper, 0.01, 0.05, 0);
+        } else {
+            a = gtk_adjustment_new(0.0, lower, upper, 0.1, 0.5, 0);
+        }
 
         GtkWidget *sb;
-        if (exponent)
+        if (exponent) {
             sb = gtk_spin_button_new (GTK_ADJUSTMENT (a), 0.01, 2);
-        else
+        } else {
             sb = gtk_spin_button_new (GTK_ADJUSTMENT (a), 0.1, 1);
+        }
 
-        gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), sb, tip, NULL);
+        gtk_widget_set_tooltip_text (sb, tip);
         gtk_entry_set_width_chars (GTK_ENTRY (sb), 4);
         gtk_box_pack_start (GTK_BOX (hb), sb, FALSE, FALSE, SB_MARGIN);
 
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         double value = prefs->getDoubleLimited(prefs_path + attr, exponent? 1.0 : 0.0, lower, upper);
         gtk_adjustment_set_value (GTK_ADJUSTMENT (a), value);
-        gtk_signal_connect(GTK_OBJECT(a), "value_changed",
-                           GTK_SIGNAL_FUNC(clonetiler_value_changed), (gpointer) attr);
+        g_signal_connect(G_OBJECT(a), "value_changed",
+                           G_CALLBACK(clonetiler_value_changed), (gpointer) attr);
 
-        if (exponent)
+        if (exponent) {
             g_object_set_data (G_OBJECT(sb), "oneable", GINT_TO_POINTER(TRUE));
-        else
+        } else {
             g_object_set_data (G_OBJECT(sb), "zeroable", GINT_TO_POINTER(TRUE));
+        }
     }
 
     {
@@ -1564,31 +1556,27 @@ clonetiler_spinbox (GtkTooltips *tt, const char *tip, const char *attr, double l
     return hb;
 }
 
-static void
-clonetiler_symgroup_changed( GtkMenuItem */*item*/, gpointer data )
+static void clonetiler_symgroup_changed(GtkMenuItem */*item*/, gpointer data)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     gint group_new = GPOINTER_TO_INT (data);
     prefs->setInt(prefs_path + "symmetrygroup", group_new);
 }
 
-static void
-clonetiler_xy_changed (GtkAdjustment *adj, gpointer data)
+static void clonetiler_xy_changed(GtkAdjustment *adj, gpointer data)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     const gchar *pref = (const gchar *) data;
     prefs->setInt(prefs_path + pref, (int) floor(adj->value + 0.5));
 }
 
-static void
-clonetiler_keep_bbox_toggled( GtkToggleButton *tb, gpointer /*data*/ )
+static void clonetiler_keep_bbox_toggled(GtkToggleButton *tb, gpointer /*data*/)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     prefs->setBool(prefs_path + "keepbbox", gtk_toggle_button_get_active(tb));
 }
 
-static void
-clonetiler_pick_to (GtkToggleButton *tb, gpointer data)
+static void clonetiler_pick_to(GtkToggleButton *tb, gpointer data)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     const gchar *pref = (const gchar *) data;
@@ -1596,8 +1584,7 @@ clonetiler_pick_to (GtkToggleButton *tb, gpointer data)
 }
 
 
-static void
-clonetiler_reset_recursive (GtkWidget *w)
+static void clonetiler_reset_recursive(GtkWidget *w)
 {
     if (w && GTK_IS_OBJECT(w)) {
         {
@@ -1631,22 +1618,19 @@ clonetiler_reset_recursive (GtkWidget *w)
     }
 }
 
-static void
-clonetiler_reset( GtkWidget */*widget*/, void * )
+static void clonetiler_reset(GtkWidget */*widget*/, void *)
 {
     clonetiler_reset_recursive (dlg);
 }
 
-static void
-clonetiler_table_attach (GtkWidget *table, GtkWidget *widget, float align, int row, int col)
+static void clonetiler_table_attach(GtkWidget *table, GtkWidget *widget, float align, int row, int col)
 {
     GtkWidget *a = gtk_alignment_new (align, 0, 0, 0);
     gtk_container_add(GTK_CONTAINER(a), widget);
     gtk_table_attach ( GTK_TABLE (table), a, col, col + 1, row, row + 1, (GtkAttachOptions)4, (GtkAttachOptions)0, 0, 0 );
 }
 
-static GtkWidget *
-clonetiler_table_x_y_rand (int values)
+static GtkWidget * clonetiler_table_x_y_rand(int values)
 {
     GtkWidget *table = gtk_table_new (values + 2, 5, FALSE);
     gtk_container_set_border_width (GTK_CONTAINER (table), VB_MARGIN);
@@ -1688,8 +1672,7 @@ clonetiler_table_x_y_rand (int values)
     return table;
 }
 
-static void
-clonetiler_pick_switched( GtkToggleButton */*tb*/, gpointer data )
+static void clonetiler_pick_switched(GtkToggleButton */*tb*/, gpointer data)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     guint v = GPOINTER_TO_INT (data);
@@ -1697,8 +1680,7 @@ clonetiler_pick_switched( GtkToggleButton */*tb*/, gpointer data )
 }
 
 
-static void
-clonetiler_switch_to_create( GtkToggleButton */*tb*/, GtkWidget *dlg )
+static void clonetiler_switch_to_create(GtkToggleButton */*tb*/, GtkWidget *dlg)
 {
     GtkWidget *rowscols = (GtkWidget *) g_object_get_data (G_OBJECT(dlg), "rowscols");
     GtkWidget *widthheight = (GtkWidget *) g_object_get_data (G_OBJECT(dlg), "widthheight");
@@ -1715,8 +1697,7 @@ clonetiler_switch_to_create( GtkToggleButton */*tb*/, GtkWidget *dlg )
 }
 
 
-static void
-clonetiler_switch_to_fill( GtkToggleButton */*tb*/, GtkWidget *dlg )
+static void clonetiler_switch_to_fill(GtkToggleButton */*tb*/, GtkWidget *dlg)
 {
     GtkWidget *rowscols = (GtkWidget *) g_object_get_data (G_OBJECT(dlg), "rowscols");
     GtkWidget *widthheight = (GtkWidget *) g_object_get_data (G_OBJECT(dlg), "widthheight");
@@ -1735,8 +1716,7 @@ clonetiler_switch_to_fill( GtkToggleButton */*tb*/, GtkWidget *dlg )
 
 
 
-static void
-clonetiler_fill_width_changed (GtkAdjustment *adj, GtkWidget *u)
+static void clonetiler_fill_width_changed(GtkAdjustment *adj, GtkWidget *u)
 {
     gdouble const raw_dist = adj->value;
     SPUnit const &unit = *sp_unit_selector_get_unit(SP_UNIT_SELECTOR(u));
@@ -1746,8 +1726,7 @@ clonetiler_fill_width_changed (GtkAdjustment *adj, GtkWidget *u)
     prefs->setDouble(prefs_path + "fillwidth", pixels);
 }
 
-static void
-clonetiler_fill_height_changed (GtkAdjustment *adj, GtkWidget *u)
+static void clonetiler_fill_height_changed(GtkAdjustment *adj, GtkWidget *u)
 {
     gdouble const raw_dist = adj->value;
     SPUnit const &unit = *sp_unit_selector_get_unit(SP_UNIT_SELECTOR(u));
@@ -1758,23 +1737,22 @@ clonetiler_fill_height_changed (GtkAdjustment *adj, GtkWidget *u)
 }
 
 
-static void
-clonetiler_do_pick_toggled( GtkToggleButton *tb, gpointer /*data*/ )
+static void clonetiler_do_pick_toggled(GtkToggleButton *tb, gpointer /*data*/)
 {
     GtkWidget *vvb = (GtkWidget *) g_object_get_data (G_OBJECT(dlg), "dotrace");
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     prefs->setBool(prefs_path + "dotrace", gtk_toggle_button_get_active (tb));
 
-    if (vvb)
+    if (vvb) {
         gtk_widget_set_sensitive (vvb, gtk_toggle_button_get_active (tb));
+    }
 }
 
 
 
 
-void
-clonetiler_dialog (void)
+void clonetiler_dialog(void)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if (!dlg)
@@ -1812,18 +1790,16 @@ clonetiler_dialog (void)
         wd.stop = 0;
 
 
-        gtk_signal_connect ( GTK_OBJECT (dlg), "event", GTK_SIGNAL_FUNC (sp_dialog_event_handler), dlg);
+        g_signal_connect ( G_OBJECT (dlg), "event", G_CALLBACK (sp_dialog_event_handler), dlg);
 
-        gtk_signal_connect ( GTK_OBJECT (dlg), "destroy", G_CALLBACK (clonetiler_dialog_destroy), dlg);
-        gtk_signal_connect ( GTK_OBJECT (dlg), "delete_event", G_CALLBACK (clonetiler_dialog_delete), dlg);
+        g_signal_connect ( G_OBJECT (dlg), "destroy", G_CALLBACK (clonetiler_dialog_destroy), dlg);
+        g_signal_connect ( G_OBJECT (dlg), "delete_event", G_CALLBACK (clonetiler_dialog_delete), dlg);
 
         g_signal_connect   ( G_OBJECT (INKSCAPE), "shut_down", G_CALLBACK (clonetiler_dialog_delete), dlg);
         g_signal_connect   ( G_OBJECT (INKSCAPE), "dialogs_hide", G_CALLBACK (sp_dialog_hide), dlg);
         g_signal_connect   ( G_OBJECT (INKSCAPE), "dialogs_unhide", G_CALLBACK (sp_dialog_unhide), dlg);
         g_signal_connect   ( G_OBJECT (INKSCAPE), "activate_desktop", G_CALLBACK (sp_transientize_callback), &wd);
 
-        GtkTooltips *tt = gtk_tooltips_new();
-
         GtkWidget *mainbox = gtk_vbox_new(FALSE, 4);
         gtk_container_set_border_width (GTK_CONTAINER (mainbox), 6);
         gtk_container_add (GTK_CONTAINER (dlg), mainbox);
@@ -1842,7 +1818,7 @@ clonetiler_dialog (void)
              * http://www.clarku.edu/~djoyce/wallpaper/seventeen.html (English vocabulary); or
              * http://membres.lycos.fr/villemingerard/Geometri/Sym1D.htm (French vocabulary).
              */
-            gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), om, _("Select one of the 17 symmetry groups for the tiling"), NULL);
+            gtk_widget_set_tooltip_text (om, _("Select one of the 17 symmetry groups for the tiling"));
             gtk_box_pack_start (GTK_BOX (vb), om, FALSE, FALSE, SB_MARGIN);
 
             GtkWidget *m = gtk_menu_new ();
@@ -1884,8 +1860,8 @@ clonetiler_dialog (void)
                 GtkWidget *item = gtk_menu_item_new ();
                 gtk_container_add (GTK_CONTAINER (item), l);
 
-                gtk_signal_connect ( GTK_OBJECT (item), "activate",
-                                     GTK_SIGNAL_FUNC (clonetiler_symgroup_changed),
+                g_signal_connect ( G_OBJECT (item), "activate",
+                                     G_CALLBACK (clonetiler_symgroup_changed),
                                      GINT_TO_POINTER (sg.group) );
 
                 gtk_menu_append (GTK_MENU (m), item);
@@ -1915,7 +1891,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
+                GtkWidget *l = clonetiler_spinbox (
                     // xgettext:no-c-format
                                                    _("Horizontal shift per row (in % of tile width)"), "shiftx_per_j",
                                                    -10000, 10000, "%");
@@ -1923,7 +1899,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
+                GtkWidget *l = clonetiler_spinbox (
                     // xgettext:no-c-format
                                                    _("Horizontal shift per column (in % of tile width)"), "shiftx_per_i",
                                                    -10000, 10000, "%");
@@ -1931,8 +1907,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Randomize the horizontal shift by this percentage"), "shiftx_rand",
+                GtkWidget *l = clonetiler_spinbox (_("Randomize the horizontal shift by this percentage"), "shiftx_rand",
                                                    0, 1000, "%");
                 clonetiler_table_attach (table, l, 0, 2, 4);
             }
@@ -1948,7 +1923,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
+                GtkWidget *l = clonetiler_spinbox (
                     // xgettext:no-c-format
                                                    _("Vertical shift per row (in % of tile height)"), "shifty_per_j",
                                                    -10000, 10000, "%");
@@ -1956,7 +1931,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
+                GtkWidget *l = clonetiler_spinbox (
                     // xgettext:no-c-format
                                                    _("Vertical shift per column (in % of tile height)"), "shifty_per_i",
                                                    -10000, 10000, "%");
@@ -1964,7 +1939,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
+                GtkWidget *l = clonetiler_spinbox (
                                                    _("Randomize the vertical shift by this percentage"), "shifty_rand",
                                                    0, 1000, "%");
                 clonetiler_table_attach (table, l, 0, 3, 4);
@@ -1979,14 +1954,14 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
+                GtkWidget *l = clonetiler_spinbox (
                                                    _("Whether rows are spaced evenly (1), converge (<1) or diverge (>1)"), "shifty_exp",
                                                    0, 10, "", true);
                 clonetiler_table_attach (table, l, 0, 4, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
+                GtkWidget *l = clonetiler_spinbox (
                                                    _("Whether columns are spaced evenly (1), converge (<1) or diverge (>1)"), "shiftx_exp",
                                                    0, 10, "", true);
                 clonetiler_table_attach (table, l, 0, 4, 3);
@@ -2001,12 +1976,12 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of shifts for each row"), "shifty_alternate");
+                GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of shifts for each row"), "shifty_alternate");
                 clonetiler_table_attach (table, l, 0, 5, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of shifts for each column"), "shiftx_alternate");
+                GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of shifts for each column"), "shiftx_alternate");
                 clonetiler_table_attach (table, l, 0, 5, 3);
             }
 
@@ -2019,12 +1994,12 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Cumulate the shifts for each row"), "shifty_cumulate");
+                GtkWidget *l = clonetiler_checkbox (_("Cumulate the shifts for each row"), "shifty_cumulate");
                 clonetiler_table_attach (table, l, 0, 6, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Cumulate the shifts for each column"), "shiftx_cumulate");
+                GtkWidget *l = clonetiler_checkbox (_("Cumulate the shifts for each column"), "shiftx_cumulate");
                 clonetiler_table_attach (table, l, 0, 6, 3);
             }
 
@@ -2037,12 +2012,12 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Exclude tile height in shift"), "shifty_excludeh");
+                GtkWidget *l = clonetiler_checkbox (_("Exclude tile height in shift"), "shifty_excludeh");
                 clonetiler_table_attach (table, l, 0, 7, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Exclude tile width in shift"), "shiftx_excludew");
+                GtkWidget *l = clonetiler_checkbox (_("Exclude tile width in shift"), "shiftx_excludew");
                 clonetiler_table_attach (table, l, 0, 7, 3);
             }
 
@@ -2065,7 +2040,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
+                GtkWidget *l = clonetiler_spinbox (
                     // xgettext:no-c-format
                                                    _("Horizontal scale per row (in % of tile width)"), "scalex_per_j",
                                                    -100, 1000, "%");
@@ -2073,7 +2048,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
+                GtkWidget *l = clonetiler_spinbox (
                     // xgettext:no-c-format
                                                    _("Horizontal scale per column (in % of tile width)"), "scalex_per_i",
                                                    -100, 1000, "%");
@@ -2081,8 +2056,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Randomize the horizontal scale by this percentage"), "scalex_rand",
+                GtkWidget *l = clonetiler_spinbox (_("Randomize the horizontal scale by this percentage"), "scalex_rand",
                                                    0, 1000, "%");
                 clonetiler_table_attach (table, l, 0, 2, 4);
             }
@@ -2096,7 +2070,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
+                GtkWidget *l = clonetiler_spinbox (
                     // xgettext:no-c-format
                                                    _("Vertical scale per row (in % of tile height)"), "scaley_per_j",
                                                    -100, 1000, "%");
@@ -2104,7 +2078,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
+                GtkWidget *l = clonetiler_spinbox (
                     // xgettext:no-c-format
                                                    _("Vertical scale per column (in % of tile height)"), "scaley_per_i",
                                                    -100, 1000, "%");
@@ -2112,8 +2086,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Randomize the vertical scale by this percentage"), "scaley_rand",
+                GtkWidget *l = clonetiler_spinbox (_("Randomize the vertical scale by this percentage"), "scaley_rand",
                                                    0, 1000, "%");
                 clonetiler_table_attach (table, l, 0, 3, 4);
             }
@@ -2127,15 +2100,13 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Whether row scaling is uniform (1), converge (<1) or diverge (>1)"), "scaley_exp",
+                GtkWidget *l = clonetiler_spinbox (_("Whether row scaling is uniform (1), converge (<1) or diverge (>1)"), "scaley_exp",
                                                    0, 10, "", true);
                 clonetiler_table_attach (table, l, 0, 4, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Whether column scaling is uniform (1), converge (<1) or diverge (>1)"), "scalex_exp",
+                GtkWidget *l = clonetiler_spinbox (_("Whether column scaling is uniform (1), converge (<1) or diverge (>1)"), "scalex_exp",
                                                    0, 10, "", true);
                 clonetiler_table_attach (table, l, 0, 4, 3);
             }
@@ -2149,15 +2120,13 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Base for a logarithmic spiral: not used (0), converge (<1), or diverge (>1)"), "scaley_log",
+                GtkWidget *l = clonetiler_spinbox (_("Base for a logarithmic spiral: not used (0), converge (<1), or diverge (>1)"), "scaley_log",
                                                    0, 10, "", false);
                 clonetiler_table_attach (table, l, 0, 5, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Base for a logarithmic spiral: not used (0), converge (<1), or diverge (>1)"), "scalex_log",
+                GtkWidget *l = clonetiler_spinbox (_("Base for a logarithmic spiral: not used (0), converge (<1), or diverge (>1)"), "scalex_log",
                                                    0, 10, "", false);
                 clonetiler_table_attach (table, l, 0, 5, 3);
             }
@@ -2171,12 +2140,12 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of scales for each row"), "scaley_alternate");
+                GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of scales for each row"), "scaley_alternate");
                 clonetiler_table_attach (table, l, 0, 6, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of scales for each column"), "scalex_alternate");
+                GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of scales for each column"), "scalex_alternate");
                 clonetiler_table_attach (table, l, 0, 6, 3);
             }
 
@@ -2189,12 +2158,12 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Cumulate the scales for each row"), "scaley_cumulate");
+                GtkWidget *l = clonetiler_checkbox (_("Cumulate the scales for each row"), "scaley_cumulate");
                 clonetiler_table_attach (table, l, 0, 7, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Cumulate the scales for each column"), "scalex_cumulate");
+                GtkWidget *l = clonetiler_checkbox (_("Cumulate the scales for each column"), "scalex_cumulate");
                 clonetiler_table_attach (table, l, 0, 7, 3);
             }
 
@@ -2217,7 +2186,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
+                GtkWidget *l = clonetiler_spinbox (
                     // xgettext:no-c-format
                                                    _("Rotate tiles by this angle for each row"), "rotate_per_j",
                                                    -180, 180, "&#176;");
@@ -2225,7 +2194,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
+                GtkWidget *l = clonetiler_spinbox (
                     // xgettext:no-c-format
                                                    _("Rotate tiles by this angle for each column"), "rotate_per_i",
                                                    -180, 180, "&#176;");
@@ -2233,8 +2202,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Randomize the rotation angle by this percentage"), "rotate_rand",
+                GtkWidget *l = clonetiler_spinbox (_("Randomize the rotation angle by this percentage"), "rotate_rand",
                                                    0, 100, "%");
                 clonetiler_table_attach (table, l, 0, 2, 4);
             }
@@ -2248,12 +2216,12 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the rotation direction for each row"), "rotate_alternatej");
+                GtkWidget *l = clonetiler_checkbox (_("Alternate the rotation direction for each row"), "rotate_alternatej");
                 clonetiler_table_attach (table, l, 0, 3, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the rotation direction for each column"), "rotate_alternatei");
+                GtkWidget *l = clonetiler_checkbox (_("Alternate the rotation direction for each column"), "rotate_alternatei");
                 clonetiler_table_attach (table, l, 0, 3, 3);
             }
 
@@ -2266,12 +2234,12 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Cumulate the rotation for each row"), "rotate_cumulatej");
+                GtkWidget *l = clonetiler_checkbox (_("Cumulate the rotation for each row"), "rotate_cumulatej");
                 clonetiler_table_attach (table, l, 0, 4, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Cumulate the rotation for each column"), "rotate_cumulatei");
+                GtkWidget *l = clonetiler_checkbox (_("Cumulate the rotation for each column"), "rotate_cumulatei");
                 clonetiler_table_attach (table, l, 0, 4, 3);
             }
 
@@ -2295,22 +2263,19 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Blur tiles by this percentage for each row"), "blur_per_j",
+                GtkWidget *l = clonetiler_spinbox (_("Blur tiles by this percentage for each row"), "blur_per_j",
                                                    0, 100, "%");
                 clonetiler_table_attach (table, l, 0, 2, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Blur tiles by this percentage for each column"), "blur_per_i",
+                GtkWidget *l = clonetiler_spinbox (_("Blur tiles by this percentage for each column"), "blur_per_i",
                                                    0, 100, "%");
                 clonetiler_table_attach (table, l, 0, 2, 3);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Randomize the tile blur by this percentage"), "blur_rand",
+                GtkWidget *l = clonetiler_spinbox (_("Randomize the tile blur by this percentage"), "blur_rand",
                                                    0, 100, "%");
                 clonetiler_table_attach (table, l, 0, 2, 4);
             }
@@ -2324,12 +2289,12 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of blur change for each row"), "blur_alternatej");
+                GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of blur change for each row"), "blur_alternatej");
                 clonetiler_table_attach (table, l, 0, 3, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of blur change for each column"), "blur_alternatei");
+                GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of blur change for each column"), "blur_alternatei");
                 clonetiler_table_attach (table, l, 0, 3, 3);
             }
 
@@ -2344,22 +2309,19 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Decrease tile opacity by this percentage for each row"), "opacity_per_j",
+                GtkWidget *l = clonetiler_spinbox (_("Decrease tile opacity by this percentage for each row"), "opacity_per_j",
                                                    0, 100, "%");
                 clonetiler_table_attach (table, l, 0, 4, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Decrease tile opacity by this percentage for each column"), "opacity_per_i",
+                GtkWidget *l = clonetiler_spinbox (_("Decrease tile opacity by this percentage for each column"), "opacity_per_i",
                                                    0, 100, "%");
                 clonetiler_table_attach (table, l, 0, 4, 3);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Randomize the tile opacity by this percentage"), "opacity_rand",
+                GtkWidget *l = clonetiler_spinbox (_("Randomize the tile opacity by this percentage"), "opacity_rand",
                                                    0, 100, "%");
                 clonetiler_table_attach (table, l, 0, 4, 4);
             }
@@ -2373,12 +2335,12 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of opacity change for each row"), "opacity_alternatej");
+                GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of opacity change for each row"), "opacity_alternatej");
                 clonetiler_table_attach (table, l, 0, 5, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of opacity change for each column"), "opacity_alternatei");
+                GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of opacity change for each column"), "opacity_alternatei");
                 clonetiler_table_attach (table, l, 0, 5, 3);
             }
         }
@@ -2416,22 +2378,19 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Change the tile hue by this percentage for each row"), "hue_per_j",
+                GtkWidget *l = clonetiler_spinbox (_("Change the tile hue by this percentage for each row"), "hue_per_j",
                                                    -100, 100, "%");
                 clonetiler_table_attach (table, l, 0, 2, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Change the tile hue by this percentage for each column"), "hue_per_i",
+                GtkWidget *l = clonetiler_spinbox (_("Change the tile hue by this percentage for each column"), "hue_per_i",
                                                    -100, 100, "%");
                 clonetiler_table_attach (table, l, 0, 2, 3);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Randomize the tile hue by this percentage"), "hue_rand",
+                GtkWidget *l = clonetiler_spinbox (_("Randomize the tile hue by this percentage"), "hue_rand",
                                                    0, 100, "%");
                 clonetiler_table_attach (table, l, 0, 2, 4);
             }
@@ -2446,22 +2405,19 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Change the color saturation by this percentage for each row"), "saturation_per_j",
+                GtkWidget *l = clonetiler_spinbox (_("Change the color saturation by this percentage for each row"), "saturation_per_j",
                                                    -100, 100, "%");
                 clonetiler_table_attach (table, l, 0, 3, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Change the color saturation by this percentage for each column"), "saturation_per_i",
+                GtkWidget *l = clonetiler_spinbox (_("Change the color saturation by this percentage for each column"), "saturation_per_i",
                                                    -100, 100, "%");
                 clonetiler_table_attach (table, l, 0, 3, 3);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Randomize the color saturation by this percentage"), "saturation_rand",
+                GtkWidget *l = clonetiler_spinbox (_("Randomize the color saturation by this percentage"), "saturation_rand",
                                                    0, 100, "%");
                 clonetiler_table_attach (table, l, 0, 3, 4);
             }
@@ -2475,22 +2431,19 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Change the color lightness by this percentage for each row"), "lightness_per_j",
+                GtkWidget *l = clonetiler_spinbox (_("Change the color lightness by this percentage for each row"), "lightness_per_j",
                                                    -100, 100, "%");
                 clonetiler_table_attach (table, l, 0, 4, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Change the color lightness by this percentage for each column"), "lightness_per_i",
+                GtkWidget *l = clonetiler_spinbox (_("Change the color lightness by this percentage for each column"), "lightness_per_i",
                                                    -100, 100, "%");
                 clonetiler_table_attach (table, l, 0, 4, 3);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt,
-                                                   _("Randomize the color lightness by this percentage"), "lightness_rand",
+                GtkWidget *l = clonetiler_spinbox (_("Randomize the color lightness by this percentage"), "lightness_rand",
                                                    0, 100, "%");
                 clonetiler_table_attach (table, l, 0, 4, 4);
             }
@@ -2504,12 +2457,12 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of color changes for each row"), "color_alternatej");
+                GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of color changes for each row"), "color_alternatej");
                 clonetiler_table_attach (table, l, 0, 5, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_checkbox (tt, _("Alternate the sign of color changes for each column"), "color_alternatei");
+                GtkWidget *l = clonetiler_checkbox (_("Alternate the sign of color changes for each column"), "color_alternatei");
                 clonetiler_table_attach (table, l, 0, 5, 3);
             }
 
@@ -2528,11 +2481,11 @@ clonetiler_dialog (void)
             g_object_set_data (G_OBJECT(b), "uncheckable", GINT_TO_POINTER(TRUE));
             bool old = prefs->getBool(prefs_path + "dotrace");
             gtk_toggle_button_set_active ((GtkToggleButton *) b, old);
-            gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("For each clone, pick a value from the drawing in that clone's location and apply it to the clone"), NULL);
+            gtk_widget_set_tooltip_text (b, _("For each clone, pick a value from the drawing in that clone's location and apply it to the clone"));
             gtk_box_pack_start (GTK_BOX (hb), b, FALSE, FALSE, 0);
 
-            gtk_signal_connect(GTK_OBJECT(b), "toggled",
-                               GTK_SIGNAL_FUNC(clonetiler_do_pick_toggled), dlg);
+            g_signal_connect(G_OBJECT(b), "toggled",
+                               G_CALLBACK(clonetiler_do_pick_toggled), dlg);
         }
 
         {
@@ -2554,66 +2507,66 @@ clonetiler_dialog (void)
                 GtkWidget* radio;
                 {
                     radio = gtk_radio_button_new_with_label (NULL, _("Color"));
-                    gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the visible color and opacity"), NULL);
+                    gtk_widget_set_tooltip_text (radio, _("Pick the visible color and opacity"));
                     clonetiler_table_attach (table, radio, 0.0, 1, 1);
-                    gtk_signal_connect (GTK_OBJECT (radio), "toggled",
-                                        GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_COLOR));
+                    g_signal_connect (G_OBJECT (radio), "toggled",
+                                        G_CALLBACK (clonetiler_pick_switched), GINT_TO_POINTER(PICK_COLOR));
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs->getInt(prefs_path + "pick", 0) == PICK_COLOR);
                 }
                 {
                     radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), _("Opacity"));
-                    gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the total accumulated opacity"), NULL);
+                    gtk_widget_set_tooltip_text (radio, _("Pick the total accumulated opacity"));
                     clonetiler_table_attach (table, radio, 0.0, 2, 1);
-                    gtk_signal_connect (GTK_OBJECT (radio), "toggled",
-                                        GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_OPACITY));
+                    g_signal_connect (G_OBJECT (radio), "toggled",
+                                        G_CALLBACK (clonetiler_pick_switched), GINT_TO_POINTER(PICK_OPACITY));
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs->getInt(prefs_path + "pick", 0) == PICK_OPACITY);
                 }
                 {
                     radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), _("R"));
-                    gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the Red component of the color"), NULL);
+                    gtk_widget_set_tooltip_text (radio, _("Pick the Red component of the color"));
                     clonetiler_table_attach (table, radio, 0.0, 1, 2);
-                    gtk_signal_connect (GTK_OBJECT (radio), "toggled",
-                                        GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_R));
+                    g_signal_connect (G_OBJECT (radio), "toggled",
+                                        G_CALLBACK (clonetiler_pick_switched), GINT_TO_POINTER(PICK_R));
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs->getInt(prefs_path + "pick", 0) == PICK_R);
                 }
                 {
                     radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), _("G"));
-                    gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the Green component of the color"), NULL);
+                    gtk_widget_set_tooltip_text (radio, _("Pick the Green component of the color"));
                     clonetiler_table_attach (table, radio, 0.0, 2, 2);
-                    gtk_signal_connect (GTK_OBJECT (radio), "toggled",
-                                        GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_G));
+                    g_signal_connect (G_OBJECT (radio), "toggled",
+                                        G_CALLBACK (clonetiler_pick_switched), GINT_TO_POINTER(PICK_G));
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs->getInt(prefs_path + "pick", 0) == PICK_G);
                 }
                 {
                     radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), _("B"));
-                    gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the Blue component of the color"), NULL);
+                    gtk_widget_set_tooltip_text (radio, _("Pick the Blue component of the color"));
                     clonetiler_table_attach (table, radio, 0.0, 3, 2);
-                    gtk_signal_connect (GTK_OBJECT (radio), "toggled",
-                                        GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_B));
+                    g_signal_connect (G_OBJECT (radio), "toggled",
+                                        G_CALLBACK (clonetiler_pick_switched), GINT_TO_POINTER(PICK_B));
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs->getInt(prefs_path + "pick", 0) == PICK_B);
                 }
                 {
                     radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), C_("Clonetiler color hue", "H"));
-                    gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the hue of the color"), NULL);
+                    gtk_widget_set_tooltip_text (radio, _("Pick the hue of the color"));
                     clonetiler_table_attach (table, radio, 0.0, 1, 3);
-                    gtk_signal_connect (GTK_OBJECT (radio), "toggled",
-                                        GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_H));
+                    g_signal_connect (G_OBJECT (radio), "toggled",
+                                        G_CALLBACK (clonetiler_pick_switched), GINT_TO_POINTER(PICK_H));
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs->getInt(prefs_path + "pick", 0) == PICK_H);
                 }
                 {
                     radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), C_("Clonetiler color saturation", "S"));
-                    gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the saturation of the color"), NULL);
+                    gtk_widget_set_tooltip_text (radio, _("Pick the saturation of the color"));
                     clonetiler_table_attach (table, radio, 0.0, 2, 3);
-                    gtk_signal_connect (GTK_OBJECT (radio), "toggled",
-                                        GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_S));
+                    g_signal_connect (G_OBJECT (radio), "toggled",
+                                        G_CALLBACK (clonetiler_pick_switched), GINT_TO_POINTER(PICK_S));
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs->getInt(prefs_path + "pick", 0) == PICK_S);
                 }
                 {
                     radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), C_("Clonetiler color lightness", "L"));
-                    gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the lightness of the color"), NULL);
+                    gtk_widget_set_tooltip_text (radio, _("Pick the lightness of the color"));
                     clonetiler_table_attach (table, radio, 0.0, 3, 3);
-                    gtk_signal_connect (GTK_OBJECT (radio), "toggled",
-                                        GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_L));
+                    g_signal_connect (G_OBJECT (radio), "toggled",
+                                        G_CALLBACK (clonetiler_pick_switched), GINT_TO_POINTER(PICK_L));
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs->getInt(prefs_path + "pick", 0) == PICK_L);
                 }
 
@@ -2634,8 +2587,7 @@ clonetiler_dialog (void)
                     clonetiler_table_attach (table, l, 1.0, 1, 1);
                 }
                 {
-                    GtkWidget *l = clonetiler_spinbox (tt,
-                                                       _("Shift the mid-range of the picked value upwards (>0) or downwards (<0)"), "gamma_picked",
+                    GtkWidget *l = clonetiler_spinbox (_("Shift the mid-range of the picked value upwards (>0) or downwards (<0)"), "gamma_picked",
                                                        -10, 10, "");
                     clonetiler_table_attach (table, l, 0.0, 1, 2);
                 }
@@ -2646,8 +2598,7 @@ clonetiler_dialog (void)
                     clonetiler_table_attach (table, l, 1.0, 1, 3);
                 }
                 {
-                    GtkWidget *l = clonetiler_spinbox (tt,
-                                                       _("Randomize the picked value by this percentage"), "rand_picked",
+                    GtkWidget *l = clonetiler_spinbox (_("Randomize the picked value by this percentage"), "rand_picked",
                                                        0, 100, "%");
                     clonetiler_table_attach (table, l, 0.0, 1, 4);
                 }
@@ -2658,7 +2609,7 @@ clonetiler_dialog (void)
                     clonetiler_table_attach (table, l, 1.0, 2, 1);
                 }
                 {
-                    GtkWidget *l = clonetiler_checkbox (tt, _("Invert the picked value"), "invert_picked");
+                    GtkWidget *l = clonetiler_checkbox (_("Invert the picked value"), "invert_picked");
                     clonetiler_table_attach (table, l, 0.0, 2, 2);
                 }
             }
@@ -2677,40 +2628,40 @@ clonetiler_dialog (void)
                     GtkWidget *b  = gtk_check_button_new_with_label (_("Presence"));
                     bool old = prefs->getBool(prefs_path + "pick_to_presence", true);
                     gtk_toggle_button_set_active ((GtkToggleButton *) b, old);
-                    gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("Each clone is created with the probability determined by the picked value in that point"), NULL);
+                    gtk_widget_set_tooltip_text (b, _("Each clone is created with the probability determined by the picked value in that point"));
                     clonetiler_table_attach (table, b, 0.0, 1, 1);
-                    gtk_signal_connect(GTK_OBJECT(b), "toggled",
-                                       GTK_SIGNAL_FUNC(clonetiler_pick_to), (gpointer) "pick_to_presence");
+                    g_signal_connect(G_OBJECT(b), "toggled",
+                                       G_CALLBACK(clonetiler_pick_to), (gpointer) "pick_to_presence");
                 }
 
                 {
                     GtkWidget *b  = gtk_check_button_new_with_label (_("Size"));
                     bool old = prefs->getBool(prefs_path + "pick_to_size");
                     gtk_toggle_button_set_active ((GtkToggleButton *) b, old);
-                    gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("Each clone's size is determined by the picked value in that point"), NULL);
+                    gtk_widget_set_tooltip_text (b, _("Each clone's size is determined by the picked value in that point"));
                     clonetiler_table_attach (table, b, 0.0, 2, 1);
-                    gtk_signal_connect(GTK_OBJECT(b), "toggled",
-                                       GTK_SIGNAL_FUNC(clonetiler_pick_to), (gpointer) "pick_to_size");
+                    g_signal_connect(G_OBJECT(b), "toggled",
+                                       G_CALLBACK(clonetiler_pick_to), (gpointer) "pick_to_size");
                 }
 
                 {
                     GtkWidget *b  = gtk_check_button_new_with_label (_("Color"));
                     bool old = prefs->getBool(prefs_path + "pick_to_color", 0);
                     gtk_toggle_button_set_active ((GtkToggleButton *) b, old);
-                    gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("Each clone is painted by the picked color (the original must have unset fill or stroke)"), NULL);
+                    gtk_widget_set_tooltip_text (b, _("Each clone is painted by the picked color (the original must have unset fill or stroke)"));
                     clonetiler_table_attach (table, b, 0.0, 1, 2);
-                    gtk_signal_connect(GTK_OBJECT(b), "toggled",
-                                       GTK_SIGNAL_FUNC(clonetiler_pick_to), (gpointer) "pick_to_color");
+                    g_signal_connect(G_OBJECT(b), "toggled",
+                                       G_CALLBACK(clonetiler_pick_to), (gpointer) "pick_to_color");
                 }
 
                 {
                     GtkWidget *b  = gtk_check_button_new_with_label (_("Opacity"));
                     bool old = prefs->getBool(prefs_path + "pick_to_opacity", 0);
                     gtk_toggle_button_set_active ((GtkToggleButton *) b, old);
-                    gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("Each clone's opacity is determined by the picked value in that point"), NULL);
+                    gtk_widget_set_tooltip_text (b, _("Each clone's opacity is determined by the picked value in that point"));
                     clonetiler_table_attach (table, b, 0.0, 2, 2);
-                    gtk_signal_connect(GTK_OBJECT(b), "toggled",
-                                       GTK_SIGNAL_FUNC(clonetiler_pick_to), (gpointer) "pick_to_opacity");
+                    g_signal_connect(G_OBJECT(b), "toggled",
+                                       G_CALLBACK(clonetiler_pick_to), (gpointer) "pick_to_opacity");
                 }
             }
            gtk_widget_set_sensitive (vvb, prefs->getBool(prefs_path + "dotrace"));
@@ -2730,16 +2681,16 @@ clonetiler_dialog (void)
                 g_object_set_data (G_OBJECT(dlg), "rowscols", (gpointer) hb);
 
                 {
-                    GtkObject *a = gtk_adjustment_new(0.0, 1, 500, 1, 10, 10);
+                    GtkObject *a = gtk_adjustment_new(0.0, 1, 500, 1, 10, 0);
                     int value = prefs->getInt(prefs_path + "jmax", 2);
                     gtk_adjustment_set_value (GTK_ADJUSTMENT (a), value);
                     GtkWidget *sb = gtk_spin_button_new (GTK_ADJUSTMENT (a), 1.0, 0);
-                    gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), sb, _("How many rows in the tiling"), NULL);
+                    gtk_widget_set_tooltip_text (sb, _("How many rows in the tiling"));
                     gtk_entry_set_width_chars (GTK_ENTRY (sb), 5);
                     gtk_box_pack_start (GTK_BOX (hb), sb, TRUE, TRUE, 0);
 
-                    gtk_signal_connect(GTK_OBJECT(a), "value_changed",
-                                       GTK_SIGNAL_FUNC(clonetiler_xy_changed), (gpointer) "jmax");
+                    g_signal_connect(G_OBJECT(a), "value_changed",
+                                       G_CALLBACK(clonetiler_xy_changed), (gpointer) "jmax");
                 }
 
                 {
@@ -2750,16 +2701,16 @@ clonetiler_dialog (void)
                 }
 
                 {
-                    GtkObject *a = gtk_adjustment_new(0.0, 1, 500, 1, 10, 10);
+                    GtkObject *a = gtk_adjustment_new(0.0, 1, 500, 1, 10, 0);
                     int value = prefs->getInt(prefs_path + "imax", 2);
                     gtk_adjustment_set_value (GTK_ADJUSTMENT (a), value);
                     GtkWidget *sb = gtk_spin_button_new (GTK_ADJUSTMENT (a), 1.0, 0);
-                    gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), sb, _("How many columns in the tiling"), NULL);
+                    gtk_widget_set_tooltip_text (sb, _("How many columns in the tiling"));
                     gtk_entry_set_width_chars (GTK_ENTRY (sb), 5);
                     gtk_box_pack_start (GTK_BOX (hb), sb, TRUE, TRUE, 0);
 
-                    gtk_signal_connect(GTK_OBJECT(a), "value_changed",
-                                       GTK_SIGNAL_FUNC(clonetiler_xy_changed), (gpointer) "imax");
+                    g_signal_connect(G_OBJECT(a), "value_changed",
+                                       G_CALLBACK(clonetiler_xy_changed), (gpointer) "imax");
                 }
 
                 clonetiler_table_attach (table, hb, 0.0, 1, 2);
@@ -2775,7 +2726,7 @@ clonetiler_dialog (void)
 
                 {
                     // Width spinbutton
-                    GtkObject *a = gtk_adjustment_new (0.0, -1e6, 1e6, 1.0, 10.0, 10.0);
+                    GtkObject *a = gtk_adjustment_new (0.0, -1e6, 1e6, 1.0, 10.0, 0);
                     sp_unit_selector_add_adjustment (SP_UNIT_SELECTOR (u), GTK_ADJUSTMENT (a));
 
                     double value = prefs->getDouble(prefs_path + "fillwidth", 50.0);
@@ -2784,11 +2735,11 @@ clonetiler_dialog (void)
                     gtk_adjustment_set_value (GTK_ADJUSTMENT (a), units);
 
                     GtkWidget *e = gtk_spin_button_new (GTK_ADJUSTMENT (a), 1.0 , 2);
-                    gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), e, _("Width of the rectangle to be filled"), NULL);
+                    gtk_widget_set_tooltip_text (e, _("Width of the rectangle to be filled"));
                     gtk_entry_set_width_chars (GTK_ENTRY (e), 5);
                     gtk_box_pack_start (GTK_BOX (hb), e, TRUE, TRUE, 0);
-                    gtk_signal_connect(GTK_OBJECT(a), "value_changed",
-                                       GTK_SIGNAL_FUNC(clonetiler_fill_width_changed), u);
+                    g_signal_connect(G_OBJECT(a), "value_changed",
+                                       G_CALLBACK(clonetiler_fill_width_changed), u);
                 }
                 {
                     GtkWidget *l = gtk_label_new ("");
@@ -2799,7 +2750,7 @@ clonetiler_dialog (void)
 
                 {
                     // Height spinbutton
-                    GtkObject *a = gtk_adjustment_new (0.0, -1e6, 1e6, 1.0, 10.0, 10.0);
+                    GtkObject *a = gtk_adjustment_new (0.0, -1e6, 1e6, 1.0, 10.0, 0);
                     sp_unit_selector_add_adjustment (SP_UNIT_SELECTOR (u), GTK_ADJUSTMENT (a));
 
                     double value = prefs->getDouble(prefs_path + "fillheight", 50.0);
@@ -2809,11 +2760,11 @@ clonetiler_dialog (void)
 
 
                     GtkWidget *e = gtk_spin_button_new (GTK_ADJUSTMENT (a), 1.0 , 2);
-                    gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), e, _("Height of the rectangle to be filled"), NULL);
+                    gtk_widget_set_tooltip_text (e, _("Height of the rectangle to be filled"));
                     gtk_entry_set_width_chars (GTK_ENTRY (e), 5);
                     gtk_box_pack_start (GTK_BOX (hb), e, TRUE, TRUE, 0);
-                    gtk_signal_connect(GTK_OBJECT(a), "value_changed",
-                                       GTK_SIGNAL_FUNC(clonetiler_fill_height_changed), u);
+                    g_signal_connect(G_OBJECT(a), "value_changed",
+                                       G_CALLBACK(clonetiler_fill_height_changed), u);
                 }
 
                 gtk_box_pack_start (GTK_BOX (hb), u, TRUE, TRUE, 0);
@@ -2825,9 +2776,9 @@ clonetiler_dialog (void)
             GtkWidget* radio;
             {
                 radio = gtk_radio_button_new_with_label (NULL, _("Rows, columns: "));
-                gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Create the specified number of rows and columns"), NULL);
+                gtk_widget_set_tooltip_text (radio, _("Create the specified number of rows and columns"));
                 clonetiler_table_attach (table, radio, 0.0, 1, 1);
-                gtk_signal_connect (GTK_OBJECT (radio), "toggled", GTK_SIGNAL_FUNC (clonetiler_switch_to_create), (gpointer) dlg);
+                g_signal_connect (G_OBJECT (radio), "toggled", G_CALLBACK (clonetiler_switch_to_create), (gpointer) dlg);
             }
             if (!prefs->getBool(prefs_path + "fillrect")) {
                 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE);
@@ -2835,9 +2786,9 @@ clonetiler_dialog (void)
             }
             {
                 radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), _("Width, height: "));
-                gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Fill the specified width and height with the tiling"), NULL);
+                gtk_widget_set_tooltip_text (radio, _("Fill the specified width and height with the tiling"));
                 clonetiler_table_attach (table, radio, 0.0, 2, 1);
-                gtk_signal_connect (GTK_OBJECT (radio), "toggled", GTK_SIGNAL_FUNC (clonetiler_switch_to_fill), (gpointer) dlg);
+                g_signal_connect (G_OBJECT (radio), "toggled", G_CALLBACK (clonetiler_switch_to_fill), (gpointer) dlg);
             }
             if (prefs->getBool(prefs_path + "fillrect")) {
                 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE);
@@ -2854,11 +2805,11 @@ clonetiler_dialog (void)
             GtkWidget *b  = gtk_check_button_new_with_label (_("Use saved size and position of the tile"));
             bool keepbbox = prefs->getBool(prefs_path + "keepbbox", true);
             gtk_toggle_button_set_active ((GtkToggleButton *) b, keepbbox);
-            gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("Pretend that the size and position of the tile are the same as the last time you tiled it (if any), instead of using the current size"), NULL);
+            gtk_widget_set_tooltip_text (b, _("Pretend that the size and position of the tile are the same as the last time you tiled it (if any), instead of using the current size"));
             gtk_box_pack_start (GTK_BOX (hb), b, FALSE, FALSE, 0);
 
-            gtk_signal_connect(GTK_OBJECT(b), "toggled",
-                               GTK_SIGNAL_FUNC(clonetiler_keep_bbox_toggled), NULL);
+            g_signal_connect(G_OBJECT(b), "toggled",
+                               G_CALLBACK(clonetiler_keep_bbox_toggled), NULL);
         }
 
 // Statusbar
@@ -2880,8 +2831,8 @@ clonetiler_dialog (void)
                 GtkWidget *l = gtk_label_new ("");
                 gtk_label_set_markup_with_mnemonic (GTK_LABEL(l), _(" <b>_Create</b> "));
                 gtk_container_add (GTK_CONTAINER(b), l);
-                gtk_tooltips_set_tip (tt, b, _("Create and tile the clones of the selection"), NULL);
-                gtk_signal_connect (GTK_OBJECT (b), "clicked", GTK_SIGNAL_FUNC (clonetiler_apply), NULL);
+                gtk_widget_set_tooltip_text (b, _("Create and tile the clones of the selection"));
+                g_signal_connect (G_OBJECT (b), "clicked", G_CALLBACK (clonetiler_apply), NULL);
                 gtk_box_pack_end (GTK_BOX (hb), b, FALSE, FALSE, 0);
             }
 
@@ -2896,15 +2847,15 @@ clonetiler_dialog (void)
                     //  http://www.inkscape.org/screenshots/gallery/inkscape-0.42-CVS-tiles-unclump.png
                     //  So unclumping is the process of spreading a number of objects out more evenly.
                     GtkWidget *b = gtk_button_new_with_mnemonic (_(" _Unclump "));
-                    gtk_tooltips_set_tip (tt, b, _("Spread out clones to reduce clumping; can be applied repeatedly"), NULL);
-                    gtk_signal_connect (GTK_OBJECT (b), "clicked", GTK_SIGNAL_FUNC (clonetiler_unclump), NULL);
+                    gtk_widget_set_tooltip_text (b, _("Spread out clones to reduce clumping; can be applied repeatedly"));
+                    g_signal_connect (G_OBJECT (b), "clicked", G_CALLBACK (clonetiler_unclump), NULL);
                     gtk_box_pack_end (GTK_BOX (sb), b, FALSE, FALSE, 0);
                 }
 
                 {
                     GtkWidget *b = gtk_button_new_with_mnemonic (_(" Re_move "));
-                    gtk_tooltips_set_tip (tt, b, _("Remove existing tiled clones of the selected object (siblings only)"), NULL);
-                    gtk_signal_connect (GTK_OBJECT (b), "clicked", GTK_SIGNAL_FUNC (clonetiler_remove), NULL);
+                    gtk_widget_set_tooltip_text (b, _("Remove existing tiled clones of the selected object (siblings only)"));
+                    g_signal_connect (G_OBJECT (b), "clicked", G_CALLBACK (clonetiler_remove), NULL);
                     gtk_box_pack_end (GTK_BOX (sb), b, FALSE, FALSE, 0);
                 }
 
@@ -2921,8 +2872,8 @@ clonetiler_dialog (void)
             {
                 GtkWidget *b = gtk_button_new_with_mnemonic (_(" R_eset "));
                 // TRANSLATORS: "change" is a noun here
-                gtk_tooltips_set_tip (tt, b, _("Reset all shifts, scales, rotates, opacity and color changes in the dialog to zero"), NULL);
-                gtk_signal_connect (GTK_OBJECT (b), "clicked", GTK_SIGNAL_FUNC (clonetiler_reset), NULL);
+                gtk_widget_set_tooltip_text (b, _("Reset all shifts, scales, rotates, opacity and color changes in the dialog to zero"));
+                g_signal_connect (G_OBJECT (b), "clicked", G_CALLBACK (clonetiler_reset), NULL);
                 gtk_box_pack_start (GTK_BOX (hb), b, FALSE, FALSE, 0);
             }
         }
diff --git a/src/dialogs/clonetiler.h b/src/dialogs/clonetiler.h
index bfb35cd96..899181346 100644
--- a/src/dialogs/clonetiler.h
+++ b/src/dialogs/clonetiler.h
@@ -12,7 +12,7 @@
 
 #include <glib.h>
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 void clonetiler_dialog       ( void );
 
diff --git a/src/dialogs/dialog-events.h b/src/dialogs/dialog-events.h
index 7b04d0f69..9c0a82f23 100644
--- a/src/dialogs/dialog-events.h
+++ b/src/dialogs/dialog-events.h
@@ -12,8 +12,7 @@
 #ifndef __DIALOG_EVENTS_H__
 #define __DIALOG_EVENTS_H__
 
-#include <gtk/gtkstyle.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <forward.h>
  
 /*
diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index b05f6589a..b076c0f96 100644
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
@@ -54,6 +54,7 @@
 #include "preferences.h"
 #include "verbs.h"
 #include "interface.h"
+#include "sp-root.h"
 
 #include "extension/output.h"
 #include "extension/db.h"
@@ -261,7 +262,7 @@ sp_export_spinbutton_new ( gchar const *key, float val, float min, float max,
     }
 
     if (cb)
-        gtk_signal_connect (adj, "value_changed", cb, dlg);
+        g_signal_connect (adj, "value_changed", cb, dlg);
 
     return;
 } // end of sp_export_spinbutton_new()
@@ -298,8 +299,8 @@ sp_export_dialog_area_box (GtkWidget * dlg)
         b->set_data("key", GINT_TO_POINTER(i));
         gtk_object_set_data (GTK_OBJECT (dlg), selection_names[i], b->gobj());
         togglebox->pack_start(*b, false, true, 0);
-        gtk_signal_connect ( GTK_OBJECT (b->gobj()), "clicked",
-                             GTK_SIGNAL_FUNC (sp_export_area_toggled), dlg );
+        g_signal_connect ( G_OBJECT (b->gobj()), "clicked",
+                             G_CALLBACK (sp_export_area_toggled), dlg );
     }
 
     g_signal_connect ( G_OBJECT (INKSCAPE), "change_selection",
@@ -431,13 +432,13 @@ sp_export_dialog (void)
         g_signal_connect   ( G_OBJECT (INKSCAPE), "activate_desktop",
                              G_CALLBACK (sp_transientize_callback), &wd);
 
-        gtk_signal_connect ( GTK_OBJECT (dlg), "event",
-                             GTK_SIGNAL_FUNC (sp_dialog_event_handler), dlg);
+        g_signal_connect ( G_OBJECT (dlg), "event",
+                             G_CALLBACK (sp_dialog_event_handler), dlg);
 
-        gtk_signal_connect ( GTK_OBJECT (dlg), "destroy",
+        g_signal_connect ( G_OBJECT (dlg), "destroy",
                              G_CALLBACK (sp_export_dialog_destroy), dlg);
 
-        gtk_signal_connect ( GTK_OBJECT (dlg), "delete_event",
+        g_signal_connect ( G_OBJECT (dlg), "delete_event",
                              G_CALLBACK (sp_export_dialog_delete), dlg);
 
         g_signal_connect   ( G_OBJECT (INKSCAPE), "shut_down",
@@ -449,8 +450,6 @@ sp_export_dialog (void)
         g_signal_connect   ( G_OBJECT (INKSCAPE), "dialogs_unhide",
                              G_CALLBACK (sp_dialog_unhide), dlg);
 
-        GtkTooltips *tt = gtk_tooltips_new();
-
         Gtk::VBox *vb = new Gtk::VBox(false, 3);
         vb->set_border_width(3);
         gtk_container_add (GTK_CONTAINER (dlg), GTK_WIDGET(vb->gobj()));
@@ -624,7 +623,7 @@ sp_export_dialog (void)
             gtk_widget_set_sensitive(GTK_WIDGET(be), TRUE);
             gtk_object_set_data(GTK_OBJECT(dlg), "batch_checkbox", be);
             batch_box->pack_start(*Glib::wrap(be), false, false);
-            gtk_tooltips_set_tip(tt, be, _("Export each selected object into its own PNG file, using export hints if any (caution, overwrites without asking!)"), NULL);
+            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();
             g_signal_connect(G_OBJECT(be), "toggled", GTK_SIGNAL_FUNC(batch_export_clicked), dlg);
             vb->pack_start(*batch_box);
@@ -636,7 +635,7 @@ sp_export_dialog (void)
             gtk_widget_set_sensitive(GTK_WIDGET(he), TRUE);
             gtk_object_set_data(GTK_OBJECT(dlg), "hide_checkbox", he);
             hide_box->pack_start(*Glib::wrap(he), false, false);
-            gtk_tooltips_set_tip(tt, he, _("In the exported image, hide all objects except those that are selected"), NULL);
+            gtk_widget_set_tooltip_text(he, _("In the exported image, hide all objects except those that are selected"));
             hide_box->show_all();
             vb->pack_start(*hide_box);
         }
@@ -657,9 +656,9 @@ sp_export_dialog (void)
             image_label->pack_start(*l);
 
             b->add(*image_label);
-            gtk_tooltips_set_tip (tt, GTK_WIDGET(b->gobj()), _("Export the bitmap file with these settings"), NULL);
-            gtk_signal_connect ( GTK_OBJECT (b->gobj()), "clicked",
-                                 GTK_SIGNAL_FUNC (sp_export_export_clicked), dlg );
+            gtk_widget_set_tooltip_text (GTK_WIDGET(b->gobj()), _("Export the bitmap file with these settings"));
+            g_signal_connect ( G_OBJECT (b->gobj()), "clicked",
+                                 G_CALLBACK (sp_export_export_clicked), dlg );
             bb->pack_end(*b, false, false, 0);
         }
 
@@ -784,7 +783,7 @@ sp_export_selection_modified ( Inkscape::Application */*inkscape*/,
             if ( SP_ACTIVE_DESKTOP ) {
                 SPDocument *doc;
                 doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
-                Geom::OptRect bbox = SP_ITEM(doc->root)->getBboxDesktop(SPItem::RENDERING_BBOX);
+                Geom::OptRect bbox = doc->getRoot()->getBboxDesktop(SPItem::RENDERING_BBOX);
                 if (bbox) {
                     sp_export_set_area (base, bbox->min()[Geom::X],
                                               bbox->min()[Geom::Y],
@@ -865,7 +864,7 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base)
                 /** \todo
                  * This returns wrong values if the document has a viewBox.
                  */
-                bbox = SP_ITEM(doc->root)->getBboxDesktop(SPItem::RENDERING_BBOX);
+                bbox = doc->getRoot()->getBboxDesktop(SPItem::RENDERING_BBOX);
                 /* If the drawing is valid, then we'll use it and break
                    otherwise we drop through to the page settings */
                 if (bbox) {
@@ -1501,7 +1500,7 @@ sp_export_detect_size(GtkObject * base) {
             case SELECTION_DRAWING: {
                 SPDocument *doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
 
-                Geom::OptRect bbox = SP_ITEM(doc->root)->getBboxDesktop(SPItem::RENDERING_BBOX);
+                Geom::OptRect bbox = doc->getRoot()->getBboxDesktop(SPItem::RENDERING_BBOX);
 
                 // std::cout << "Drawing " << bbox2;
                 if ( bbox && sp_export_bbox_equal(*bbox,current_bbox) ) {
diff --git a/src/dialogs/find.cpp b/src/dialogs/find.cpp
index c112b3531..62c551523 100644
--- a/src/dialogs/find.cpp
+++ b/src/dialogs/find.cpp
@@ -60,6 +60,7 @@ sp_find_dialog(){
 #include "../sp-image.h"
 #include "../sp-offset.h"
 #include <xml/repr.h>
+#include "sp-root.h"
 
 #define MIN_ONSCREEN_DISTANCE 50
 
@@ -411,7 +412,7 @@ sp_find_dialog_reset (GObject *, GObject *dlg)
 #define FIND_LABELWIDTH 80
 
 void
-sp_find_new_searchfield (GtkWidget *dlg, GtkWidget *vb, const gchar *label, const gchar *id, GtkTooltips *tt, const gchar *tip)
+sp_find_new_searchfield (GtkWidget *dlg, GtkWidget *vb, const gchar *label, const gchar *id, const gchar *tip)
 {
     GtkWidget *hb = gtk_hbox_new (FALSE, 0);
     GtkWidget *l = gtk_label_new_with_mnemonic (label);
@@ -423,7 +424,7 @@ sp_find_new_searchfield (GtkWidget *dlg, GtkWidget *vb, const gchar *label, cons
     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);
-    gtk_tooltips_set_tip (tt, tf, tip, NULL);
+    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);
 
@@ -431,10 +432,10 @@ sp_find_new_searchfield (GtkWidget *dlg, GtkWidget *vb, const gchar *label, cons
 }
 
 void
-sp_find_new_button (GtkWidget *dlg, GtkWidget *hb, const gchar *label, GtkTooltips *tt, const gchar *tip, void (*function) (GObject *, GObject *))
+sp_find_new_button (GtkWidget *dlg, GtkWidget *hb, const gchar *label, const gchar *tip, void (*function) (GObject *, GObject *))
 {
     GtkWidget *b = gtk_button_new_with_mnemonic (label);
-    gtk_tooltips_set_tip (tt, b, tip, NULL);
+    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_widget_show (b);
@@ -482,7 +483,7 @@ toggle_shapes (GtkToggleButton *tb, gpointer data)
 
 GtkWidget *
 sp_find_types_checkbox (GtkWidget *w, const gchar *data, gboolean active,
-                        GtkTooltips *tt, const gchar *tip,
+                        const gchar *tip,
                         const gchar *label,
                         void (*toggled)(GtkToggleButton *, gpointer))
 {
@@ -494,9 +495,9 @@ sp_find_types_checkbox (GtkWidget *w, const gchar *data, gboolean active,
         gtk_widget_show (b);
         gtk_toggle_button_set_active ((GtkToggleButton *) b, active);
         gtk_object_set_data (GTK_OBJECT (w), data, b);
-        gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, tip, NULL);
+        gtk_widget_set_tooltip_text (b, tip);
         if (toggled)
-            gtk_signal_connect (GTK_OBJECT (b), "toggled", GTK_SIGNAL_FUNC (toggled), w);
+            g_signal_connect (G_OBJECT (b), "toggled", G_CALLBACK (toggled), w);
         gtk_box_pack_start (GTK_BOX (hb), b, FALSE, FALSE, 0);
     }
 
@@ -505,7 +506,7 @@ sp_find_types_checkbox (GtkWidget *w, const gchar *data, gboolean active,
 
 GtkWidget *
 sp_find_types_checkbox_indented (GtkWidget *w, const gchar *data, gboolean active,
-                                 GtkTooltips *tt, const gchar *tip,
+                                 const gchar *tip,
                                  const gchar *label,
                                  void (*toggled)(GtkToggleButton *, gpointer), guint indent)
 {
@@ -519,7 +520,7 @@ sp_find_types_checkbox_indented (GtkWidget *w, const gchar *data, gboolean activ
         gtk_box_pack_start (GTK_BOX (hb), l, FALSE, FALSE, 0);
     }
 
-    GtkWidget *c = sp_find_types_checkbox (w, data, active, tt, tip, label, toggled);
+    GtkWidget *c = sp_find_types_checkbox (w, data, active, tip, label, toggled);
     gtk_box_pack_start (GTK_BOX (hb), c, FALSE, FALSE, 0);
 
     return hb;
@@ -529,8 +530,6 @@ sp_find_types_checkbox_indented (GtkWidget *w, const gchar *data, gboolean activ
 GtkWidget *
 sp_find_types ()
 {
-    GtkTooltips *tt = gtk_tooltips_new ();
-
     GtkWidget *vb = gtk_vbox_new (FALSE, 4);
     gtk_widget_show (vb);
 
@@ -546,7 +545,7 @@ sp_find_types ()
             gtk_box_pack_start (GTK_BOX (hb), l, FALSE, FALSE, 0);
         }
 
-        GtkWidget *alltypes = sp_find_types_checkbox (vb, "all", TRUE, tt, _("Search in all object types"), _("All types"), toggle_alltypes);
+        GtkWidget *alltypes = sp_find_types_checkbox (vb, "all", TRUE, _("Search in all object types"), _("All types"), toggle_alltypes);
         gtk_box_pack_start (GTK_BOX (hb), alltypes, FALSE, FALSE, 0);
 
         gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, 0);
@@ -557,7 +556,7 @@ sp_find_types ()
         gtk_widget_show (vb_all);
 
         {
-            GtkWidget *c = sp_find_types_checkbox_indented (vb, "shapes", FALSE, tt, _("Search all shapes"), _("All shapes"), toggle_shapes, 10);
+            GtkWidget *c = sp_find_types_checkbox_indented (vb, "shapes", FALSE, _("Search all shapes"), _("All shapes"), toggle_shapes, 10);
             gtk_box_pack_start (GTK_BOX (vb_all), c, FALSE, FALSE, 0);
         }
 
@@ -574,22 +573,22 @@ sp_find_types ()
             }
 
             {
-                GtkWidget *c = sp_find_types_checkbox (vb, "rects", FALSE, tt, _("Search rectangles"), _("Rectangles"), NULL);
+                GtkWidget *c = sp_find_types_checkbox (vb, "rects", FALSE, _("Search rectangles"), _("Rectangles"), NULL);
                 gtk_box_pack_start (GTK_BOX (hb), c, FALSE, FALSE, 0);
             }
 
             {
-                GtkWidget *c = sp_find_types_checkbox (vb, "ellipses", FALSE, tt, _("Search ellipses, arcs, circles"), _("Ellipses"), NULL);
+                GtkWidget *c = sp_find_types_checkbox (vb, "ellipses", FALSE, _("Search ellipses, arcs, circles"), _("Ellipses"), NULL);
                 gtk_box_pack_start (GTK_BOX (hb), c, FALSE, FALSE, 0);
             }
 
             {
-                GtkWidget *c = sp_find_types_checkbox (vb, "stars", FALSE, tt, _("Search stars and polygons"), _("Stars"), NULL);
+                GtkWidget *c = sp_find_types_checkbox (vb, "stars", FALSE, _("Search stars and polygons"), _("Stars"), NULL);
                 gtk_box_pack_start (GTK_BOX (hb), c, FALSE, FALSE, 0);
             }
 
             {
-                GtkWidget *c = sp_find_types_checkbox (vb, "spirals", FALSE, tt, _("Search spirals"), _("Spirals"), NULL);
+                GtkWidget *c = sp_find_types_checkbox (vb, "spirals", FALSE, _("Search spirals"), _("Spirals"), NULL);
                 gtk_box_pack_start (GTK_BOX (hb), c, FALSE, FALSE, 0);
             }
 
@@ -602,34 +601,34 @@ sp_find_types ()
         {
             // TRANSLATORS: polyline is a set of connected straight line segments
             // http://www.w3.org/TR/SVG11/shapes.html#PolylineElement
-            GtkWidget *c = sp_find_types_checkbox_indented (vb, "paths", TRUE, tt, _("Search paths, lines, polylines"), _("Paths"), NULL, 10);
+            GtkWidget *c = sp_find_types_checkbox_indented (vb, "paths", TRUE, _("Search paths, lines, polylines"), _("Paths"), NULL, 10);
             gtk_box_pack_start (GTK_BOX (vb_all), c, FALSE, FALSE, 0);
         }
 
         {
-            GtkWidget *c = sp_find_types_checkbox_indented (vb, "texts", TRUE, tt, _("Search text objects"), _("Texts"), NULL, 10);
+            GtkWidget *c = sp_find_types_checkbox_indented (vb, "texts", TRUE, _("Search text objects"), _("Texts"), NULL, 10);
             gtk_box_pack_start (GTK_BOX (vb_all), c, FALSE, FALSE, 0);
         }
 
         {
-            GtkWidget *c = sp_find_types_checkbox_indented (vb, "groups", TRUE, tt, _("Search groups"), _("Groups"), NULL, 10);
+            GtkWidget *c = sp_find_types_checkbox_indented (vb, "groups", TRUE, _("Search groups"), _("Groups"), NULL, 10);
             gtk_box_pack_start (GTK_BOX (vb_all), c, FALSE, FALSE, 0);
         }
 
         {
-            GtkWidget *c = sp_find_types_checkbox_indented (vb, "clones", TRUE, tt, _("Search clones"),
+            GtkWidget *c = sp_find_types_checkbox_indented (vb, "clones", TRUE, _("Search clones"),
                                                             //TRANSLATORS: "Clones" is a noun indicating type of object to find
                                                             C_("Find dialog","Clones"), NULL, 10);
             gtk_box_pack_start (GTK_BOX (vb_all), c, FALSE, FALSE, 0);
         }
 
         {
-            GtkWidget *c = sp_find_types_checkbox_indented (vb, "images", TRUE, tt, _("Search images"), _("Images"), NULL, 10);
+            GtkWidget *c = sp_find_types_checkbox_indented (vb, "images", TRUE, _("Search images"), _("Images"), NULL, 10);
             gtk_box_pack_start (GTK_BOX (vb_all), c, FALSE, FALSE, 0);
         }
 
         {
-            GtkWidget *c = sp_find_types_checkbox_indented (vb, "offsets", TRUE, tt, _("Search offset objects"), _("Offsets"), NULL, 10);
+            GtkWidget *c = sp_find_types_checkbox_indented (vb, "offsets", TRUE, _("Search offset objects"), _("Offsets"), NULL, 10);
             gtk_box_pack_start (GTK_BOX (vb_all), c, FALSE, FALSE, 0);
         }
 
@@ -677,27 +676,25 @@ sp_find_dialog_old (void)
         wd.stop = 0;
         g_signal_connect   ( G_OBJECT (INKSCAPE), "activate_desktop", G_CALLBACK (sp_transientize_callback), &wd );
 
-        gtk_signal_connect ( GTK_OBJECT (dlg), "event", GTK_SIGNAL_FUNC (sp_dialog_event_handler), dlg);
+        g_signal_connect ( G_OBJECT (dlg), "event", G_CALLBACK (sp_dialog_event_handler), dlg);
 
-        gtk_signal_connect ( GTK_OBJECT (dlg), "destroy", G_CALLBACK (sp_find_dialog_destroy), NULL );
-        gtk_signal_connect ( GTK_OBJECT (dlg), "delete_event", G_CALLBACK (sp_find_dialog_delete), dlg);
+        g_signal_connect ( G_OBJECT (dlg), "destroy", G_CALLBACK (sp_find_dialog_destroy), NULL );
+        g_signal_connect ( G_OBJECT (dlg), "delete_event", G_CALLBACK (sp_find_dialog_delete), dlg);
         g_signal_connect   ( G_OBJECT (INKSCAPE), "shut_down", G_CALLBACK (sp_find_dialog_delete), dlg);
 
         g_signal_connect   ( G_OBJECT (INKSCAPE), "dialogs_hide", G_CALLBACK (sp_dialog_hide), dlg);
         g_signal_connect   ( G_OBJECT (INKSCAPE), "dialogs_unhide", G_CALLBACK (sp_dialog_unhide), dlg);
 
-        GtkTooltips *tt = gtk_tooltips_new ();
-
         gtk_container_set_border_width (GTK_CONTAINER (dlg), 4);
 
         /* Toplevel vbox */
         GtkWidget *vb = gtk_vbox_new (FALSE, 0);
         gtk_container_add (GTK_CONTAINER (dlg), vb);
 
-        sp_find_new_searchfield (dlg, vb, _("_Text:"), "text", tt, _("Find objects by their text content (exact or partial match)"));
-        sp_find_new_searchfield (dlg, vb, _("_ID:"), "id", tt, _("Find objects by the value of the id attribute (exact or partial match)"));
-        sp_find_new_searchfield (dlg, vb, _("_Style:"), "style", tt, _("Find objects by the value of the style attribute (exact or partial match)"));
-        sp_find_new_searchfield (dlg, vb, _("_Attribute:"), "attr", tt ,_("Find objects by the name of an attribute (exact or partial match)"));
+        sp_find_new_searchfield (dlg, vb, _("_Text:"), "text", _("Find objects by their text content (exact or partial match)"));
+        sp_find_new_searchfield (dlg, vb, _("_ID:"), "id", _("Find objects by the value of the id attribute (exact or partial match)"));
+        sp_find_new_searchfield (dlg, vb, _("_Style:"), "style", _("Find objects by the value of the style attribute (exact or partial match)"));
+        sp_find_new_searchfield (dlg, vb, _("_Attribute:"), "attr", _("Find objects by the name of an attribute (exact or partial match)"));
 
         gtk_widget_show_all (vb);
 
@@ -715,7 +712,7 @@ sp_find_dialog_old (void)
             gtk_widget_show (b);
             gtk_toggle_button_set_active ((GtkToggleButton *) b, FALSE);
             gtk_object_set_data (GTK_OBJECT (dlg), "inselection", b);
-            gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("Limit search to the current selection"), NULL);
+            gtk_widget_set_tooltip_text (b, _("Limit search to the current selection"));
             gtk_box_pack_start (GTK_BOX (vb), b, FALSE, FALSE, 0);
             }
 
@@ -724,7 +721,7 @@ sp_find_dialog_old (void)
             gtk_widget_show (b);
             gtk_toggle_button_set_active ((GtkToggleButton *) b, FALSE);
             gtk_object_set_data (GTK_OBJECT (dlg), "inlayer", b);
-            gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("Limit search to the current layer"), NULL);
+            gtk_widget_set_tooltip_text (b, _("Limit search to the current layer"));
             gtk_box_pack_start (GTK_BOX (vb), b, FALSE, FALSE, 0);
             }
 
@@ -733,7 +730,7 @@ sp_find_dialog_old (void)
             gtk_widget_show (b);
             gtk_toggle_button_set_active ((GtkToggleButton *) b, FALSE);
             gtk_object_set_data (GTK_OBJECT (dlg), "includehidden", b);
-            gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("Include hidden objects in search"), NULL);
+            gtk_widget_set_tooltip_text (b, _("Include hidden objects in search"));
             gtk_box_pack_start (GTK_BOX (vb), b, FALSE, FALSE, 0);
             }
 
@@ -742,7 +739,7 @@ sp_find_dialog_old (void)
             gtk_widget_show (b);
             gtk_toggle_button_set_active ((GtkToggleButton *) b, FALSE);
             gtk_object_set_data (GTK_OBJECT (dlg), "includelocked", b);
-            gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, _("Include locked objects in search"), NULL);
+            gtk_widget_set_tooltip_text (b, _("Include locked objects in search"));
             gtk_box_pack_start (GTK_BOX (vb), b, FALSE, FALSE, 0);
             }
         }
@@ -753,8 +750,8 @@ sp_find_dialog_old (void)
             gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, 0);
 
             // TRANSLATORS: "Clear" is a verb here
-            sp_find_new_button (dlg, hb, _("_Clear"), tt, _("Clear values"), sp_find_dialog_reset);
-            sp_find_new_button (dlg, hb, _("_Find"), tt, _("Select objects matching all of the fields you filled in"), sp_find_dialog_find);
+            sp_find_new_button (dlg, hb, _("_Clear"), _("Clear values"), sp_find_dialog_reset);
+            sp_find_new_button (dlg, hb, _("_Find"), _("Select objects matching all of the fields you filled in"), sp_find_dialog_find);
         }
     }
 
diff --git a/src/dialogs/find.h b/src/dialogs/find.h
index fe5861a73..219c36bf2 100644
--- a/src/dialogs/find.h
+++ b/src/dialogs/find.h
@@ -12,7 +12,7 @@
 #ifndef SEEN_FIND_H
 #define SEEN_FIND_H
 
-#include <gtk/gtkstyle.h>
+#include <gtk/gtk.h>
 
 void sp_find_dialog();
 
diff --git a/src/dialogs/item-properties.cpp b/src/dialogs/item-properties.cpp
index 94b8b1e98..cd56c2da4 100644
--- a/src/dialogs/item-properties.cpp
+++ b/src/dialogs/item-properties.cpp
@@ -16,16 +16,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkcheckbutton.h>
 #include <gtk/gtk.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkexpander.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktooltips.h>
 
 #include "../desktop-handles.h"
 #include "dialog-events.h"
@@ -98,15 +89,13 @@ sp_item_widget_new (void)
     GtkWidget *spw, *vb, *t, *cb, *l, *f, *tf, *pb, *int_expander, *int_label;
     GtkTextBuffer *desc_buffer;
 
-    GtkTooltips *tt = gtk_tooltips_new();
-
     /* Create container widget */
     spw = sp_widget_new_global (INKSCAPE);
-    gtk_signal_connect ( GTK_OBJECT (spw), "modify_selection",
-                         GTK_SIGNAL_FUNC (sp_item_widget_modify_selection),
+    g_signal_connect ( G_OBJECT (spw), "modify_selection",
+                         G_CALLBACK (sp_item_widget_modify_selection),
                          spw );
-    gtk_signal_connect ( GTK_OBJECT (spw), "change_selection",
-                         GTK_SIGNAL_FUNC (sp_item_widget_change_selection),
+    g_signal_connect ( G_OBJECT (spw), "change_selection",
+                         G_CALLBACK (sp_item_widget_change_selection),
                          spw );
 
     vb = gtk_vbox_new (FALSE, 0);
@@ -129,7 +118,7 @@ sp_item_widget_new (void)
 
     /* Create the entry box for the object id */
     tf = gtk_entry_new ();
-    gtk_tooltips_set_tip (tt, tf, _("The id= attribute (only letters, digits, and the characters .-_: allowed)"), NULL);
+    gtk_widget_set_tooltip_text (tf, _("The id= attribute (only letters, digits, and the characters .-_: allowed)"));
     gtk_entry_set_max_length (GTK_ENTRY (tf), 64);
     gtk_table_attach ( GTK_TABLE (t), tf, 1, 2, 0, 1,
                        (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
@@ -147,8 +136,8 @@ sp_item_widget_new (void)
     gtk_table_attach ( GTK_TABLE (t), pb, 2, 3, 0, 1,
                        (GtkAttachOptions)( GTK_SHRINK | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
-    gtk_signal_connect ( GTK_OBJECT (pb), "clicked",
-                         GTK_SIGNAL_FUNC (sp_item_widget_label_changed),
+    g_signal_connect ( G_OBJECT (pb), "clicked",
+                         G_CALLBACK (sp_item_widget_label_changed),
                          spw );
 
     /* Create the label for the object label */
@@ -161,7 +150,7 @@ sp_item_widget_new (void)
 
     /* Create the entry box for the object label */
     tf = gtk_entry_new ();
-    gtk_tooltips_set_tip (tt, tf, _("A freeform label for the object"), NULL);
+    gtk_widget_set_tooltip_text (tf, _("A freeform label for the object"));
     gtk_entry_set_max_length (GTK_ENTRY (tf), 256);
     gtk_table_attach ( GTK_TABLE (t), tf, 1, 2, 1, 2,
                        (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
@@ -223,7 +212,7 @@ sp_item_widget_new (void)
 
     /* Hide */
     cb = gtk_check_button_new_with_mnemonic (_("_Hide"));
-    gtk_tooltips_set_tip (tt, cb, _("Check to make the object invisible"), NULL);
+    gtk_widget_set_tooltip_text (cb, _("Check to make the object invisible"));
     gtk_table_attach ( GTK_TABLE (t), cb, 0, 1, 0, 1,
                        (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
@@ -233,12 +222,12 @@ sp_item_widget_new (void)
     /* Lock */
     // TRANSLATORS: "Lock" is a verb here
     cb = gtk_check_button_new_with_mnemonic (_("L_ock"));
-    gtk_tooltips_set_tip (tt, cb, _("Check to make the object insensitive (not selectable by mouse)"), NULL);
+    gtk_widget_set_tooltip_text (cb, _("Check to make the object insensitive (not selectable by mouse)"));
     gtk_table_attach ( GTK_TABLE (t), cb, 1, 2, 0, 1,
                        (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
-    gtk_signal_connect ( GTK_OBJECT (cb), "toggled",
-                         GTK_SIGNAL_FUNC (sp_item_widget_sensitivity_toggled),
+    g_signal_connect ( G_OBJECT (cb), "toggled",
+                         G_CALLBACK (sp_item_widget_sensitivity_toggled),
                          spw );
     gtk_object_set_data (GTK_OBJECT (spw), "sensitive", cb);
 
@@ -536,9 +525,9 @@ sp_item_dialog (void)
         wd.stop = 0;
 
         g_signal_connect   ( G_OBJECT (INKSCAPE), "activate_desktop", G_CALLBACK (sp_transientize_callback), &wd);
-        gtk_signal_connect ( GTK_OBJECT (dlg), "event", GTK_SIGNAL_FUNC (sp_dialog_event_handler), dlg);
-        gtk_signal_connect ( GTK_OBJECT (dlg), "destroy", G_CALLBACK (sp_item_dialog_destroy), dlg);
-        gtk_signal_connect ( GTK_OBJECT (dlg), "delete_event", G_CALLBACK (sp_item_dialog_delete), dlg);
+        g_signal_connect ( G_OBJECT (dlg), "event", G_CALLBACK (sp_dialog_event_handler), dlg);
+        g_signal_connect ( G_OBJECT (dlg), "destroy", G_CALLBACK (sp_item_dialog_destroy), dlg);
+        g_signal_connect ( G_OBJECT (dlg), "delete_event", G_CALLBACK (sp_item_dialog_delete), dlg);
         g_signal_connect   ( G_OBJECT (INKSCAPE), "shut_down", G_CALLBACK (sp_item_dialog_delete), dlg);
         g_signal_connect   ( G_OBJECT (INKSCAPE), "dialogs_hide", G_CALLBACK (sp_dialog_hide), dlg);
         g_signal_connect   ( G_OBJECT (INKSCAPE), "dialogs_unhide", G_CALLBACK (sp_dialog_unhide), dlg);
diff --git a/src/dialogs/item-properties.h b/src/dialogs/item-properties.h
index bc04608bc..7d57ae5e8 100644
--- a/src/dialogs/item-properties.h
+++ b/src/dialogs/item-properties.h
@@ -12,7 +12,7 @@
 #define SEEN_DIALOGS_ITEM_PROPERTIES_H
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "../forward.h"
 
 GtkWidget *sp_item_widget_new (void);
diff --git a/src/dialogs/object-attributes.h b/src/dialogs/object-attributes.h
index ef84708c0..b490ebfa1 100644
--- a/src/dialogs/object-attributes.h
+++ b/src/dialogs/object-attributes.h
@@ -13,7 +13,7 @@
 #define SEEN_DIALOGS_OBJECT_ATTRIBUTES_H
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "../forward.h"
 
 void sp_object_attributes_dialog (SPObject *object, const gchar *tag);
diff --git a/src/dialogs/spellcheck.cpp b/src/dialogs/spellcheck.cpp
index f72612420..1d475a5c3 100644
--- a/src/dialogs/spellcheck.cpp
+++ b/src/dialogs/spellcheck.cpp
@@ -40,6 +40,7 @@
 #include "display/canvas-bpath.h"
 #include "display/curve.h"
 #include "document-undo.h"
+#include "sp-root.h"
 
 #ifdef HAVE_ASPELL
 #include <aspell.h>
@@ -184,10 +185,10 @@ static gboolean sp_spellcheck_dialog_delete(GtkObject *, GdkEvent *, gpointer /*
 }
 
 void
-sp_spellcheck_new_button (GtkWidget *dlg, GtkWidget *hb, const gchar *label, GtkTooltips *tt, const gchar *tip, void (*function) (GObject *, GObject *), const gchar *cookie)
+sp_spellcheck_new_button (GtkWidget *dlg, GtkWidget *hb, const gchar *label, const gchar *tip, void (*function) (GObject *, GObject *), const gchar *cookie)
 {
     GtkWidget *b = gtk_button_new_with_mnemonic (label);
-    gtk_tooltips_set_tip (tt, b, tip, NULL);
+    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);
@@ -916,17 +917,15 @@ sp_spellcheck_dialog (void)
         g_signal_connect( G_OBJECT(INKSCAPE), "deactivate_desktop", G_CALLBACK( spellcheck_desktop_deactivated ), NULL);
 
 
-        gtk_signal_connect ( GTK_OBJECT (dlg), "event", GTK_SIGNAL_FUNC (sp_dialog_event_handler), dlg);
+        g_signal_connect ( G_OBJECT (dlg), "event", G_CALLBACK (sp_dialog_event_handler), dlg);
 
-        gtk_signal_connect ( GTK_OBJECT (dlg), "destroy", G_CALLBACK (sp_spellcheck_dialog_destroy), NULL );
-        gtk_signal_connect ( GTK_OBJECT (dlg), "delete_event", G_CALLBACK (sp_spellcheck_dialog_delete), dlg);
+        g_signal_connect ( G_OBJECT (dlg), "destroy", G_CALLBACK (sp_spellcheck_dialog_destroy), NULL );
+        g_signal_connect ( G_OBJECT (dlg), "delete_event", G_CALLBACK (sp_spellcheck_dialog_delete), dlg);
         g_signal_connect   ( G_OBJECT (INKSCAPE), "shut_down", G_CALLBACK (sp_spellcheck_dialog_delete), dlg);
 
         g_signal_connect   ( G_OBJECT (INKSCAPE), "dialogs_hide", G_CALLBACK (sp_dialog_hide), dlg);
         g_signal_connect   ( G_OBJECT (INKSCAPE), "dialogs_unhide", G_CALLBACK (sp_dialog_unhide), dlg);
 
-        GtkTooltips *tt = gtk_tooltips_new ();
-
         gtk_container_set_border_width (GTK_CONTAINER (dlg), 4);
 
         /* Toplevel vbox */
@@ -970,18 +969,18 @@ sp_spellcheck_dialog (void)
 
         {
             GtkWidget *hb = gtk_hbox_new (FALSE, 0);
-            sp_spellcheck_new_button (dlg, hb, _("_Accept"), tt, _("Accept the chosen suggestion"),
+            sp_spellcheck_new_button (dlg, hb, _("_Accept"), _("Accept the chosen suggestion"),
                                       sp_spellcheck_accept, "b_accept");
-            sp_spellcheck_new_button (dlg, hb, _("_Ignore once"), tt, _("Ignore this word only once"),
+            sp_spellcheck_new_button (dlg, hb, _("_Ignore once"), _("Ignore this word only once"),
                                       sp_spellcheck_ignore_once, "b_ignore_once");
-            sp_spellcheck_new_button (dlg, hb, _("_Ignore"), tt, _("Ignore this word in this session"),
+            sp_spellcheck_new_button (dlg, hb, _("_Ignore"), _("Ignore this word in this session"),
                                       sp_spellcheck_ignore, "b_ignore");
             gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, 0);
         }
 
         {
             GtkWidget *hb = gtk_hbox_new (FALSE, 0);
-            sp_spellcheck_new_button (dlg, hb, _("A_dd to dictionary:"), tt, _("Add this word to the chosen dictionary"),
+            sp_spellcheck_new_button (dlg, hb, _("A_dd to dictionary:"), _("Add this word to the chosen dictionary"),
                                       sp_spellcheck_add, "b_add");
             GtkComboBox *cbox = GTK_COMBO_BOX (gtk_combo_box_new_text());
             gtk_combo_box_append_text (cbox,  _lang);
@@ -1005,9 +1004,9 @@ sp_spellcheck_dialog (void)
 
         {
             GtkWidget *hb = gtk_hbox_new (FALSE, 0);
-            sp_spellcheck_new_button (dlg, hb, _("_Stop"), tt, _("Stop the check"),
+            sp_spellcheck_new_button (dlg, hb, _("_Stop"), _("Stop the check"),
                                       sp_spellcheck_stop, "b_stop");
-            sp_spellcheck_new_button (dlg, hb, _("_Start"), tt, _("Start the check"),
+            sp_spellcheck_new_button (dlg, hb, _("_Start"), _("Start the check"),
                                       sp_spellcheck_start, "b_start");
             gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, 0);
         }
diff --git a/src/dialogs/spellcheck.h b/src/dialogs/spellcheck.h
index b941788ca..fe80be2cb 100644
--- a/src/dialogs/spellcheck.h
+++ b/src/dialogs/spellcheck.h
@@ -12,7 +12,7 @@
 #ifndef SEEN_SPELLCHECK_H
 #define SEEN_SPELLCHECK_H
 
-#include <gtk/gtkstyle.h>
+#include <gtk/gtk.h>
 
 void sp_spellcheck_dialog();
 
diff --git a/src/dialogs/text-edit.cpp b/src/dialogs/text-edit.cpp
index 7cec16cd7..81bd0f5d2 100644
--- a/src/dialogs/text-edit.cpp
+++ b/src/dialogs/text-edit.cpp
@@ -177,10 +177,10 @@ sp_text_edit_dialog (void)
         wd.stop = 0;
         g_signal_connect ( G_OBJECT (INKSCAPE), "activate_desktop", G_CALLBACK (sp_transientize_callback), &wd );
 
-        gtk_signal_connect ( GTK_OBJECT (dlg), "event", GTK_SIGNAL_FUNC (sp_dialog_event_handler), dlg );
+        g_signal_connect ( G_OBJECT (dlg), "event", G_CALLBACK (sp_dialog_event_handler), dlg );
 
-        gtk_signal_connect ( GTK_OBJECT (dlg), "destroy", G_CALLBACK (sp_text_edit_dialog_destroy), dlg );
-        gtk_signal_connect ( GTK_OBJECT (dlg), "delete_event", G_CALLBACK (sp_text_edit_dialog_delete), dlg );
+        g_signal_connect ( G_OBJECT (dlg), "destroy", G_CALLBACK (sp_text_edit_dialog_destroy), dlg );
+        g_signal_connect ( G_OBJECT (dlg), "delete_event", G_CALLBACK (sp_text_edit_dialog_delete), dlg );
         g_signal_connect ( G_OBJECT (INKSCAPE), "shut_down", G_CALLBACK (sp_text_edit_dialog_delete), dlg );
 
         g_signal_connect ( G_OBJECT (INKSCAPE), "dialogs_hide", G_CALLBACK (sp_dialog_hide), dlg );
@@ -188,8 +188,6 @@ sp_text_edit_dialog (void)
 
         gtk_window_set_policy (GTK_WINDOW (dlg), TRUE, TRUE, FALSE);
 
-        GtkTooltips *tt = gtk_tooltips_new();
-
         // box containing the notebook and the bottom buttons
         GtkWidget *mainvb = gtk_vbox_new (FALSE, 0);
         gtk_container_add (GTK_CONTAINER (dlg), mainvb);
@@ -203,7 +201,7 @@ sp_text_edit_dialog (void)
 
         // Font tab
         {
-            GtkWidget *l = gtk_label_new (_("Font"));
+            GtkWidget *l = gtk_label_new_with_mnemonic (_("_Font"));
             GtkWidget *vb = gtk_vbox_new (FALSE, VB_MARGIN);
             gtk_container_set_border_width (GTK_CONTAINER (vb), VB_MARGIN);
             gtk_notebook_append_page (GTK_NOTEBOOK (nb), vb, l);
@@ -240,7 +238,7 @@ sp_text_edit_dialog (void)
                         // TODO - replace with Inkscape-specific call
                         GtkWidget *px = gtk_image_new_from_stock ( GTK_STOCK_JUSTIFY_LEFT, GTK_ICON_SIZE_LARGE_TOOLBAR );
                         GtkWidget *b = group = gtk_radio_button_new (NULL);
-                        gtk_tooltips_set_tip (tt, b, _("Align lines left"), NULL);
+                        gtk_widget_set_tooltip_text (b, _("Align lines left"));
                         gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE);
                         g_signal_connect ( G_OBJECT (b), "toggled", G_CALLBACK (sp_text_edit_dialog_any_toggled), dlg);
                         gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE );
@@ -255,7 +253,7 @@ sp_text_edit_dialog (void)
                         GtkWidget *px = gtk_image_new_from_stock ( GTK_STOCK_JUSTIFY_CENTER, GTK_ICON_SIZE_LARGE_TOOLBAR );
                         GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group)));
                         /* TRANSLATORS: `Center' here is a verb. */
-                        gtk_tooltips_set_tip (tt, b, _("Center lines"), NULL);
+                        gtk_widget_set_tooltip_text (b, _("Center lines"));
                         gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE);
                         g_signal_connect ( G_OBJECT (b), "toggled", G_CALLBACK (sp_text_edit_dialog_any_toggled), dlg );
                         gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE);
@@ -269,7 +267,7 @@ sp_text_edit_dialog (void)
                         // TODO - replace with Inkscape-specific call
                         GtkWidget *px = gtk_image_new_from_stock ( GTK_STOCK_JUSTIFY_RIGHT, GTK_ICON_SIZE_LARGE_TOOLBAR );
                         GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group)));
-                        gtk_tooltips_set_tip (tt, b, _("Align lines right"), NULL);
+                        gtk_widget_set_tooltip_text (b, _("Align lines right"));
                         gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE);
                         g_signal_connect ( G_OBJECT (b), "toggled", G_CALLBACK (sp_text_edit_dialog_any_toggled), dlg );
                         gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE);
@@ -283,7 +281,7 @@ sp_text_edit_dialog (void)
                         // TODO - replace with Inkscape-specific call
                         GtkWidget *px = gtk_image_new_from_stock ( GTK_STOCK_JUSTIFY_FILL, GTK_ICON_SIZE_LARGE_TOOLBAR );
                         GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group)));
-                        gtk_tooltips_set_tip (tt, b, _("Justify lines"), NULL);
+                        gtk_widget_set_tooltip_text (b, _("Justify lines"));
                         gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE);
                         g_signal_connect ( G_OBJECT (b), "toggled", G_CALLBACK (sp_text_edit_dialog_any_toggled), dlg );
                         gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE);
@@ -305,7 +303,7 @@ sp_text_edit_dialog (void)
                         GtkWidget *px = sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR,
                                                       INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_HORIZONTAL );
                         GtkWidget *b = group = gtk_radio_button_new (NULL);
-                        gtk_tooltips_set_tip (tt, b, _("Horizontal text"), NULL);
+                        gtk_widget_set_tooltip_text (b, _("Horizontal text"));
                         gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE);
                         g_signal_connect ( G_OBJECT (b), "toggled", G_CALLBACK (sp_text_edit_dialog_any_toggled), dlg );
                         gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE);
@@ -319,7 +317,7 @@ sp_text_edit_dialog (void)
                         GtkWidget *px = sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR,
                                                       INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_VERTICAL );
                         GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group)));
-                        gtk_tooltips_set_tip (tt, b, _("Vertical text"), NULL);
+                        gtk_widget_set_tooltip_text (b, _("Vertical text"));
                         gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE);
                         g_signal_connect ( G_OBJECT (b), "toggled", G_CALLBACK (sp_text_edit_dialog_any_toggled), dlg );
                         gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE);
@@ -330,7 +328,7 @@ sp_text_edit_dialog (void)
 
                     gtk_box_pack_start (GTK_BOX (l_vb), row, FALSE, FALSE, 0);
                 }
-
+				
                 {
                     GtkWidget *row = gtk_hbox_new (FALSE, VB_MARGIN);
 
@@ -343,7 +341,6 @@ sp_text_edit_dialog (void)
 
                 {
                     GtkWidget *row = gtk_hbox_new (FALSE, VB_MARGIN);
-
                     GtkWidget *c = gtk_combo_new ();
                     gtk_combo_set_value_in_list ((GtkCombo *) c, FALSE, FALSE);
                     gtk_combo_set_use_arrows ((GtkCombo *) c, TRUE);
@@ -359,7 +356,7 @@ sp_text_edit_dialog (void)
                         gtk_combo_set_popdown_strings ((GtkCombo *) c, sl);
                         g_list_free (sl);
                     }
-
+                    
                     g_signal_connect ( (GObject *) ((GtkCombo *) c)->entry,
                                        "changed",
                                        (GCallback) sp_text_edit_dialog_line_spacing_changed,
@@ -383,7 +380,7 @@ sp_text_edit_dialog (void)
 
         // Text tab
         {
-            GtkWidget *l = gtk_label_new (_("Text"));
+            GtkWidget *l = gtk_label_new_with_mnemonic (_("_Text"));
             GtkWidget *vb = gtk_vbox_new (FALSE, VB_MARGIN);
             gtk_container_set_border_width (GTK_CONTAINER (vb), VB_MARGIN);
             gtk_notebook_append_page (GTK_NOTEBOOK (nb), vb, l);
@@ -430,7 +427,7 @@ sp_text_edit_dialog (void)
         gtk_box_pack_start (GTK_BOX (mainvb), hb, FALSE, FALSE, 0);
 
         {
-            GtkWidget *b = gtk_button_new_with_label (_("Set as default"));
+            GtkWidget *b = gtk_button_new_with_mnemonic (_("Set as _default"));
             g_signal_connect ( G_OBJECT (b), "clicked",
                                G_CALLBACK (sp_text_edit_dialog_set_default),
                                dlg );
@@ -447,7 +444,8 @@ sp_text_edit_dialog (void)
 
         {
             GtkWidget *b = gtk_button_new_from_stock (GTK_STOCK_APPLY);
-            GTK_WIDGET_SET_FLAGS (b, GTK_CAN_DEFAULT | GTK_HAS_DEFAULT);
+            gtk_widget_set_can_default (b, TRUE);
+            gtk_widget_grab_default (b);
             g_signal_connect ( G_OBJECT (b), "clicked",
                                G_CALLBACK (sp_text_edit_dialog_apply), dlg );
             gtk_box_pack_end ( GTK_BOX (hb), b, FALSE, FALSE, 0 );
diff --git a/src/dialogs/xml-tree.cpp b/src/dialogs/xml-tree.cpp
index ddb419dcd..c50c07e80 100644
--- a/src/dialogs/xml-tree.cpp
+++ b/src/dialogs/xml-tree.cpp
@@ -66,7 +66,6 @@ static Inkscape::MessageStack *_message_stack = NULL;
 static Inkscape::MessageContext *_message_context = NULL;
 static sigc::connection _message_changed_connection;
 
-static GtkTooltips *tooltips = NULL;
 static GtkEditable *attr_name = NULL;
 static GtkTextView *attr_value = NULL;
 static SPXMLViewTree *tree = NULL;
@@ -194,9 +193,6 @@ void sp_xml_tree_dialog()
         GtkWidget *text_container, *attr_container, *attr_subpaned_container, *box2;
         GtkWidget *set_attr;
 
-        tooltips = gtk_tooltips_new();
-        gtk_tooltips_enable(tooltips);
-
         dlg = sp_window_new("", TRUE);
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         if (x == -1000 || y == -1000) {
@@ -225,10 +221,10 @@ void sp_xml_tree_dialog()
         wd.stop = 0;
         g_signal_connect  ( G_OBJECT(INKSCAPE), "activate_desktop", G_CALLBACK(sp_transientize_callback), &wd );
 
-        gtk_signal_connect( GTK_OBJECT(dlg), "event", GTK_SIGNAL_FUNC(sp_dialog_event_handler), dlg );
+        g_signal_connect( G_OBJECT(dlg), "event", G_CALLBACK(sp_dialog_event_handler), dlg );
 
-        gtk_signal_connect( GTK_OBJECT(dlg), "destroy", G_CALLBACK(on_destroy), dlg);
-        gtk_signal_connect( GTK_OBJECT(dlg), "delete_event", G_CALLBACK(on_delete), dlg);
+        g_signal_connect( G_OBJECT(dlg), "destroy", G_CALLBACK(on_destroy), dlg);
+        g_signal_connect( G_OBJECT(dlg), "delete_event", G_CALLBACK(on_delete), dlg);
         g_signal_connect  ( G_OBJECT(INKSCAPE), "shut_down", G_CALLBACK(on_delete), dlg);
 
         g_signal_connect  ( G_OBJECT(INKSCAPE), "dialogs_hide", G_CALLBACK(sp_dialog_hide), dlg);
@@ -267,8 +263,8 @@ void sp_xml_tree_dialog()
         gtk_paned_pack1(GTK_PANED(paned), box, FALSE, FALSE);
 
         tree = SP_XMLVIEW_TREE(sp_xmlview_tree_new(NULL, NULL, NULL));
-        gtk_tooltips_set_tip( tooltips, GTK_WIDGET(tree),
-                               _("Drag to reorder nodes"), NULL );
+        gtk_widget_set_tooltip_text( GTK_WIDGET(tree),
+                               _("Drag to reorder nodes") );
 
         g_signal_connect( G_OBJECT(tree), "tree_select_row",
                            G_CALLBACK(on_tree_select_row), NULL );
@@ -495,19 +491,19 @@ void sp_xml_tree_dialog()
                              FALSE, TRUE, 0);
 
         attr_name = GTK_EDITABLE(gtk_entry_new());
-        gtk_tooltips_set_tip( tooltips, GTK_WIDGET(attr_name),
+        gtk_widget_set_tooltip_text( GTK_WIDGET(attr_name),
                                // TRANSLATORS: "Attribute" is a noun here
-                               _("Attribute name"), NULL );
+                               _("Attribute name") );
 
-        gtk_signal_connect( GTK_OBJECT(attributes), "select_row",
+        g_signal_connect( G_OBJECT(attributes), "select_row",
                             (GCallback) on_attr_select_row_set_name_content,
                              attr_name);
 
-        gtk_signal_connect( GTK_OBJECT(attributes), "unselect_row",
+        g_signal_connect( G_OBJECT(attributes), "unselect_row",
                             (GCallback) on_attr_unselect_row_clear_text,
                              attr_name);
 
-        gtk_signal_connect( GTK_OBJECT(tree), "tree_unselect_row",
+        g_signal_connect( G_OBJECT(tree), "tree_unselect_row",
                             (GCallback) on_tree_unselect_row_clear_text,
                              attr_name);
 
@@ -515,16 +511,16 @@ void sp_xml_tree_dialog()
                              TRUE, TRUE, 0);
 
         set_attr = gtk_button_new();
-        gtk_tooltips_set_tip( tooltips, GTK_WIDGET(set_attr),
+        gtk_widget_set_tooltip_text( GTK_WIDGET(set_attr),
                                // TRANSLATORS: "Set" is a verb here
-                               _("Set attribute"), NULL );
+                               _("Set attribute") );
         // TRANSLATORS: "Set" is a verb here
         GtkWidget *set_label = gtk_label_new(_("Set"));
         gtk_container_add(GTK_CONTAINER(set_attr), set_label);
 
-        gtk_signal_connect( GTK_OBJECT(set_attr), "clicked",
+        g_signal_connect( G_OBJECT(set_attr), "clicked",
                             (GCallback) cmd_set_attr, NULL);
-        gtk_signal_connect( GTK_OBJECT(attr_name), "changed",
+        g_signal_connect( G_OBJECT(attr_name), "changed",
                    (GCallback) on_editable_changed_enable_if_valid_xml_name,
                     set_attr );
         gtk_widget_set_sensitive(GTK_WIDGET(set_attr), FALSE);
@@ -540,16 +536,16 @@ void sp_xml_tree_dialog()
 
         attr_value =(GtkTextView *) gtk_text_view_new();
         gtk_text_view_set_wrap_mode((GtkTextView *) attr_value, GTK_WRAP_CHAR);
-        gtk_tooltips_set_tip( tooltips, GTK_WIDGET(attr_value),
+        gtk_widget_set_tooltip_text( GTK_WIDGET(attr_value),
                                // TRANSLATORS: "Attribute" is a noun here
-                               _("Attribute value"), NULL );
-        gtk_signal_connect( GTK_OBJECT(attributes), "select_row",
+                               _("Attribute value") );
+        g_signal_connect( G_OBJECT(attributes), "select_row",
                             (GCallback) on_attr_select_row_set_value_content,
                              attr_value );
-        gtk_signal_connect( GTK_OBJECT(attributes), "unselect_row",
+        g_signal_connect( G_OBJECT(attributes), "unselect_row",
                             (GCallback) on_attr_unselect_row_clear_text,
                              attr_value );
-        gtk_signal_connect( GTK_OBJECT(tree), "tree_unselect_row",
+        g_signal_connect( G_OBJECT(tree), "tree_unselect_row",
                             (GCallback) on_tree_unselect_row_clear_text,
                              attr_value );
         gtk_text_view_set_editable(attr_value, TRUE);
@@ -895,8 +891,6 @@ void after_tree_move(GtkCTree */*tree*/,
 static void on_destroy(GtkObject */*object*/, gpointer /*data*/)
 {
     set_tree_desktop(NULL);
-    gtk_object_destroy(GTK_OBJECT(tooltips));
-    tooltips = NULL;
     sp_signal_disconnect_by_data(INKSCAPE, dlg);
     wd.win = dlg = NULL;
     wd.stop = 0;
@@ -1327,8 +1321,8 @@ void cmd_new_element_node(GtkObject */*object*/, gpointer /*data*/)
     gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
     gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(dlg));
     gtk_window_set_modal(GTK_WINDOW(window), TRUE);
-    gtk_signal_connect(GTK_OBJECT(window), "destroy", gtk_main_quit, NULL);
-    gtk_signal_connect(GTK_OBJECT(window), "key-press-event", G_CALLBACK(quit_on_esc), window);
+    g_signal_connect(G_OBJECT(window), "destroy", gtk_main_quit, NULL);
+    g_signal_connect(G_OBJECT(window), "key-press-event", G_CALLBACK(quit_on_esc), window);
 
     vbox = gtk_vbox_new(FALSE, 4);
     gtk_container_add(GTK_CONTAINER(window), vbox);
@@ -1345,25 +1339,24 @@ void cmd_new_element_node(GtkObject */*object*/, gpointer /*data*/)
     gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
 
     cancel = gtk_button_new_with_label(_("Cancel"));
-    GTK_WIDGET_SET_FLAGS( GTK_WIDGET(cancel),
-                           GTK_CAN_DEFAULT );
-    gtk_signal_connect_object( GTK_OBJECT(cancel), "clicked",
+    gtk_widget_set_can_default( GTK_WIDGET(cancel), TRUE );
+    g_signal_connect_swapped( G_OBJECT(cancel), "clicked",
                                 G_CALLBACK(gtk_widget_destroy),
-                                GTK_OBJECT(window) );
+                                G_OBJECT(window) );
     gtk_container_add(GTK_CONTAINER(bbox), cancel);
 
     create = gtk_button_new_with_label(_("Create"));
     gtk_widget_set_sensitive(GTK_WIDGET(create), FALSE);
-    gtk_signal_connect( GTK_OBJECT(entry), "changed",
+    g_signal_connect( G_OBJECT(entry), "changed",
                     G_CALLBACK(on_editable_changed_enable_if_valid_xml_name),
                     create );
-    gtk_signal_connect( GTK_OBJECT(create), "clicked",
+    g_signal_connect( G_OBJECT(create), "clicked",
                          G_CALLBACK(on_clicked_get_editable_text), &name );
-    gtk_signal_connect_object( GTK_OBJECT(create), "clicked",
+    g_signal_connect_swapped( G_OBJECT(create), "clicked",
                                 G_CALLBACK(gtk_widget_destroy),
-                                GTK_OBJECT(window) );
-    GTK_WIDGET_SET_FLAGS( GTK_WIDGET(create),
-                           GTK_CAN_DEFAULT | GTK_RECEIVES_DEFAULT );
+                                G_OBJECT(window) );
+    gtk_widget_set_can_default( GTK_WIDGET(create), TRUE );
+    gtk_widget_set_receives_default( GTK_WIDGET(create), TRUE );
     gtk_container_add(GTK_CONTAINER(bbox), create);
 
     gtk_widget_show_all(GTK_WIDGET(window));