diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-12-05 22:55:57 +0000 |
|---|---|---|
| committer | jabiertxof <jabier.arraiza@marker.es> | 2015-12-05 22:55:57 +0000 |
| commit | e649a1d9cd29f39b2d1cf343cec97ccebce9cf08 (patch) | |
| tree | ecd97a46bd8a11da9941374d93eb1c32240394a6 /src/sp-guide.cpp | |
| parent | update to trunk (diff) | |
| download | inkscape-e649a1d9cd29f39b2d1cf343cec97ccebce9cf08.tar.gz inkscape-e649a1d9cd29f39b2d1cf343cec97ccebce9cf08.zip | |
Changed from Desktop to namedview to handle multiples documents
(bzr r14500.1.8)
Diffstat (limited to 'src/sp-guide.cpp')
| -rw-r--r-- | src/sp-guide.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp index 00ded2a75..fd07f76ef 100644 --- a/src/sp-guide.cpp +++ b/src/sp-guide.cpp @@ -118,7 +118,6 @@ void SPGuide::set(unsigned int key, const gchar *value) { break; case SP_ATTR_INKSCAPE_LOCKED: this->locked = helperfns_read_bool(value, false); - this->hicolor = this->color; if (value) { this->set_locked(this->locked, false); } @@ -349,9 +348,7 @@ double SPGuide::getDistanceFrom(Geom::Point const &pt) const */ void SPGuide::moveto(Geom::Point const point_on_line, bool const commit) { - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - bool global_lock = prefs->getBool("/options/guides/guides_lock", false); - if(this->locked || global_lock) { + if(this->locked) { return; } for (GSList *l = views; l != NULL; l = l->next) { |