Clean up some code, only init the SPKnot in one place.

(bzr r14526)

3 files changed, 4 insertions, 19 deletions

diff --git a/src/display/guideline.cpp b/src/display/guideline.cpp
index 1c28149a9..fd6ccf164 100644
--- a/src/display/guideline.cpp
+++ b/src/display/guideline.cpp
@@ -69,16 +69,11 @@ static void sp_guideline_destroy(SPCanvasItem *object)
 {
     g_return_if_fail (object != NULL);
     g_return_if_fail (SP_IS_GUIDELINE (object));
-    //g_return_if_fail (SP_GUIDELINE(object)->origin != NULL);
-    //g_return_if_fail (SP_IS_CTRLPOINT(SP_GUIDELINE(object)->origin));
 
     SPGuideLine *gl = SP_GUIDELINE(object);
 
     if (gl->origin != NULL && SP_IS_KNOT(gl->origin)) {
         knot_unref(gl->origin);
-    } else {
-        // FIXME: This branch shouldn't be reached (although it seems to be harmless).
-        //g_error("Why can it be that gl->origin is not a valid SPCtrlPoint?\n");
     }
 
     if (gl->label) {
@@ -233,16 +228,7 @@ SPCanvasItem *sp_guideline_new(SPCanvasGroup *parent, char* label, Geom::Point p
 {
     SPCanvasItem *item = sp_canvas_item_new(parent, SP_TYPE_GUIDELINE, NULL);
     SPGuideLine *gl = SP_GUIDELINE(item);
-    if ( SP_ACTIVE_DESKTOP ){
-        gl->origin = new SPKnot(SP_ACTIVE_DESKTOP, "No tip yet!! XXX");
 
-        gl->origin->setAnchor(SP_ANCHOR_CENTER);
-        gl->origin->setMode(SP_CTRL_MODE_COLOR);
-        gl->origin->setFill(0xffffff80, 0xffffffff, 0xffffff80);
-        gl->origin->moveto(point_on_line);
-        gl->origin->request_signal.connect(sigc::bind(sigc::ptr_fun(sp_guideline_origin_move), gl));
-        gl->origin->updateCtrl();
-    }
     normal.normalize();
     gl->label = label;
     gl->locked = false;
diff --git a/src/display/guideline.h b/src/display/guideline.h
index 143a57622..d58821fc8 100644
--- a/src/display/guideline.h
+++ b/src/display/guideline.h
@@ -22,14 +22,11 @@
 #define SP_GUIDELINE(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_GUIDELINE, SPGuideLine))
 #define SP_IS_GUIDELINE(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_GUIDELINE))
 
-struct SPCtrlPoint;
-
 struct SPGuideLine {
     SPCanvasItem item;
     Geom::Affine affine;
 
-    //SPCtrlPoint *origin; // unlike 'item', this is only held locally
-    SPKnot *origin;
+    SPKnot *origin; // unlike 'item', this is only held locally
 
     guint32 rgba;
 
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index 065acf586..b8990a461 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -288,7 +288,9 @@ void SPGuide::showSPGuide()
 {
     for(std::vector<SPGuideLine *>::const_iterator it = this->views.begin(); it != this->views.end(); ++it) {
         sp_canvas_item_show(SP_CANVAS_ITEM(*it));
-        (*it)->origin->show();
+        if((*it)->origin) {
+          (*it)->origin->show();
+        }
     }
 }