From 1aa94f627221dff927966c6df8f9e53d917b57df Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Fri, 15 Jan 2016 22:17:48 -0500 Subject: Remove buggy and presumptuous usage of SP_ACTIVE_DESKTOP in renderer code; fixes 1526701 Fixed bugs: - https://launchpad.net/bugs/1526701 (bzr r14585.1.1) --- src/sp-guide.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/sp-guide.cpp') diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp index a57947e01..2bfd0c656 100644 --- a/src/sp-guide.cpp +++ b/src/sp-guide.cpp @@ -25,6 +25,7 @@ #include "display/sp-canvas.h" #include "display/guideline.h" +#include "display/sodipodi-ctrl.h" #include "svg/svg.h" #include "svg/svg-color.h" #include "svg/stringstream.h" @@ -289,7 +290,7 @@ void SPGuide::showSPGuide() for(std::vector::const_iterator it = this->views.begin(); it != this->views.end(); ++it) { sp_canvas_item_show(SP_CANVAS_ITEM(*it)); if((*it)->origin) { - (*it)->origin->show(); + sp_canvas_item_show(SP_CANVAS_ITEM((*it)->origin)); } else { //reposition to same place to show knots sp_guideline_set_position(*it, point_on_line); @@ -317,7 +318,7 @@ void SPGuide::hideSPGuide() for(std::vector::const_iterator it = this->views.begin(); it != this->views.end(); ++it) { sp_canvas_item_hide(SP_CANVAS_ITEM(*it)); if ((*it)->origin) { - (*it)->origin->hide(); + sp_canvas_item_hide(SP_CANVAS_ITEM((*it)->origin)); } } } -- cgit v1.2.3 From 99c7ac2b88a264d1415dacb073b5b1a8da4bf85e Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Sat, 16 Jan 2016 10:56:00 -0500 Subject: Header cleanup (bzr r14585.1.3) --- src/sp-guide.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/sp-guide.cpp') diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp index 2bfd0c656..d1e101fd5 100644 --- a/src/sp-guide.cpp +++ b/src/sp-guide.cpp @@ -25,7 +25,6 @@ #include "display/sp-canvas.h" #include "display/guideline.h" -#include "display/sodipodi-ctrl.h" #include "svg/svg.h" #include "svg/svg-color.h" #include "svg/stringstream.h" -- cgit v1.2.3