summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2011-07-19 18:49:49 +0000
committerJohan Engelen <goejendaagh@zonnet.nl>2011-07-19 18:49:49 +0000
commitafa84f849bf79bce9ef7c2179982e62df8ca520b (patch)
tree6cd53ad84d9f9486176da441f2c8e694d070256f /src
parentremove some unnecessary inkscape_active_desktop() calls (diff)
downloadinkscape-afa84f849bf79bce9ef7c2179982e62df8ca520b.tar.gz
inkscape-afa84f849bf79bce9ef7c2179982e62df8ca520b.zip
another case of SP_ACTIVE_DESKTOP removed
(bzr r10478)
Diffstat (limited to 'src')
-rw-r--r--src/sp-guide.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index 45491e5e5..8d9d7b87d 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -474,11 +474,12 @@ char *sp_guide_description(SPGuide const *guide, const bool verbose)
{
using Geom::X;
using Geom::Y;
-
+
+ SPNamedView *namedview = sp_document_namedview(guide->document, NULL);
GString *position_string_x = SP_PX_TO_METRIC_STRING(guide->point_on_line[X],
- SP_ACTIVE_DESKTOP->namedview->getDefaultMetric());
+ namedview->getDefaultMetric());
GString *position_string_y = SP_PX_TO_METRIC_STRING(guide->point_on_line[Y],
- SP_ACTIVE_DESKTOP->namedview->getDefaultMetric());
+ namedview->getDefaultMetric());
gchar *shortcuts = g_strdup_printf("; %s", _("<b>Shift+drag</b> to rotate, <b>Ctrl+drag</b> to move origin, <b>Del</b> to delete"));
gchar *descr;