X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-namedview.cpp;h=44c3bf62013c42d84cffbf5f6facce5f66a42c01;hb=7adfbd503fbbc8c2c4829f245d24d36f96c105d1;hp=47720c5d64f12fb9409e1f74aa7a537b457d0fe8;hpb=3c4a786d3ad8f84a2c2972eb55b5726565b23b97;p=inkscape.git

diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index 47720c5d6..44c3bf620 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -304,6 +304,7 @@ static void sp_namedview_release(SPObject *object)
 static void sp_namedview_set(SPObject *object, unsigned int key, const gchar *value)
 {
     SPNamedView *nv = SP_NAMEDVIEW(object);
+    // TODO investigate why we grab this and then never use it
     SPUnit const &px = sp_unit_get_by_id(SP_UNIT_PX);
 
     switch (key) {
@@ -828,7 +829,7 @@ void sp_namedview_document_from_window(SPDesktop *desktop)
         sp_repr_set_int(view, "inkscape:window-maximized", desktop->is_maximized());
     }
 
-    view->setAttribute("inkscape:current-layer", SP_OBJECT_ID(desktop->currentLayer()));
+    view->setAttribute("inkscape:current-layer", desktop->currentLayer()->getId());
 
     // restore undoability
     sp_document_set_undo_sensitive(sp_desktop_document(desktop), saved);
@@ -977,7 +978,7 @@ SPNamedView *sp_document_namedview(SPDocument *document, const gchar *id)
         return (SPNamedView *) nv;
     }
 
-    while (nv && strcmp(nv->id, id)) {
+    while (nv && strcmp(nv->getId(), id)) {
         nv = sp_item_group_get_child_by_name((SPGroup *) document->root, nv, "sodipodi:namedview");
     }