* src/document.cpp, src/document.h, src/sp-conn-end-pair.cpp,

       src/connector-context.cpp, src/conn-avoid-ref.cpp:

    Keep a seperate connector router for each document.
       
    *  src/libavoid/Makefile_insert, src/libavoid/connector.cpp,
       src/libavoid/connector.h, src/libavoid/debug.h,
       src/libavoid/geometry.cpp, src/libavoid/geometry.h,
       src/libavoid/geomtypes.h, src/libavoid/graph.cpp,
       src/libavoid/graph.h, src/libavoid/incremental.cpp,
       src/libavoid/incremental.h, src/libavoid/libavoid.h,
       src/libavoid/makepath.cpp, src/libavoid/makepath.h,
       src/libavoid/polyutil.cpp, src/libavoid/polyutil.h,
       src/libavoid/router.cpp, src/libavoid/router.h,
       src/libavoid/shape.cpp, src/libavoid/shape.h,
       src/libavoid/static.cpp, src/libavoid/static.h,
       src/libavoid/timer.cpp, src/libavoid/timer.h,
       src/libavoid/vertices.cpp, src/libavoid/vertices.h,
       src/libavoid/visibility.cpp, src/libavoid/visibility.h:
       
    Upstream changes to libavoid that allow multiple connector 
    router instances, as well a few other minor bugfixes.

(bzr r144)

1 files changed, 7 insertions, 0 deletions

diff --git a/src/document.h b/src/document.h
index da8b656ef..7cf1dc2de 100644
--- a/src/document.h
+++ b/src/document.h
@@ -27,6 +27,10 @@
 #include "gc-finalized.h"
 #include "gc-anchored.h"
 
+namespace Avoid {
+class Router;
+}
+
 struct SPDesktop;
 struct SPItem;
 struct SPObject;
@@ -79,6 +83,9 @@ struct SPDocument : public Inkscape::GC::Managed<>,
 	/// Handler ID
 	guint modified_id;
 
+	// Instance of the connector router
+	Avoid::Router *router;
+
 	sigc::connection connectModified(ModifiedSignal::slot_type slot);
 	sigc::connection connectURISet(URISetSignal::slot_type slot);
 	sigc::connection connectResized(ResizedSignal::slot_type slot);