update to trunk

(bzr r11950.1.233)

13 files changed, 400 insertions, 189 deletions

diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 32f23d55f..d324d2d1b 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -57,6 +57,7 @@
 #include <gtkmm/table.h>
 
 #include <2geom/transforms.h>
+#include "ui/icon-names.h"
 
 using std::pair;
 
@@ -609,10 +610,22 @@ void DocumentProperties::build_cms()
     label_avail->set_markup (_("<b>Available Color Profiles:</b>"));
 
     _link_btn.set_tooltip_text(_("Link Profile"));
-    _link_btn.set_image(*manage(Glib::wrap(gtk_image_new_from_stock ( GTK_STOCK_ADD, GTK_ICON_SIZE_SMALL_TOOLBAR ) )));
+#if GTK_CHECK_VERSION(3,10,0)
+    _link_btn.set_image_from_icon_name(INKSCAPE_ICON("list-add"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+#else
+    Gtk::Image *image_link = Gtk::manage(new Gtk::Image());
+    image_link->set_from_icon_name(INKSCAPE_ICON("list-add"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+    _link_btn.set_image(*image_link);
+#endif
 
     _unlink_btn.set_tooltip_text(_("Unlink Profile"));
-    _unlink_btn.set_image(*manage(Glib::wrap(gtk_image_new_from_stock ( GTK_STOCK_REMOVE, GTK_ICON_SIZE_SMALL_TOOLBAR ) )));
+#if GTK_CHECK_VERSION(3,10,0)
+    _unlink_btn.set_image_from_icon_name(INKSCAPE_ICON("list-remove"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+#else
+    Gtk::Image *image_unlink = Gtk::manage(new Gtk::Image());
+    image_unlink->set_from_icon_name(INKSCAPE_ICON("list-remove"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+    _unlink_btn.set_image(*image_unlink);
+#endif
 
     _page_cms->set_spacing(4);
     gint row = 0;
@@ -734,11 +747,22 @@ void DocumentProperties::build_scripting()
     label_external->set_markup (_("<b>External script files:</b>"));
 
     _external_add_btn.set_tooltip_text(_("Add the current file name or browse for a file"));
-    _external_add_btn.set_image(*manage(Glib::wrap(gtk_image_new_from_stock ( GTK_STOCK_ADD, GTK_ICON_SIZE_SMALL_TOOLBAR ) )));
+#if GTK_CHECK_VERSION(3,10,0)
+    _external_add_btn.set_image_from_icon_name(INKSCAPE_ICON("list-add"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+#else
+    Gtk::Image *image_ext_add = Gtk::manage(new Gtk::Image());
+    image_ext_add->set_from_icon_name(INKSCAPE_ICON("list-add"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+    _external_add_btn.set_image(*image_ext_add);
+#endif
 
     _external_remove_btn.set_tooltip_text(_("Remove"));
-    _external_remove_btn.set_image(*manage(Glib::wrap(gtk_image_new_from_stock ( GTK_STOCK_REMOVE, GTK_ICON_SIZE_SMALL_TOOLBAR ) )));
-
+#if GTK_CHECK_VERSION(3,10,0)
+    _external_remove_btn.set_image_from_icon_name(INKSCAPE_ICON("list-remove"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+#else
+    Gtk::Image *image_ext_rm = Gtk::manage(new Gtk::Image());
+    image_ext_rm->set_from_icon_name(INKSCAPE_ICON("list-remove"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+    _external_remove_btn.set_image(*image_ext_rm);
+#endif
 
     _page_external_scripts->set_spacing(4);
     gint row = 0;
@@ -812,10 +836,22 @@ void DocumentProperties::build_scripting()
     label_embedded->set_markup (_("<b>Embedded script files:</b>"));
 
     _embed_new_btn.set_tooltip_text(_("New"));
-    _embed_new_btn.set_image(*manage(Glib::wrap(gtk_image_new_from_stock ( GTK_STOCK_ADD, GTK_ICON_SIZE_SMALL_TOOLBAR ) )));
+#if GTK_CHECK_VERSION(3,10,0)
+    _embed_new_btn.set_image_from_icon_name(INKSCAPE_ICON("list-add"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+#else
+    Gtk::Image *image_embed_new = Gtk::manage(new Gtk::Image());
+    image_embed_new->set_from_icon_name(INKSCAPE_ICON("list-add"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+    _embed_new_btn.set_image(*image_embed_new);
+#endif
 
     _embed_remove_btn.set_tooltip_text(_("Remove"));
-    _embed_remove_btn.set_image(*manage(Glib::wrap(gtk_image_new_from_stock ( GTK_STOCK_REMOVE, GTK_ICON_SIZE_SMALL_TOOLBAR ) )));
+#if GTK_CHECK_VERSION(3,10,0)
+    _embed_remove_btn.set_image_from_icon_name(INKSCAPE_ICON("list-remove"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+#else
+    Gtk::Image *image_embed_rm = Gtk::manage(new Gtk::Image());
+    image_embed_rm->set_from_icon_name(INKSCAPE_ICON("list-remove"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+    _embed_remove_btn.set_image(*image_embed_rm);
+#endif
 
 #if !WITH_GTKMM_3_0
     // TODO: This has been removed from Gtkmm 3.0. Check that
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 2cfdacb3d..e896b9840 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -1295,8 +1295,8 @@ void Export::onBrowse ()
     fs = gtk_file_chooser_dialog_new (_("Select a filename for exporting"),
                                       (GtkWindow*)desktop->getToplevel(),
                                       GTK_FILE_CHOOSER_ACTION_SAVE,
-                                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                      GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+                                      _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                      _("_Save"),   GTK_RESPONSE_ACCEPT,
                                       NULL );
 
 #ifdef WITH_GNOME_VFS
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 12fdf6b7d..381810f1e 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -881,30 +881,30 @@ LayersPanel::LayersPanel() :
     SPDesktop* targetDesktop = getDesktop();
 
     Gtk::Button* btn = manage( new Gtk::Button() );
-    _styleButton( *btn, targetDesktop, SP_VERB_LAYER_NEW, GTK_STOCK_ADD, C_("Layers", "New") );
+    _styleButton( *btn, targetDesktop, SP_VERB_LAYER_NEW, INKSCAPE_ICON("list-add"), C_("Layers", "New") );
     btn->signal_clicked().connect( sigc::bind( sigc::mem_fun(*this, &LayersPanel::_takeAction), (int)BUTTON_NEW) );
     _buttonsSecondary.pack_start(*btn, Gtk::PACK_SHRINK);
 
     btn = manage( new Gtk::Button() );
-    _styleButton( *btn, targetDesktop, SP_VERB_LAYER_TO_BOTTOM, GTK_STOCK_GOTO_BOTTOM, C_("Layers", "Bot") );
+    _styleButton( *btn, targetDesktop, SP_VERB_LAYER_TO_BOTTOM, INKSCAPE_ICON("go-bottom"), C_("Layers", "Bot") );
     btn->signal_clicked().connect( sigc::bind( sigc::mem_fun(*this, &LayersPanel::_takeAction), (int)BUTTON_BOTTOM) );
     _watchingNonBottom.push_back( btn );
     _buttonsPrimary.pack_end(*btn, Gtk::PACK_SHRINK);
     
     btn = manage( new Gtk::Button() );
-    _styleButton( *btn, targetDesktop, SP_VERB_LAYER_LOWER, GTK_STOCK_GO_DOWN, C_("Layers", "Dn") );
+    _styleButton( *btn, targetDesktop, SP_VERB_LAYER_LOWER, INKSCAPE_ICON("go-down"), C_("Layers", "Dn") );
     btn->signal_clicked().connect( sigc::bind( sigc::mem_fun(*this, &LayersPanel::_takeAction), (int)BUTTON_DOWN) );
     _watchingNonBottom.push_back( btn );
     _buttonsPrimary.pack_end(*btn, Gtk::PACK_SHRINK);
     
     btn = manage( new Gtk::Button() );
-    _styleButton( *btn, targetDesktop, SP_VERB_LAYER_RAISE, GTK_STOCK_GO_UP, C_("Layers", "Up") );
+    _styleButton( *btn, targetDesktop, SP_VERB_LAYER_RAISE, INKSCAPE_ICON("go-up"), C_("Layers", "Up") );
     btn->signal_clicked().connect( sigc::bind( sigc::mem_fun(*this, &LayersPanel::_takeAction), (int)BUTTON_UP) );
     _watchingNonTop.push_back( btn );
     _buttonsPrimary.pack_end(*btn, Gtk::PACK_SHRINK);
     
     btn = manage( new Gtk::Button() );
-    _styleButton( *btn, targetDesktop, SP_VERB_LAYER_TO_TOP, GTK_STOCK_GOTO_TOP, C_("Layers", "Top") );
+    _styleButton( *btn, targetDesktop, SP_VERB_LAYER_TO_TOP, INKSCAPE_ICON("go-top"), C_("Layers", "Top") );
     btn->signal_clicked().connect( sigc::bind( sigc::mem_fun(*this, &LayersPanel::_takeAction), (int)BUTTON_TOP) );
     _watchingNonTop.push_back( btn );
     _buttonsPrimary.pack_end(*btn, Gtk::PACK_SHRINK);
@@ -914,7 +914,7 @@ LayersPanel::LayersPanel() :
 //     _buttonsRow.add( *btn );
 
     btn = manage( new Gtk::Button() );
-    _styleButton( *btn, targetDesktop, SP_VERB_LAYER_DELETE, GTK_STOCK_REMOVE, _("X") );
+    _styleButton( *btn, targetDesktop, SP_VERB_LAYER_DELETE, INKSCAPE_ICON("list-remove"), _("X") );
     btn->signal_clicked().connect( sigc::bind( sigc::mem_fun(*this, &LayersPanel::_takeAction), (int)BUTTON_DELETE) );
     _watching.push_back( btn );
     _buttonsSecondary.pack_start(*btn, Gtk::PACK_SHRINK);
@@ -944,8 +944,8 @@ LayersPanel::LayersPanel() :
 
         _popupMenu.append(*manage(new Gtk::SeparatorMenuItem()));
 
-        _watchingNonTop.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_RAISE, GTK_STOCK_GO_UP, "Up", (int)BUTTON_UP ) );
-        _watchingNonBottom.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_LOWER, GTK_STOCK_GO_DOWN, "Down", (int)BUTTON_DOWN ) );
+        _watchingNonTop.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_RAISE, INKSCAPE_ICON("go-up"), "Up", (int)BUTTON_UP ) );
+        _watchingNonBottom.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_LOWER, INKSCAPE_ICON("go-down"), "Down", (int)BUTTON_DOWN ) );
 
         _popupMenu.show_all_children();
     }
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 30b16cee0..b81b300e2 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -107,19 +107,43 @@ LivePathEffectEditor::LivePathEffectEditor()
     effectcontrol_frame.add(effectcontrol_vbox);
 
     button_add.set_tooltip_text(_("Add path effect"));
-    button_add.set_image(*manage(Glib::wrap(gtk_image_new_from_stock ( GTK_STOCK_ADD, GTK_ICON_SIZE_SMALL_TOOLBAR ) )));
+#if GTK_CHECK_VERSION(3,10,0)
+    button_add.set_image_from_icon_name(INKSCAPE_ICON("list-add"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+#else
+    Gtk::Image *image_add = Gtk::manage(new Gtk::Image());
+    image_add->set_from_icon_name(INKSCAPE_ICON("list-add"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+    button_add.set_image(*image_add);
+#endif
     button_add.set_relief(Gtk::RELIEF_NONE);
 
     button_remove.set_tooltip_text(_("Delete current path effect"));
-    button_remove.set_image(*manage(Glib::wrap(gtk_image_new_from_stock ( GTK_STOCK_REMOVE, GTK_ICON_SIZE_SMALL_TOOLBAR ) )));
+#if GTK_CHECK_VERSION(3,10,0)
+    button_remove.set_image_from_icon_name(INKSCAPE_ICON("list-remove"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+#else
+    Gtk::Image *image_remove = Gtk::manage(new Gtk::Image());
+    image_remove->set_from_icon_name(INKSCAPE_ICON("list-remove"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+    button_remove.set_image(*image_remove);
+#endif
     button_remove.set_relief(Gtk::RELIEF_NONE);
 
     button_up.set_tooltip_text(_("Raise the current path effect"));
-    button_up.set_image(*manage(Glib::wrap(gtk_image_new_from_stock ( GTK_STOCK_GO_UP, GTK_ICON_SIZE_SMALL_TOOLBAR ) )));
+#if GTK_CHECK_VERSION(3,10,0)
+    button_up.set_image_from_icon_name(INKSCAPE_ICON("go-up"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+#else
+    Gtk::Image *image_up = Gtk::manage(new Gtk::Image());
+    image_up->set_from_icon_name(INKSCAPE_ICON("go-up"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+    button_up.set_image(*image_up);
+#endif
     button_up.set_relief(Gtk::RELIEF_NONE);
 
     button_down.set_tooltip_text(_("Lower the current path effect"));
-    button_down.set_image(*manage(Glib::wrap(gtk_image_new_from_stock ( GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_SMALL_TOOLBAR ) )));
+#if GTK_CHECK_VERSION(3,10,0)
+    button_down.set_image_from_icon_name(INKSCAPE_ICON("go-down"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+#else
+    Gtk::Image *image_down = Gtk::manage(new Gtk::Image());
+    image_down->set_from_icon_name(INKSCAPE_ICON("go-down"), Gtk::ICON_SIZE_SMALL_TOOLBAR);
+    button_down.set_image(*image_down);
+#endif
     button_down.set_relief(Gtk::RELIEF_NONE);
 
     // Add toolbar items to toolbar
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index 417df9a27..93fcab863 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -43,6 +43,7 @@
 #include <glibmm/main.h>
 #include <glibmm/markup.h>
 #include <glibmm/miscutils.h>
+#include "ui/icon-names.h"
 
 namespace Inkscape
 {
@@ -578,8 +579,8 @@ SearchEntry::SearchEntry() : Gtk::Entry()
     signal_changed().connect(sigc::mem_fun(*this, &SearchEntry::_on_changed));
     signal_icon_press().connect(sigc::mem_fun(*this, &SearchEntry::_on_icon_pressed));
 
-    set_icon_from_stock(Gtk::Stock::FIND, Gtk::ENTRY_ICON_PRIMARY);
-    gtk_entry_set_icon_from_stock(gobj(), GTK_ENTRY_ICON_SECONDARY, NULL);
+    set_icon_from_icon_name(INKSCAPE_ICON("edit-find"), Gtk::ENTRY_ICON_PRIMARY);
+    gtk_entry_set_icon_from_icon_name(gobj(), GTK_ENTRY_ICON_SECONDARY, NULL);
 }
 
 void SearchEntry::_on_icon_pressed(Gtk::EntryIconPosition icon_position, const GdkEventButton* /*event*/)
@@ -596,9 +597,9 @@ void SearchEntry::_on_icon_pressed(Gtk::EntryIconPosition icon_position, const G
 void SearchEntry::_on_changed()
 {
     if (get_text().empty()) {
-        gtk_entry_set_icon_from_stock(gobj(), GTK_ENTRY_ICON_SECONDARY, NULL);
+        gtk_entry_set_icon_from_icon_name(gobj(), GTK_ENTRY_ICON_SECONDARY, NULL);
     } else {
-        set_icon_from_stock(Gtk::Stock::CLEAR, Gtk::ENTRY_ICON_SECONDARY);
+        set_icon_from_icon_name(INKSCAPE_ICON("edit-clear"), Gtk::ENTRY_ICON_SECONDARY);
     }
 }
 #endif
diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp
index ec2bfb822..ce5b6584d 100644
--- a/src/ui/dialog/pixelartdialog.cpp
+++ b/src/ui/dialog/pixelartdialog.cpp
@@ -159,7 +159,7 @@ PixelArtDialogImpl::PixelArtDialogImpl() :
 
     // Heuristics
     {
-        curvesMultiplierLabel.set_label(_("_Curves (multiplier)"));
+        curvesMultiplierLabel.set_label(_("_Curves (multiplier):"));
         curvesMultiplierLabel.set_use_underline(true);
         curvesMultiplierLabel.set_mnemonic_widget(curvesMultiplierSpinner);
         curvesMultiplierLabel.set_tooltip_text(_("Favors connections that are part of a long curve"));
@@ -173,7 +173,7 @@ PixelArtDialogImpl::PixelArtDialogImpl() :
         curvesMultiplierHBox.pack_end(curvesMultiplierSpinner, false, false);
         heuristicsVBox.pack_start(curvesMultiplierHBox, false, false);
 
-        islandsWeightLabel.set_label(_("_Islands (weight)"));
+        islandsWeightLabel.set_label(_("_Islands (weight):"));
         islandsWeightLabel.set_use_underline(true);
         islandsWeightLabel.set_mnemonic_widget(islandsWeightSpinner);
         islandsWeightLabel.set_tooltip_text(_("Avoid single disconnected pixels"));
@@ -188,7 +188,7 @@ PixelArtDialogImpl::PixelArtDialogImpl() :
         islandsWeightHBox.pack_end(islandsWeightSpinner, false, false);
         heuristicsVBox.pack_start(islandsWeightHBox, false, false);
 
-        sparsePixelsRadiusLabel.set_label(_("Sparse pixels (window _radius)"));
+        sparsePixelsRadiusLabel.set_label(_("Sparse pixels (window _radius):"));
         sparsePixelsRadiusLabel.set_use_underline(true);
         sparsePixelsRadiusLabel.set_mnemonic_widget(sparsePixelsRadiusSpinner);
 
@@ -198,7 +198,7 @@ PixelArtDialogImpl::PixelArtDialogImpl() :
             .connect(sigc::mem_fun(*this, &PixelArtDialogImpl::updatePreview));
 
         sparsePixelsRadiusSpinner.set_tooltip_text(_("The radius of the window analyzed"));
-        sparsePixelsMultiplierLabel.set_label(_("Sparse pixels (_multiplier)"));
+        sparsePixelsMultiplierLabel.set_label(_("Sparse pixels (_multiplier):"));
         sparsePixelsMultiplierLabel.set_use_underline(true);
         sparsePixelsMultiplierLabel.set_mnemonic_widget(sparsePixelsMultiplierSpinner);
 
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 6427eb9cc..fb353fec1 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -271,6 +271,10 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
           sigc::mem_fun(*this, &SymbolsDialog::selectionChanged));
   instanceConns.push_back(selectionChangedConn);
 
+  sigc::connection documentReplacedConn = currentDesktop->connectDocumentReplaced(
+          sigc::mem_fun(*this, &SymbolsDialog::documentReplaced));
+  instanceConns.push_back(documentReplacedConn);
+
   get_symbols();
   draw_symbols( currentDocument ); /* Defaults to current document */
 
@@ -378,6 +382,11 @@ void SymbolsDialog::selectionChanged(Inkscape::Selection *selection) {
   }
 }
 
+void SymbolsDialog::documentReplaced(SPDesktop */*desktop*/, SPDocument */*document*/)
+{
+  rebuild();
+}
+
 SPDocument* SymbolsDialog::selectedSymbols() {
   /* OK, we know symbol name... now we need to copy it to clipboard, bon chance! */
   Glib::ustring symbolSetString = symbolSet->get_active_text();
diff --git a/src/ui/dialog/symbols.h b/src/ui/dialog/symbols.h
index 54b1a3ab0..074af6764 100644
--- a/src/ui/dialog/symbols.h
+++ b/src/ui/dialog/symbols.h
@@ -72,6 +72,7 @@ private:
     void revertSymbol();
     void defsModified(SPObject *object, guint flags);
     void selectionChanged(Inkscape::Selection *selection);
+    void documentReplaced(SPDesktop *desktop, SPDocument *document);
     SPDocument* selectedSymbols();
     Glib::ustring selectedSymbolId();
     void iconChanged();
diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp
index 9124681a0..17c29c69f 100644
--- a/src/ui/dialog/text-edit.cpp
+++ b/src/ui/dialog/text-edit.cpp
@@ -94,10 +94,10 @@ TextEdit::TextEdit()
     fontsel_hbox.pack_start(*Gtk::manage(Glib::wrap(fontsel)), true, true);
 
     /* Align buttons */
-    styleButton(&align_left, _("Align left"), GTK_STOCK_JUSTIFY_LEFT, NULL);
-    styleButton(&align_center, _("Align center"), GTK_STOCK_JUSTIFY_CENTER, &align_left);
-    styleButton(&align_right, _("Align right"), GTK_STOCK_JUSTIFY_RIGHT, &align_left);
-    styleButton(&align_justify, _("Justify (only flowed text)"), GTK_STOCK_JUSTIFY_FILL, &align_left);
+    styleButton(&align_left,    _("Align left"),                 INKSCAPE_ICON("format-justify-left"),    NULL);
+    styleButton(&align_center,  _("Align center"),               INKSCAPE_ICON("format-justify-center"), &align_left);
+    styleButton(&align_right,   _("Align right"),                INKSCAPE_ICON("format-justify-right"),  &align_left);
+    styleButton(&align_justify, _("Justify (only flowed text)"), INKSCAPE_ICON("format-justify-fill"),   &align_left);
 
 #if WITH_GTKMM_3_0
     align_sep.set_orientation(Gtk::ORIENTATION_VERTICAL);
@@ -237,7 +237,7 @@ void TextEdit::styleButton(Gtk::RadioButton *button, gchar const *tooltip, gchar
 {
     GtkWidget *icon = sp_icon_new( Inkscape::ICON_SIZE_SMALL_TOOLBAR, icon_name );
     if (!GTK_IS_IMAGE(icon)) {
-        icon = gtk_image_new_from_stock ( icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR );
+        icon = gtk_image_new_from_icon_name ( icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR );
     }
 
     if (group_button) {
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index ce8af3f1f..a7f0b068e 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -813,7 +813,8 @@ void Transformation::applyPageScale(Inkscape::Selection *selection)
     double scaleY = _scalar_scale_vertical.getValue("px");
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    int transform_stroke = prefs->getBool("/options/transform/stroke", true) ? 1 : 0;
+    bool transform_stroke = prefs->getBool("/options/transform/stroke", true);
+    bool preserve = prefs->getBool("/options/preservetransform/value", false);
     if (prefs->getBool("/dialogs/transformation/applyseparately")) {
         for (GSList const *l = selection->itemList(); l != NULL; l = l->next) {
             SPItem *item = SP_ITEM(l->data);
@@ -835,7 +836,7 @@ void Transformation::applyPageScale(Inkscape::Selection *selection)
                 double x1 = bbox_pref->midpoint()[Geom::X] + new_width/2;
                 double y1 = bbox_pref->midpoint()[Geom::Y] + new_height/2;
 
-                Geom::Affine scaler = get_scale_transform_for_variable_stroke (*bbox_pref, *bbox_geom, transform_stroke, x0, y0, x1, y1);
+                Geom::Affine scaler = get_scale_transform_for_variable_stroke (*bbox_pref, *bbox_geom, transform_stroke, preserve, x0, y0, x1, y1);
                 item->set_i2d_affine(item->i2dt_affine() * scaler);
                 item->doWriteTransform(item->getRepr(), item->transform);
             }
@@ -858,7 +859,7 @@ void Transformation::applyPageScale(Inkscape::Selection *selection)
             double y0 = bbox_pref->midpoint()[Geom::Y] - new_height/2;
             double x1 = bbox_pref->midpoint()[Geom::X] + new_width/2;
             double y1 = bbox_pref->midpoint()[Geom::Y] + new_height/2;
-            Geom::Affine scaler = get_scale_transform_for_variable_stroke (*bbox_pref, *bbox_geom, transform_stroke, x0, y0, x1, y1);
+            Geom::Affine scaler = get_scale_transform_for_variable_stroke (*bbox_pref, *bbox_geom, transform_stroke, preserve, x0, y0, x1, y1);
 
             sp_selection_apply_affine(selection, scaler);
         }
diff --git a/src/ui/widget/gimpspinscale.c b/src/ui/widget/gimpspinscale.c
index f9f9a3807..d99646a64 100644
--- a/src/ui/widget/gimpspinscale.c
+++ b/src/ui/widget/gimpspinscale.c
@@ -174,6 +174,13 @@ gimp_spin_scale_init (GimpSpinScale *scale)
 {
   GimpSpinScalePrivate *private = GET_PRIVATE (scale);
 
+  gtk_widget_add_events (GTK_WIDGET (scale),
+                         GDK_BUTTON_PRESS_MASK   |
+                         GDK_BUTTON_RELEASE_MASK |
+                         GDK_POINTER_MOTION_MASK |
+                         GDK_BUTTON1_MOTION_MASK |
+                         GDK_LEAVE_NOTIFY_MASK);
+
   gtk_entry_set_alignment (GTK_ENTRY (scale), 1.0);
   gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (scale), TRUE);
 
@@ -218,26 +225,20 @@ gimp_spin_scale_set_property (GObject      *object,
                               GParamSpec   *pspec)
 {
   GimpSpinScalePrivate *private = GET_PRIVATE (object);
+  GimpSpinScale        *scale   = GIMP_SPIN_SCALE (object);
 
   switch (property_id)
     {
     case PROP_LABEL:
-      g_free (private->label);
-      private->label = g_value_dup_string (value);
-      if (private->layout)
-        {
-          g_object_unref (private->layout);
-          private->layout = NULL;
-        }
-      gtk_widget_queue_resize (GTK_WIDGET (object));
+      gimp_spin_scale_set_label (scale, g_value_get_string (value));
       break;
 
     case PROP_FOCUS_WIDGET:
-    {
+      {
         /* TODO unhook prior */
-        private->focusWidget = (GtkWidget*)g_value_get_pointer( value );
-    }
-    break;
+        private->focusWidget = GTK_WIDGET (g_value_get_pointer (value));
+      }
+      break;
 
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -252,16 +253,17 @@ gimp_spin_scale_get_property (GObject    *object,
                               GParamSpec *pspec)
 {
   GimpSpinScalePrivate *private = GET_PRIVATE (object);
+  GimpSpinScale        *scale   = GIMP_SPIN_SCALE (object);
 
   switch (property_id)
     {
     case PROP_LABEL:
-      g_value_set_string (value, private->label);
+      g_value_set_string (value, gimp_spin_scale_get_label (scale));
       break;
 
     case PROP_FOCUS_WIDGET:
-        g_value_set_pointer( value, private->focusWidget );
-        break;
+      g_value_set_pointer (value, private->focusWidget);
+      break;
 
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -292,47 +294,24 @@ gimp_spin_scale_set_appearance( GtkWidget *widget, const gchar *appearance)
     }
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
 static void
-#if WITH_GTKMM_3_0
 gimp_spin_scale_get_preferred_width (GtkWidget *widget,
                                      gint      *minimum_width,
                                      gint      *natural_width)
-#else
-gimp_spin_scale_size_request (GtkWidget      *widget,
-                              GtkRequisition *requisition)
-#endif
 {
   GimpSpinScalePrivate *private = GET_PRIVATE (widget);
-  GtkStyle             *style   = gtk_widget_get_style (widget);
   PangoContext         *context = gtk_widget_get_pango_context (widget);
   PangoFontMetrics     *metrics;
 
-#if WITH_GTKMM_3_0
   GTK_WIDGET_CLASS (parent_class)->get_preferred_width (widget,
-                                                          minimum_width,
-                                                          natural_width);
-#else
-  gint                  height;
-  GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition);
-#endif
+                                                        minimum_width,
+                                                        natural_width);
 
-  metrics = pango_context_get_metrics (context, style->font_desc,
+  metrics = pango_context_get_metrics (context,
+                                       pango_context_get_font_description (context),
                                        pango_context_get_language (context));
 
-#if WITH_GTKMM_3_0
-#else
-  height = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) +
-                         pango_font_metrics_get_descent (metrics));
-
-  if (private->appearanceMode == APPEARANCE_COMPACT) {
-      requisition->height += 1;
-  } else {
-      requisition->height += height;
-  }
-
-#endif
-
-
   if (private->label)
     {
       gint char_width;
@@ -343,26 +322,19 @@ gimp_spin_scale_size_request (GtkWidget      *widget,
       digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
       char_pixels = PANGO_PIXELS (MAX (char_width, digit_width));
 
-#if WITH_GTKMM_3_0
+      /* ~3 chars for the ellipse */
       *minimum_width += char_pixels * 3;
       *natural_width += char_pixels * 3;
-#else
-      /* ~3 chars for the ellipses */
-      requisition->width += char_pixels * 3;
-#endif
-
     }
 
   pango_font_metrics_unref (metrics);
 }
 
-#if WITH_GTKMM_3_0
 static void
 gimp_spin_scale_get_preferred_height (GtkWidget *widget,
                                       gint      *minimum_height,
                                       gint      *natural_height)
 {
-  GtkStyle         *style   = gtk_widget_get_style (widget);
   PangoContext     *context = gtk_widget_get_pango_context (widget);
   PangoFontMetrics *metrics;
   //gint              height;
@@ -371,7 +343,8 @@ gimp_spin_scale_get_preferred_height (GtkWidget *widget,
                                                          minimum_height,
                                                          natural_height);
 
-  metrics = pango_context_get_metrics (context, style->font_desc,
+  metrics = pango_context_get_metrics (context,
+                                       pango_context_get_font_description (context),
                                        pango_context_get_language (context));
 
   //height = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) +
@@ -382,6 +355,47 @@ gimp_spin_scale_get_preferred_height (GtkWidget *widget,
 
   pango_font_metrics_unref (metrics);
 }
+#else
+static void
+gimp_spin_scale_size_request (GtkWidget      *widget,
+                              GtkRequisition *requisition)
+{
+  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
+  GtkStyle             *style   = gtk_widget_get_style (widget);
+  PangoContext         *context = gtk_widget_get_pango_context (widget);
+  PangoFontMetrics     *metrics;
+  gint                  height;
+
+  GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition);
+
+  metrics = pango_context_get_metrics (context, style->font_desc,
+                                       pango_context_get_language (context));
+
+  height = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) +
+                         pango_font_metrics_get_descent (metrics));
+
+  if (private->appearanceMode == APPEARANCE_COMPACT) {
+      requisition->height += 1;
+  } else {
+      requisition->height += height;
+  }
+
+  if (private->label)
+    {
+      gint char_width;
+      gint digit_width;
+      gint char_pixels;
+
+      char_width = pango_font_metrics_get_approximate_char_width (metrics);
+      digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
+      char_pixels = PANGO_PIXELS (MAX (char_width, digit_width));
+
+      /* ~3 chars for the ellipses */
+      requisition->width += char_pixels * 3;
+    }
+
+  pango_font_metrics_unref (metrics);
+}
 #endif
 
 static void
@@ -401,67 +415,81 @@ gimp_spin_scale_style_set (GtkWidget *widget,
 
 
 static gboolean
-
-#if WITH_GTKMM_3_0
-    gimp_spin_scale_draw (GtkWidget *widget, cairo_t   *cr)
+#if GTK_CHECK_VERSION(3,0,0)
+    gimp_spin_scale_draw (GtkWidget *widget,
+                          cairo_t   *cr)
 #else
-    gimp_spin_scale_expose (GtkWidget      *widget, GdkEventExpose *event)
+    gimp_spin_scale_expose (GtkWidget      *widget,
+                            GdkEventExpose *event)
 #endif
 {
-    GimpSpinScalePrivate *private = GET_PRIVATE (widget);
-
-#if WITH_GTKMM_3_0
-    GtkStyleContext      *style   = gtk_widget_get_style_context(widget);
-    GtkAllocation         allocation;
-    GdkRGBA               color;
+  GimpSpinScalePrivate *private = GET_PRIVATE (widget);
+#if GTK_CHECK_VERSION(3,0,0)
+  GtkStyleContext      *style   = gtk_widget_get_style_context(widget);
+  GtkAllocation         allocation;
+  GdkRGBA               color;
 
-    cairo_save (cr);
-    GTK_WIDGET_CLASS (parent_class)->draw (widget, cr);
-    cairo_restore (cr);
+  cairo_save (cr);
+  GTK_WIDGET_CLASS (parent_class)->draw (widget, cr);
+  cairo_restore (cr);
 
-    gtk_widget_get_allocation (widget, &allocation);
+  gtk_widget_get_allocation (widget, &allocation);
 #else
-    GtkStyle             *style   = gtk_widget_get_style (widget);
-    cairo_t              *cr;
-    gint                  w;
+  GtkStyle             *style   = gtk_widget_get_style (widget);
+  cairo_t              *cr;
+  gint                  w;
 
-    GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+  GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
 
-    cr = gdk_cairo_create (event->window);
-    gdk_cairo_region (cr, event->region);
-    cairo_clip (cr);
+  cr = gdk_cairo_create (event->window);
+  gdk_cairo_region (cr, event->region);
+  cairo_clip (cr);
 
-    w = gdk_window_get_width (event->window);
+  w = gdk_window_get_width (event->window);
 #endif
 
-    cairo_set_line_width (cr, 1.0);
+  cairo_set_line_width (cr, 1.0);
 
-
-#if WITH_GTKMM_3_0
-      if (private->label)
-      {
-          GdkRectangle   text_area;
-          gint           minimum_width;
-          gint           natural_width;
+#if GTK_CHECK_VERSION(3,0,0)
+  if (private->label)
+    {
+      GdkRectangle   text_area;
+      gint           minimum_width;
+      gint           natural_width;
 #else
-      if (private->label  &&
-          gtk_widget_is_drawable (widget) &&
-          event->window == gtk_entry_get_text_window (GTK_ENTRY (widget)))
-      {
-          GtkRequisition requisition;
-          GtkAllocation  allocation;
+  if (private->label  &&
+      gtk_widget_is_drawable (widget) &&
+      event->window == gtk_entry_get_text_window (GTK_ENTRY (widget)))
+    {
+      GtkRequisition requisition;
+      GtkAllocation  allocation;
 #endif
-
       PangoRectangle logical;
       gint           layout_offset_x;
       gint           layout_offset_y;
+#if GTK_CHECK_VERSION(3,0,0)
+      GtkStateFlags  state;
+      GdkRGBA        text_color;
+      GdkRGBA        bar_text_color;
+#else
+      GtkStateType   state;
+      GdkColor       text_color;
+      GdkColor       bar_text_color;
+      gint           window_width;
+      gint           window_height;
+#endif
+      gdouble        progress_fraction;
+      gint           progress_x;
+      gint           progress_y;
+      gint           progress_width;
+      gint           progress_height;
 
-#if WITH_GTKMM_3_0
+#if GTK_CHECK_VERSION(3,0,0)
       gtk_entry_get_text_area (GTK_ENTRY (widget), &text_area);
 
       GTK_WIDGET_CLASS (parent_class)->get_preferred_width (widget,
-                                                               &minimum_width,
-                                                               &natural_width);
+                                                            &minimum_width,
+                                                            &natural_width);
 #else
       GTK_WIDGET_CLASS (parent_class)->size_request (widget, &requisition);
       gtk_widget_get_allocation (widget, &allocation);
@@ -476,17 +504,17 @@ static gboolean
 
       pango_layout_set_width (private->layout,
                               PANGO_SCALE *
-#if WITH_GTKMM_3_0
-                              (allocation.width - minimum_width + 10));
+#if GTK_CHECK_VERSION(3,0,0)
+                              (allocation.width - minimum_width));
 #else
-                              (allocation.width - requisition.width + 10));
+                              (allocation.width - requisition.width));
 #endif
       pango_layout_get_pixel_extents (private->layout, NULL, &logical);
 
       gtk_entry_get_layout_offsets (GTK_ENTRY (widget), NULL, &layout_offset_y);
 
       if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-#if WITH_GTKMM_3_0
+#if GTK_CHECK_VERSION(3,0,0)
           layout_offset_x = text_area.x + text_area.width - logical.width - 4;
 #else
           layout_offset_x = w - logical.width - 4;
@@ -496,25 +524,97 @@ static gboolean
 
       layout_offset_x -= logical.x;
 
-#if WITH_GTKMM_3_0
+#if GTK_CHECK_VERSION(3,0,0)
+      state = gtk_widget_get_state_flags (widget);
+
+      gtk_style_context_get_color (style, state, &text_color);
+
+      gtk_style_context_save (style);
+      gtk_style_context_add_class (style, GTK_STYLE_CLASS_PROGRESSBAR);
+      gtk_style_context_get_color (style, state, &bar_text_color);
+      gtk_style_context_restore (style);
+#else
+      state = GTK_STATE_SELECTED;
+      if (! gtk_widget_get_sensitive (widget))
+        state = GTK_STATE_INSENSITIVE;
+      text_color     = style->text[gtk_widget_get_state (widget)];
+      bar_text_color = style->fg[state];
+
+      window_width  = gdk_window_get_width  (event->window);
+      window_height = gdk_window_get_height (event->window);
+#endif
+
+      progress_fraction = gtk_entry_get_progress_fraction (GTK_ENTRY (widget));
+
+      if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+        {
+          progress_fraction = 1.0 - progress_fraction;
+
+#if GTK_CHECK_VERSION(3,0,0)
+          progress_x      = text_area.width * progress_fraction;
+#else
+          progress_x      = window_width * progress_fraction;
+#endif
+          progress_y      = 0;
+#if GTK_CHECK_VERSION(3,0,0)
+          progress_width  = text_area.width - progress_x;
+          progress_height = text_area.height;
+#else
+          progress_width  = window_width - progress_x;
+          progress_height = window_height;
+#endif
+        }
+      else
+        {
+          progress_x      = 0;
+          progress_y      = 0;
+#if GTK_CHECK_VERSION(3,0,0)
+          progress_width  = text_area.width * progress_fraction;
+          progress_height = text_area.height;
+#else
+          progress_width  = window_width * progress_fraction;
+          progress_height = window_height;
+#endif
+        }
+
+      cairo_save (cr);
+
+      cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+#if GTK_CHECK_VERSION(3,0,0)
+      cairo_rectangle (cr, 0, 0, text_area.width, text_area.height);
+#else
+      cairo_rectangle (cr, 0, 0, window_width, window_height);
+#endif
+      cairo_rectangle (cr, progress_x, progress_y,
+                       progress_width, progress_height);
+      cairo_clip (cr);
+      cairo_set_fill_rule (cr, CAIRO_FILL_RULE_WINDING);
+
+#if GTK_CHECK_VERSION(3,0,0)
       cairo_move_to (cr, layout_offset_x, text_area.y + layout_offset_y-3);
-      
-      gtk_style_context_get_color (style, gtk_widget_get_state_flags (widget),
-                                   &color);
-      
-      gdk_cairo_set_source_rgba (cr, &color);
+      gdk_cairo_set_source_rgba (cr, &text_color);
 #else
       cairo_move_to (cr, layout_offset_x, layout_offset_y-3);
-      
-      gdk_cairo_set_source_color (cr,
-                                  &style->text[gtk_widget_get_state (widget)]);
+      gdk_cairo_set_source_color (cr, &text_color);
 #endif
+      pango_cairo_show_layout (cr, private->layout);
+      cairo_restore (cr);
+
+      cairo_rectangle (cr, progress_x, progress_y,
+                       progress_width, progress_height);
+      cairo_clip (cr);
 
+#if GTK_CHECK_VERSION(3,0,0)
+      cairo_move_to (cr, layout_offset_x, text_area.y + layout_offset_y-3);
+      gdk_cairo_set_source_rgba (cr, &bar_text_color);
+#else
+      cairo_move_to (cr, layout_offset_x, layout_offset_y-3);
+      gdk_cairo_set_source_color (cr, &bar_text_color);
+#endif
       pango_cairo_show_layout (cr, private->layout);
     }
 
-#if WITH_GTKMM_3_0
-#else
+#if !GTK_CHECK_VERSION(3,0,0)
   cairo_destroy (cr);
 #endif
 
@@ -845,6 +945,9 @@ gimp_spin_scale_motion_notify (GtkWidget      *widget,
                                GdkEventMotion *event)
 {
   GimpSpinScalePrivate *private = GET_PRIVATE (widget);
+
+  gdk_event_request_motions (event);
+
 #if WITH_GTKMM_3_0
   gint                  x, y;
 
@@ -973,7 +1076,6 @@ gimp_spin_scale_value_changed (GtkSpinButton *spin_button)
 
   value = CLAMP (gtk_adjustment_get_value (adjustment), lower, upper);
 
-
   gtk_entry_set_progress_fraction (GTK_ENTRY (spin_button),
                                    pow ((value - lower) / (upper - lower),
                                         1.0 / private->gamma));
@@ -1003,6 +1105,41 @@ gimp_spin_scale_new (GtkAdjustment *adjustment,
 }
 
 void
+gimp_spin_scale_set_label (GimpSpinScale *scale,
+                           const gchar   *label)
+{
+  GimpSpinScalePrivate *private;
+
+  g_return_if_fail (GIMP_IS_SPIN_SCALE (scale));
+
+  private = GET_PRIVATE (scale);
+
+  if (label == private->label)
+    return;
+
+  g_free (private->label);
+  private->label = g_strdup (label);
+
+  if (private->layout)
+    {
+      g_object_unref (private->layout);
+      private->layout = NULL;
+    }
+
+  gtk_widget_queue_resize (GTK_WIDGET (scale));
+
+  g_object_notify (G_OBJECT (scale), "label");
+}
+
+const gchar *
+gimp_spin_scale_get_label (GimpSpinScale *scale)
+{
+  g_return_val_if_fail (GIMP_IS_SPIN_SCALE (scale), NULL);
+
+  return GET_PRIVATE (scale)->label;
+}
+
+void
 gimp_spin_scale_set_scale_limits (GimpSpinScale *scale,
                                   gdouble        lower,
                                   gdouble        upper)
@@ -1029,33 +1166,6 @@ gimp_spin_scale_set_scale_limits (GimpSpinScale *scale,
 }
 
 void
-gimp_spin_scale_set_gamma (GimpSpinScale *scale,
-                           gdouble        gamma)
-{
-  GimpSpinScalePrivate *private;
-
-  g_return_if_fail (GIMP_IS_SPIN_SCALE (scale));
-
-  private = GET_PRIVATE (scale);
-
-  private->gamma = gamma;
-
-  gimp_spin_scale_value_changed (GTK_SPIN_BUTTON (scale));
-}
-
-gdouble
-gimp_spin_scale_get_gamma (GimpSpinScale *scale)
-{
-  GimpSpinScalePrivate *private;
-
-  g_return_val_if_fail (GIMP_IS_SPIN_SCALE (scale), 1.0);
-
-  private = GET_PRIVATE (scale);
-
-  return private->gamma;
-}
-
-void
 gimp_spin_scale_unset_scale_limits (GimpSpinScale *scale)
 {
   GimpSpinScalePrivate *private;
@@ -1090,3 +1200,26 @@ gimp_spin_scale_get_scale_limits (GimpSpinScale *scale,
 
   return private->scale_limits_set;
 }
+
+void
+gimp_spin_scale_set_gamma (GimpSpinScale *scale,
+                           gdouble        gamma)
+{
+  GimpSpinScalePrivate *private;
+
+  g_return_if_fail (GIMP_IS_SPIN_SCALE (scale));
+
+  private = GET_PRIVATE (scale);
+
+  private->gamma = gamma;
+
+  gimp_spin_scale_value_changed (GTK_SPIN_BUTTON (scale));
+}
+
+gdouble
+gimp_spin_scale_get_gamma (GimpSpinScale *scale)
+{
+  g_return_val_if_fail (GIMP_IS_SPIN_SCALE (scale), 1.0);
+
+  return GET_PRIVATE(scale)->gamma;
+}
diff --git a/src/ui/widget/gimpspinscale.h b/src/ui/widget/gimpspinscale.h
index ad63625ac..b42a0faf8 100644
--- a/src/ui/widget/gimpspinscale.h
+++ b/src/ui/widget/gimpspinscale.h
@@ -49,27 +49,33 @@ struct _GimpSpinScaleClass
 };
 
 
-GType       gimp_spin_scale_get_type           (void) G_GNUC_CONST;
+GType         gimp_spin_scale_get_type           (void) G_GNUC_CONST;
 
-GtkWidget * gimp_spin_scale_new                (GtkAdjustment *adjustment,
-                                                const gchar   *label,
-                                                gint           digits);
+GtkWidget   * gimp_spin_scale_new                (GtkAdjustment *adjustment,
+                                                  const gchar   *label,
+                                                  gint           digits);
 
-void        gimp_spin_scale_set_scale_limits   (GimpSpinScale *scale,
-                                                gdouble        lower,
-                                                gdouble        upper);
-void        gimp_spin_scale_unset_scale_limits (GimpSpinScale *scale);
-gboolean    gimp_spin_scale_get_scale_limits   (GimpSpinScale *scale,
-                                                gdouble       *lower,
-                                                gdouble       *upper);
+void          gimp_spin_scale_set_label          (GimpSpinScale *scale,
+                                                  const gchar   *label);
+const gchar * gimp_spin_scale_get_label          (GimpSpinScale *scale);
 
-void        gimp_spin_scale_set_gamma          (GimpSpinScale *scale,
-                                                gdouble        gamma);
-gdouble     gimp_spin_scale_get_gamma          (GimpSpinScale *scale);
+void          gimp_spin_scale_set_scale_limits   (GimpSpinScale *scale,
+                                                  gdouble        lower,
+                                                  gdouble        upper);
+void          gimp_spin_scale_unset_scale_limits (GimpSpinScale *scale);
+gboolean      gimp_spin_scale_get_scale_limits   (GimpSpinScale *scale,
+                                                  gdouble       *lower,
+                                                  gdouble       *upper);
 
-void       gimp_spin_scale_set_focuswidget( GtkWidget *scale, GtkWidget* widget );
+void          gimp_spin_scale_set_gamma          (GimpSpinScale *scale,
+                                                  gdouble        gamma);
+gdouble       gimp_spin_scale_get_gamma          (GimpSpinScale *scale);
 
-void       gimp_spin_scale_set_appearance( GtkWidget *scale, const gchar *appearance);
+void          gimp_spin_scale_set_focuswidget    (GtkWidget     *scale,
+                                                  GtkWidget     *widget);
+
+void          gimp_spin_scale_set_appearance     (GtkWidget     *scale,
+                                                  const gchar   *appearance);
 
 G_END_DECLS
 
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index aa617353c..d29554c41 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -107,7 +107,7 @@ typedef enum {
 // pointers/types used need to be read-only. So until we correct the using
 // code, those warnings are actually desired. They say "Hey! Fix this". We
 // definitely don't want to hide/ignore them. --JonCruz
-static GtkTargetEntry ui_drop_target_entries [] = {
+static const GtkTargetEntry ui_drop_target_entries [] = {
     {"application/x-color", 0, APP_X_COLOR}
 };