summaryrefslogtreecommitdiffstats
path: root/src/sp-namedview.cpp
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-03-26 04:34:25 +0000
committerTed Gould <ted@gould.cx>2010-03-26 04:34:25 +0000
commit9e023a3aa964a0d3fa1e31e46d33657367ba68aa (patch)
tree33f1392a340737e4eeefca6fd031f96c29befd2b /src/sp-namedview.cpp
parentInstalling the pkgconfig file (diff)
parentAdding in shape-record.h (diff)
downloadinkscape-9e023a3aa964a0d3fa1e31e46d33657367ba68aa.tar.gz
inkscape-9e023a3aa964a0d3fa1e31e46d33657367ba68aa.zip
Merge from trunk
(bzr r8254.1.53)
Diffstat (limited to 'src/sp-namedview.cpp')
-rw-r--r--src/sp-namedview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index 9b72a4157..44c3bf620 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -829,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);
@@ -978,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");
}