Merge changes from trunk

(bzr r14949.1.38)

2 files changed, 8 insertions, 3 deletions

diff --git a/src/attribute-sort-util.cpp b/src/attribute-sort-util.cpp
index d0f45c418..5c01f7914 100644
--- a/src/attribute-sort-util.cpp
+++ b/src/attribute-sort-util.cpp
@@ -105,12 +105,17 @@ void sp_attribute_sort_element(Node *repr) {
   //for (auto it: my_list) {
   for (std::vector<std::pair< Glib::ustring, Glib::ustring > >::iterator it = my_list.begin();
                               it != my_list.end(); ++it) {
-       repr->setAttribute( it->first.c_str(), NULL, false );
+      // Removing "inkscape:label" results in crash when Layers dialog is open.
+      if (it->first != "inkscape:label") {
+          repr->setAttribute( it->first.c_str(), NULL, false );
+      }
   }
   // Insert all attributes in proper order
   for (std::vector<std::pair< Glib::ustring, Glib::ustring > >::iterator it = my_list.begin();
                               it != my_list.end(); ++it) {
-      repr->setAttribute( it->first.c_str(), it->second.c_str(), false );
+      if (it->first != "inkscape:label") {
+          repr->setAttribute( it->first.c_str(), it->second.c_str(), false );
+      }
   } 
 }
 
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index a39955123..08ebbcf14 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -497,7 +497,7 @@ SvgFontsDialog::flip_coordinate_system(Geom::PathVector pathv){
     for (obj = get_selected_spfont()->children; obj; obj=obj->next){
         if (SP_IS_FONTFACE(obj)){
             //XML Tree being directly used here while it shouldn't be.
-            sp_repr_get_double(obj->getRepr(), "units_per_em", &units_per_em);
+            sp_repr_get_double(obj->getRepr(), "units-per-em", &units_per_em);
         }
     }