Merge experimental

(bzr r13641)

1 files changed, 7 insertions, 11 deletions

diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index a01ba891e..8b28347f1 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -935,7 +935,7 @@ void SPNamedView::hide(SPDesktop const *desktop)
     views = g_slist_remove(views, desktop);
 }
 
-void SPNamedView::activateGuides(gpointer desktop, gboolean active)
+void SPNamedView::activateGuides(void* desktop, bool active)
 {
     g_assert(desktop != NULL);
     g_assert(g_slist_find(views, desktop));
@@ -956,14 +956,10 @@ static void sp_namedview_setup_guides(SPNamedView *nv)
 
 static void sp_namedview_show_single_guide(SPGuide* guide, bool show)
 {
-    for (GSList *v = guide->views; v != NULL; v = v->next) {
-        if (show) {
-            sp_canvas_item_show(SP_CANVAS_ITEM(v->data));
-            sp_canvas_item_show(SP_CANVAS_ITEM(SP_GUIDELINE(v->data)->origin));
-        } else {
-            sp_canvas_item_hide(SP_CANVAS_ITEM(v->data));
-            sp_canvas_item_hide(SP_CANVAS_ITEM(SP_GUIDELINE(v->data)->origin));
-        }
+    if (show) {
+        guide->showSPGuide();
+    } else {
+        guide->hideSPGuide();
     }
 }
 
@@ -1156,9 +1152,9 @@ Inkscape::CanvasGrid * sp_namedview_get_first_enabled_grid(SPNamedView *namedvie
 void SPNamedView::translateGuides(Geom::Translate const &tr) {
     for (GSList *l = guides; l != NULL; l = l->next) {
         SPGuide &guide = *SP_GUIDE(l->data);
-        Geom::Point point_on_line = guide.point_on_line;
+        Geom::Point point_on_line = guide.getPoint();
         point_on_line *= tr;
-        sp_guide_moveto(guide, point_on_line, true);
+        guide.moveto(point_on_line, true);
     }
 }