diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-07-25 01:06:47 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-07-25 01:06:47 +0000 |
| commit | 4f3cc7cbb73a72e1ab10a587a3b81f8c8737fec3 (patch) | |
| tree | 75853d8eec5e85fb93a2a798b57f072e3c9eeb99 /src/sp-root.cpp | |
| parent | Replace direct use of Cairo contexts and surfaces in the rendering tree (diff) | |
| parent | Revert workarounds from 10501 - no longer necessary (diff) | |
| download | inkscape-4f3cc7cbb73a72e1ab10a587a3b81f8c8737fec3.tar.gz inkscape-4f3cc7cbb73a72e1ab10a587a3b81f8c8737fec3.zip | |
Merge from trunk
(bzr r10347.1.18)
Diffstat (limited to 'src/sp-root.cpp')
| -rw-r--r-- | src/sp-root.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/sp-root.cpp b/src/sp-root.cpp index 7d72b7695..918bd3295 100644 --- a/src/sp-root.cpp +++ b/src/sp-root.cpp @@ -395,12 +395,8 @@ static void sp_root_remove_child(SPObject *object, Inkscape::XML::Node *child) /** * This callback routine updates the SPRoot object when its attributes have been changed. */ -static void -sp_root_update(SPObject *object, SPCtx *ctx, guint flags) +static void sp_root_update(SPObject *object, SPCtx *ctx, guint flags) { - SPItemView *v; - - SPItem *item = SP_ITEM(object); SPRoot *root = SP_ROOT(object); SPItemCtx *ictx = (SPItemCtx *) ctx; @@ -543,7 +539,7 @@ sp_root_update(SPObject *object, SPCtx *ctx, guint flags) ((SPObjectClass *) (parent_class))->update(object, (SPCtx *) &rctx, flags); /* As last step set additional transform of arena group */ - for (v = item->display; v != NULL; v = v->next) { + for (SPItemView *v = root->display; v != NULL; v = v->next) { nr_arena_group_set_child_transform(NR_ARENA_GROUP(v->arenaitem), root->c2p); } } |