new files

(bzr r114)

3 files changed, 133 insertions, 118 deletions

diff --git a/src/make.dep b/src/make.dep
index 7ac478143..bcc3a6b81 100644
--- a/src/make.dep
+++ b/src/make.dep
@@ -1,7 +1,7 @@
 ########################################################
 ## File: make.dep
 ## Purpose: Dependency listing for use by Makefiles
-## Generated by mkdep.pl at :Mon Jan 16 09:58:02 2006
+## Generated by mkdep.pl at :Tue Feb  7 21:04:24 2006
 ## Do not edit this file! Changes will be lost.
 ########################################################
 
@@ -172,6 +172,7 @@ arc-context.o: \
 	message.h \
 	object-edit.h \
 	object-snapper.h \
+	pixmaps/cursor-ellipse.xpm \
 	prefs-utils.h \
 	round.h \
 	selection.h \
@@ -216,8 +217,9 @@ composite-undo-stack-observer.o: \
 	composite-undo-stack-observer.cpp \
 	composite-undo-stack-observer.h \
 	debug/event.h \
+	gc-core.h \
 	undo-stack-observer.h \
-	util/shared-c-string-ptr.h
+	util/share.h
 
 conn-avoid-ref.o: \
 	conn-avoid-ref.cpp \
@@ -226,6 +228,9 @@ conn-avoid-ref.o: \
 	debug/event.h \
 	debug/logger.h \
 	decimal-round.h \
+	desktop-handles.h \
+	desktop.h \
+	display/display-forward.h \
 	display/nr-arena-forward.h \
 	document.h \
 	forward.h \
@@ -233,6 +238,10 @@ conn-avoid-ref.o: \
 	gc-core.h \
 	gc-finalized.h \
 	gc-managed.h \
+	grid-snapper.h \
+	guide-snapper.h \
+	helper/helper-forward.h \
+	inkscape.h \
 	libavoid/geometry.h \
 	libavoid/geomtypes.h \
 	libavoid/incremental.h \
@@ -258,6 +267,7 @@ conn-avoid-ref.o: \
 	libnr/nr-forward.h \
 	libnr/nr-i-coord.h \
 	libnr/nr-macros.h \
+	libnr/nr-matrix-fns.h \
 	libnr/nr-matrix.h \
 	libnr/nr-maybe.h \
 	libnr/nr-point-fns.h \
@@ -270,14 +280,25 @@ conn-avoid-ref.o: \
 	libnr/nr-scale.h \
 	libnr/nr-translate.h \
 	libnr/nr-values.h \
+	line-snapper.h \
+	message.h \
+	object-snapper.h \
+	prefs-utils.h \
 	round.h \
+	snapped-point.h \
+	snapper.h \
 	sp-item.h \
+	sp-metric.h \
+	sp-namedview.h \
+	sp-object-group.h \
 	sp-object.h \
 	traits/reference.h \
+	ui/view/edit-widget-interface.h \
+	ui/view/view.h \
 	util/forward-pointer-iterator.h \
 	util/list-container.h \
 	util/list.h \
-	util/shared-c-string-ptr.h \
+	util/share.h \
 	version.h \
 	xml/attribute-record.h \
 	xml/composite-node-observer.h \
@@ -370,6 +391,7 @@ connector-context.o: \
 	message-context.h \
 	message-stack.h \
 	message.h \
+	pixmaps/cursor-connector.xpm \
 	prefs-utils.h \
 	round.h \
 	selection.h \
@@ -448,7 +470,7 @@ debug/heap.o: \
 	debug/sysv-heap.h \
 	gc-alloc.h \
 	gc-core.h \
-	util/shared-c-string-ptr.h
+	util/share.h
 
 debug/logger.o: \
 	debug/logger.cpp \
@@ -457,13 +479,14 @@ debug/logger.o: \
 	debug/simple-event.h \
 	gc-alloc.h \
 	gc-core.h \
-	util/shared-c-string-ptr.h
+	util/share.h
 
 debug/sysv-heap.o: \
 	debug/sysv-heap.cpp \
 	debug/heap.h \
 	debug/sysv-heap.h \
-	util/shared-c-string-ptr.h
+	gc-core.h \
+	util/share.h
 
 desktop-affine.o: \
 	desktop-affine.cpp \
@@ -1001,81 +1024,6 @@ dialogs/dialog-events.o: \
 	ui/view/edit-widget-interface.h \
 	ui/view/view.h
 
-dialogs/display-settings.o: \
-	dialogs/display-settings.cpp \
-	color.h \
-	decimal-round.h \
-	desktop-handles.h \
-	desktop.h \
-	dialogs/dialog-events.h \
-	display/display-forward.h \
-	document.h \
-	enums.h \
-	forward.h \
-	gc-anchored.h \
-	gc-core.h \
-	gc-finalized.h \
-	gc-managed.h \
-	helper/helper-forward.h \
-	helper/window.h \
-	inkscape.h \
-	interface.h \
-	libcroco/cr-additional-sel.h \
-	libcroco/cr-attr-sel.h \
-	libcroco/cr-cascade.h \
-	libcroco/cr-declaration.h \
-	libcroco/cr-num.h \
-	libcroco/cr-parsing-location.h \
-	libcroco/cr-pseudo.h \
-	libcroco/cr-rgb.h \
-	libcroco/cr-selector.h \
-	libcroco/cr-simple-sel.h \
-	libcroco/cr-statement.h \
-	libcroco/cr-string.h \
-	libcroco/cr-stylesheet.h \
-	libcroco/cr-term.h \
-	libcroco/cr-utils.h \
-	libnr/nr-convex-hull.h \
-	libnr/nr-coord.h \
-	libnr/nr-dim2.h \
-	libnr/nr-forward.h \
-	libnr/nr-i-coord.h \
-	libnr/nr-macros.h \
-	libnr/nr-matrix-fns.h \
-	libnr/nr-matrix.h \
-	libnr/nr-maybe.h \
-	libnr/nr-point-fns.h \
-	libnr/nr-point-matrix-ops.h \
-	libnr/nr-point-ops.h \
-	libnr/nr-point.h \
-	libnr/nr-rect.h \
-	libnr/nr-rotate.h \
-	libnr/nr-scale.h \
-	libnr/nr-translate.h \
-	libnr/nr-values.h \
-	macros.h \
-	message-stack.h \
-	message.h \
-	prefs-utils.h \
-	require-config.h \
-	round.h \
-	selcue.h \
-	selection-chemistry.h \
-	selection.h \
-	sp-marker-loc.h \
-	style.h \
-	traits/reference.h \
-	ui/view/edit-widget-interface.h \
-	ui/view/view.h \
-	ui/widget/button.h \
-	ui/widget/style-swatch.h \
-	unit-constants.h \
-	util/list.h \
-	verbs.h \
-	xml/node.h \
-	xml/repr.h \
-	xml/sp-css-attr.h
-
 dialogs/eek-preview.o: \
 	dialogs/eek-preview.cpp \
 	dialogs/eek-preview.h
@@ -3138,7 +3086,7 @@ document-undo.o: \
 	undo-stack-observer.h \
 	util/forward-pointer-iterator.h \
 	util/list.h \
-	util/shared-c-string-ptr.h \
+	util/share.h \
 	version.h \
 	xml/event-fns.h \
 	xml/node.h \
@@ -4774,6 +4722,9 @@ dom/xpathparser.o: \
 	dom/domstring.h \
 	dom/xpathparser.h
 
+doxygen-main.o: \
+	doxygen-main.cpp
+
 draw-anchor.o: \
 	draw-anchor.cpp \
 	decimal-round.h \
@@ -4992,6 +4943,7 @@ dropper-context.o: \
 	message-context.h \
 	message.h \
 	object-snapper.h \
+	pixmaps/cursor-dropper.xpm \
 	prefs-utils.h \
 	round.h \
 	selection.h \
@@ -5081,6 +5033,7 @@ dyna-draw-context.o: \
 	macros.h \
 	message-context.h \
 	message.h \
+	pixmaps/cursor-calligraphy.xpm \
 	round.h \
 	selection.h \
 	sp-item.h \
@@ -5286,7 +5239,6 @@ extension/error-file.o: \
 	extension/error-file.h \
 	extension/extension-forward.h \
 	extension/extension.h \
-	forward.h \
 	gc-anchored.h \
 	gc-core.h \
 	gc-finalized.h \
@@ -5647,6 +5599,7 @@ extension/internal/bluredge.o: \
 	extension/extension.h \
 	extension/implementation/implementation.h \
 	extension/internal/bluredge.h \
+	extension/internal/clear-n_.h \
 	extension/system.h \
 	forward.h \
 	gc-anchored.h \
@@ -5718,6 +5671,7 @@ extension/internal/eps-out.o: \
 	extension/extension-forward.h \
 	extension/extension.h \
 	extension/implementation/implementation.h \
+	extension/internal/clear-n_.h \
 	extension/internal/eps-out.h \
 	extension/output.h \
 	extension/print.h \
@@ -5766,6 +5720,7 @@ extension/internal/gdkpixbuf-input.o: \
 	extension/extension-forward.h \
 	extension/extension.h \
 	extension/implementation/implementation.h \
+	extension/internal/clear-n_.h \
 	extension/internal/gdkpixbuf-input.h \
 	extension/system.h \
 	forward.h \
@@ -5830,6 +5785,7 @@ extension/internal/gimpgrad.o: \
 	extension/extension-forward.h \
 	extension/extension.h \
 	extension/implementation/implementation.h \
+	extension/internal/clear-n_.h \
 	extension/internal/gimpgrad.h \
 	extension/system.h \
 	forward.h \
@@ -5874,6 +5830,7 @@ extension/internal/grid.o: \
 	extension/extension-forward.h \
 	extension/extension.h \
 	extension/implementation/implementation.h \
+	extension/internal/clear-n_.h \
 	extension/internal/grid.h \
 	extension/system.h \
 	forward.h \
@@ -5943,6 +5900,7 @@ extension/internal/latex-pstricks-out.o: \
 	extension/extension-forward.h \
 	extension/extension.h \
 	extension/implementation/implementation.h \
+	extension/internal/clear-n_.h \
 	extension/internal/latex-pstricks-out.h \
 	extension/print.h \
 	extension/system.h \
@@ -6020,6 +5978,7 @@ extension/internal/latex-pstricks.o: \
 	extension/extension-forward.h \
 	extension/extension.h \
 	extension/implementation/implementation.h \
+	extension/internal/clear-n_.h \
 	extension/internal/latex-pstricks.h \
 	extension/print.h \
 	extension/system.h \
@@ -6088,6 +6047,7 @@ extension/internal/pov-out.o: \
 	extension/extension-forward.h \
 	extension/extension.h \
 	extension/implementation/implementation.h \
+	extension/internal/clear-n_.h \
 	extension/internal/pov-out.h \
 	extension/system.h \
 	forward.h \
@@ -6159,6 +6119,7 @@ extension/internal/ps-out.o: \
 	extension/extension-forward.h \
 	extension/extension.h \
 	extension/implementation/implementation.h \
+	extension/internal/clear-n_.h \
 	extension/internal/ps-out.h \
 	extension/output.h \
 	extension/print.h \
@@ -6211,6 +6172,7 @@ extension/internal/ps.o: \
 	extension/extension-forward.h \
 	extension/extension.h \
 	extension/implementation/implementation.h \
+	extension/internal/clear-n_.h \
 	extension/internal/ps.h \
 	extension/print.h \
 	extension/system.h \
@@ -6307,6 +6269,7 @@ extension/internal/svg.o: \
 	dom/views.h \
 	extension/extension-forward.h \
 	extension/extension.h \
+	extension/internal/clear-n_.h \
 	extension/output.h \
 	extension/system.h \
 	file.h \
@@ -6354,6 +6317,7 @@ extension/internal/svgz.o: \
 	dom/views.h \
 	extension/extension-forward.h \
 	extension/extension.h \
+	extension/internal/clear-n_.h \
 	extension/internal/svgz.h \
 	extension/system.h \
 	gc-anchored.h \
@@ -6392,6 +6356,7 @@ extension/internal/win32.o: \
 	extension/extension-forward.h \
 	extension/extension.h \
 	extension/implementation/implementation.h \
+	extension/internal/clear-n_.h \
 	extension/internal/win32.h \
 	extension/print.h \
 	extension/system.h \
@@ -7015,6 +6980,7 @@ gradient-context.o: \
 	message-context.h \
 	message-stack.h \
 	message.h \
+	pixmaps/cursor-gradient.xpm \
 	prefs-utils.h \
 	round.h \
 	selection.h \
@@ -7197,7 +7163,6 @@ help.o: \
 	help.cpp \
 	extension/extension-forward.h \
 	file.h \
-	forward.h \
 	help.h \
 	path-prefix.h \
 	prefix.h \
@@ -7329,7 +7294,6 @@ helper/window.o: \
 	decimal-round.h \
 	desktop.h \
 	event-context.h \
-	forward.h \
 	gc-anchored.h \
 	gc-core.h \
 	gc-finalized.h \
@@ -7439,7 +7403,7 @@ inkscape.o: \
 	ui/view/edit-widget-interface.h \
 	ui/view/view.h \
 	util/list.h \
-	util/shared-c-string-ptr.h \
+	util/share.h \
 	xml/node.h \
 	xml/repr.h \
 	xml/sp-css-attr.h
@@ -9797,6 +9761,8 @@ node-context.o: \
 	nodepath.h \
 	object-edit.h \
 	path-chemistry.h \
+	pixmaps/cursor-node-d.xpm \
+	pixmaps/cursor-node.xpm \
 	prefs-utils.h \
 	round.h \
 	rubberband.h \
@@ -10339,6 +10305,7 @@ pen-context.o: \
 	message.h \
 	object-snapper.h \
 	pen-context.h \
+	pixmaps/cursor-pen.xpm \
 	prefs-utils.h \
 	round.h \
 	selection.h \
@@ -10413,6 +10380,7 @@ pencil-context.o: \
 	message.h \
 	modifier-fns.h \
 	pencil-context.h \
+	pixmaps/cursor-pencil.xpm \
 	prefs-utils.h \
 	round.h \
 	selection.h \
@@ -10436,7 +10404,6 @@ preferences.o: \
 	preferences.cpp \
 	dialogs/input.h \
 	document.h \
-	forward.h \
 	gc-anchored.h \
 	gc-core.h \
 	gc-finalized.h \
@@ -10474,7 +10441,6 @@ prefix.o: \
 prefs-utils.o: \
 	prefs-utils.cpp \
 	document.h \
-	forward.h \
 	gc-anchored.h \
 	gc-core.h \
 	gc-finalized.h \
@@ -10606,6 +10572,7 @@ rect-context.o: \
 	message.h \
 	object-edit.h \
 	object-snapper.h \
+	pixmaps/cursor-rect.xpm \
 	prefs-utils.h \
 	rect-context.h \
 	round.h \
@@ -10657,12 +10624,14 @@ removeoverlap/blocks.o: \
 
 removeoverlap/constraint.o: \
 	removeoverlap/constraint.cpp \
+	removeoverlap/block.h \
 	removeoverlap/constraint.h \
 	removeoverlap/variable.h
 
 removeoverlap/generate-constraints.o: \
 	removeoverlap/generate-constraints.cpp \
 	isnan.h \
+	removeoverlap/block.h \
 	removeoverlap/constraint.h \
 	removeoverlap/generate-constraints.h \
 	removeoverlap/variable.h
@@ -10675,6 +10644,8 @@ removeoverlap/pairingheap/PairingHeap.o: \
 
 removeoverlap/remove_rectangle_overlap.o: \
 	removeoverlap/remove_rectangle_overlap.cpp \
+	removeoverlap/block.h \
+	removeoverlap/blocks.h \
 	removeoverlap/constraint.h \
 	removeoverlap/generate-constraints.h \
 	removeoverlap/solve_VPSC.h \
@@ -10906,6 +10877,9 @@ select-context.o: \
 	message-context.h \
 	message-stack.h \
 	message.h \
+	pixmaps/cursor-select-d.xpm \
+	pixmaps/cursor-select-m.xpm \
+	pixmaps/handles.xpm \
 	prefs-utils.h \
 	round.h \
 	rubberband.h \
@@ -12259,6 +12233,7 @@ sp-guide.o: \
 sp-image.o: \
 	sp-image.cpp \
 	attributes.h \
+	brokenimage.xpm \
 	decimal-round.h \
 	display/nr-arena-forward.h \
 	display/nr-arena-image.h \
@@ -12921,6 +12896,7 @@ sp-metrics.o: \
 sp-namedview.o: \
 	sp-namedview.cpp \
 	attributes.h \
+	conn-avoid-ref.h \
 	decimal-round.h \
 	desktop-events.h \
 	desktop-handles.h \
@@ -13211,7 +13187,7 @@ sp-object.o: \
 	traits/reference.h \
 	util/forward-pointer-iterator.h \
 	util/list.h \
-	util/shared-c-string-ptr.h \
+	util/share.h \
 	version.h \
 	xml/node-event-vector.h \
 	xml/node-fns.h \
@@ -14337,6 +14313,7 @@ sp-tspan.o: \
 	sp-tspan.cpp \
 	attributes.h \
 	bad-uri-exception.h \
+	color.h \
 	decimal-round.h \
 	display/nr-arena-forward.h \
 	document.h \
@@ -14369,6 +14346,7 @@ sp-tspan.o: \
 	libnr/nr-forward.h \
 	libnr/nr-i-coord.h \
 	libnr/nr-macros.h \
+	libnr/nr-matrix-fns.h \
 	libnr/nr-matrix-ops.h \
 	libnr/nr-matrix.h \
 	libnr/nr-maybe.h \
@@ -14388,13 +14366,16 @@ sp-tspan.o: \
 	livarot/livarot-forward.h \
 	round.h \
 	sp-item.h \
+	sp-marker-loc.h \
 	sp-object.h \
 	sp-string.h \
 	sp-text.h \
 	sp-textpath.h \
 	sp-tspan.h \
 	sp-use-reference.h \
+	style.h \
 	svg/svg-length.h \
+	text-editing.h \
 	text-tag-attributes.h \
 	traits/reference.h \
 	uri-references.h \
@@ -14598,6 +14579,7 @@ spiral-context.o: \
 	message.h \
 	object-edit.h \
 	object-snapper.h \
+	pixmaps/cursor-spiral.xpm \
 	prefs-utils.h \
 	round.h \
 	selection.h \
@@ -14792,6 +14774,7 @@ star-context.o: \
 	message.h \
 	object-edit.h \
 	object-snapper.h \
+	pixmaps/cursor-star.xpm \
 	prefs-utils.h \
 	round.h \
 	selection.h \
@@ -15312,6 +15295,8 @@ text-context.o: \
 	message.h \
 	object-edit.h \
 	object-snapper.h \
+	pixmaps/cursor-text-insert.xpm \
+	pixmaps/cursor-text.xpm \
 	prefs-utils.h \
 	round.h \
 	rubberband.h \
@@ -15413,7 +15398,7 @@ text-editing.o: \
 	unit-constants.h \
 	util/forward-pointer-iterator.h \
 	util/list.h \
-	util/shared-c-string-ptr.h \
+	util/share.h \
 	version.h \
 	xml/attribute-record.h \
 	xml/node.h \
@@ -16313,6 +16298,7 @@ ui/dialog/inkscape-preferences.o: \
 	color.h \
 	decimal-round.h \
 	desktop-handles.h \
+	desktop.h \
 	display/display-forward.h \
 	document.h \
 	enums.h \
@@ -16344,6 +16330,7 @@ ui/dialog/inkscape-preferences.o: \
 	libnr/nr-forward.h \
 	libnr/nr-i-coord.h \
 	libnr/nr-macros.h \
+	libnr/nr-matrix-fns.h \
 	libnr/nr-matrix.h \
 	libnr/nr-maybe.h \
 	libnr/nr-point-fns.h \
@@ -16368,7 +16355,11 @@ ui/dialog/inkscape-preferences.o: \
 	traits/reference.h \
 	ui/dialog/dialog.h \
 	ui/dialog/inkscape-preferences.h \
+	ui/view/edit-widget-interface.h \
+	ui/view/view.h \
+	ui/widget/button.h \
 	ui/widget/preferences-widget.h \
+	ui/widget/style-swatch.h \
 	util/list.h \
 	verbs.h \
 	xml/node.h \
@@ -16393,7 +16384,7 @@ ui/dialog/memory.o: \
 	require-config.h \
 	ui/dialog/dialog.h \
 	ui/dialog/memory.h \
-	util/shared-c-string-ptr.h \
+	util/share.h \
 	verbs.h
 
 ui/dialog/messages.o: \
@@ -17219,7 +17210,6 @@ ui/widget/entity-entry.o: \
 	ui/widget/entity-entry.cpp \
 	dialogs/rdf.h \
 	document.h \
-	forward.h \
 	gc-anchored.h \
 	gc-core.h \
 	gc-finalized.h \
@@ -17256,7 +17246,6 @@ ui/widget/imageicon.o: \
 	ui/widget/imageicon.cpp \
 	display/display-forward.h \
 	document.h \
-	forward.h \
 	gc-anchored.h \
 	gc-core.h \
 	gc-finalized.h \
@@ -17291,7 +17280,6 @@ ui/widget/licensor.o: \
 	ui/widget/licensor.cpp \
 	dialogs/rdf.h \
 	document.h \
-	forward.h \
 	gc-anchored.h \
 	gc-core.h \
 	gc-finalized.h \
@@ -17969,10 +17957,10 @@ util/list-container-test.o: \
 	util/list-container.h \
 	util/list.h
 
-util/shared-c-string-ptr.o: \
-	util/shared-c-string-ptr.cpp \
+util/share.o: \
+	util/share.cpp \
 	gc-core.h \
-	util/shared-c-string-ptr.h
+	util/share.h
 
 util/units.o: \
 	util/units.cpp \
@@ -17987,7 +17975,6 @@ verbs.o: \
 	desktop-handles.h \
 	desktop.h \
 	dialogs/clonetiler.h \
-	dialogs/display-settings.h \
 	dialogs/extensions.h \
 	dialogs/find.h \
 	dialogs/iconpreview.h \
@@ -18087,6 +18074,7 @@ verbs.o: \
 	traits/reference.h \
 	ui/dialog/dialog-manager.h \
 	ui/dialog/dialog.h \
+	ui/dialog/inkscape-preferences.h \
 	ui/dialog/whiteboard-connect.h \
 	ui/dialog/whiteboard-sharewithchat.h \
 	ui/dialog/whiteboard-sharewithuser.h \
@@ -18098,6 +18086,7 @@ verbs.o: \
 	ui/view/view.h \
 	ui/widget/button.h \
 	ui/widget/panel.h \
+	ui/widget/preferences-widget.h \
 	util/forward-pointer-iterator.h \
 	util/list.h \
 	verbs.h \
@@ -18152,6 +18141,7 @@ widgets/dash-selector.o: \
 
 widgets/desktop-widget.o: \
 	widgets/desktop-widget.cpp \
+	conn-avoid-ref.h \
 	decimal-round.h \
 	desktop-events.h \
 	desktop-handles.h \
@@ -19219,7 +19209,6 @@ widgets/sp-xmlview-tree.o: \
 widgets/spinbutton-events.o: \
 	widgets/spinbutton-events.cpp \
 	event-context.h \
-	forward.h \
 	widgets/sp-widget.h \
 	widgets/widget-sizes.h
 
@@ -19284,7 +19273,7 @@ xml/composite-node-observer.o: \
 	traits/reference.h \
 	util/list-container.h \
 	util/list.h \
-	util/shared-c-string-ptr.h \
+	util/share.h \
 	xml/composite-node-observer.h \
 	xml/node-event-vector.h \
 	xml/node-observer.h \
@@ -19333,7 +19322,7 @@ xml/event.o: \
 	traits/reference.h \
 	util/list.h \
 	util/reverse-list.h \
-	util/shared-c-string-ptr.h \
+	util/share.h \
 	xml/event-fns.h \
 	xml/node-observer.h
 
@@ -19342,7 +19331,7 @@ xml/log-builder.o: \
 	debug/event.h \
 	gc-core.h \
 	gc-managed.h \
-	util/shared-c-string-ptr.h \
+	util/share.h \
 	xml/event-fns.h \
 	xml/log-builder.h \
 	xml/node-observer.h
@@ -19388,7 +19377,7 @@ xml/repr-css.o: \
 	traits/reference.h \
 	util/list-container.h \
 	util/list.h \
-	util/shared-c-string-ptr.h \
+	util/share.h \
 	xml/attribute-record.h \
 	xml/composite-node-observer.h \
 	xml/node-observer.h \
@@ -19431,7 +19420,7 @@ xml/repr-io.o: \
 	libnr/nr-forward.h \
 	traits/reference.h \
 	util/list.h \
-	util/shared-c-string-ptr.h \
+	util/share.h \
 	xml/attribute-record.h \
 	xml/node.h \
 	xml/repr.h \
@@ -19530,7 +19519,7 @@ xml/repr.o: \
 	traits/reference.h \
 	util/list-container.h \
 	util/list.h \
-	util/shared-c-string-ptr.h \
+	util/share.h \
 	xml/attribute-record.h \
 	xml/comment-node.h \
 	xml/composite-node-observer.h \
@@ -19570,7 +19559,7 @@ xml/simple-document.o: \
 	traits/reference.h \
 	util/list-container.h \
 	util/list.h \
-	util/shared-c-string-ptr.h \
+	util/share.h \
 	xml/attribute-record.h \
 	xml/composite-node-observer.h \
 	xml/log-builder.h \
@@ -19611,7 +19600,7 @@ xml/simple-node.o: \
 	traits/reference.h \
 	util/list-container.h \
 	util/list.h \
-	util/shared-c-string-ptr.h \
+	util/share.h \
 	xml/attribute-record.h \
 	xml/composite-node-observer.h \
 	xml/node-event-vector.h \
@@ -19631,7 +19620,7 @@ xml/simple-session.o: \
 	traits/reference.h \
 	util/list-container.h \
 	util/list.h \
-	util/shared-c-string-ptr.h \
+	util/share.h \
 	xml/attribute-record.h \
 	xml/comment-node.h \
 	xml/composite-node-observer.h \
@@ -19675,6 +19664,8 @@ zoom-context.o: \
 	libnr/nr-values.h \
 	macros.h \
 	message.h \
+	pixmaps/cursor-zoom-out.xpm \
+	pixmaps/cursor-zoom.xpm \
 	prefs-utils.h \
 	round.h \
 	rubberband.h \
diff --git a/src/make.files b/src/make.files
index 05256120e..52dde1e54 100644
--- a/src/make.files
+++ b/src/make.files
@@ -1,7 +1,7 @@
 ########################################################
 ## File: make.files
 ## Purpose: Used by mkdep.pl
-## Generated by mkfiles.pl at :Mon Jan 16 09:57:30 2006
+## Generated by mkfiles.pl at :Tue Feb  7 21:03:56 2006
 ########################################################
 
 algorithms/find-if-before.h
@@ -20,6 +20,7 @@ attributes-test.cpp
 attributes.cpp
 attributes.h
 bad-uri-exception.h
+brokenimage.xpm
 color-rgba.h
 color.cpp
 color.h
@@ -58,8 +59,6 @@ dialogs/debugdialog.cpp
 dialogs/debugdialog.h
 dialogs/dialog-events.cpp
 dialogs/dialog-events.h
-dialogs/display-settings.cpp
-dialogs/display-settings.h
 dialogs/eek-preview.cpp
 dialogs/eek-preview.h
 dialogs/export.cpp
@@ -369,6 +368,7 @@ dom/xpathimpl.cpp
 dom/xpathimpl.h
 dom/xpathparser.cpp
 dom/xpathparser.h
+doxygen-main.cpp
 draw-anchor.cpp
 draw-anchor.h
 draw-context.cpp
@@ -404,6 +404,7 @@ extension/input.cpp
 extension/input.h
 extension/internal/bluredge.cpp
 extension/internal/bluredge.h
+extension/internal/clear-n_.h
 extension/internal/eps-out.cpp
 extension/internal/eps-out.h
 extension/internal/gdkpixbuf-input.cpp
@@ -825,6 +826,28 @@ pen-context.cpp
 pen-context.h
 pencil-context.cpp
 pencil-context.h
+pixmaps/cursor-arc.xpm
+pixmaps/cursor-arrow.xpm
+pixmaps/cursor-calligraphy.xpm
+pixmaps/cursor-connector.xpm
+pixmaps/cursor-dropper.xpm
+pixmaps/cursor-ellipse.xpm
+pixmaps/cursor-gradient.xpm
+pixmaps/cursor-node-d.xpm
+pixmaps/cursor-node-m.xpm
+pixmaps/cursor-node.xpm
+pixmaps/cursor-pen.xpm
+pixmaps/cursor-pencil.xpm
+pixmaps/cursor-rect.xpm
+pixmaps/cursor-select-d.xpm
+pixmaps/cursor-select-m.xpm
+pixmaps/cursor-spiral.xpm
+pixmaps/cursor-star.xpm
+pixmaps/cursor-text-insert.xpm
+pixmaps/cursor-text.xpm
+pixmaps/cursor-zoom-out.xpm
+pixmaps/cursor-zoom.xpm
+pixmaps/handles.xpm
 preferences-skeleton.h
 preferences.cpp
 preferences.h
@@ -1225,8 +1248,8 @@ util/list-container.h
 util/list.h
 util/map-list.h
 util/reverse-list.h
-util/shared-c-string-ptr.cpp
-util/shared-c-string-ptr.h
+util/share.cpp
+util/share.h
 util/tuple.h
 util/ucompose.hpp
 util/units.cpp
diff --git a/src/make.ofiles b/src/make.ofiles
index 389f82a1e..2e95eb9c4 100644
--- a/src/make.ofiles
+++ b/src/make.ofiles
@@ -1,7 +1,7 @@
 ########################################################
 ## File: make.ofiles
 ## Purpose: Object file listing for use by Makefiles
-## Generated by mkdep.pl at :Mon Jan 16 09:57:35 2006
+## Generated by mkdep.pl at :Tue Feb  7 21:03:57 2006
 ## Do not edit this file! Changes will be lost.
 ########################################################
 
@@ -28,7 +28,6 @@ OBJECTS = \
 	dialogs/clonetiler.o \
 	dialogs/debugdialog.o \
 	dialogs/dialog-events.o \
-	dialogs/display-settings.o \
 	dialogs/eek-preview.o \
 	dialogs/export.o \
 	dialogs/extensions.o \
@@ -212,6 +211,7 @@ OBJECTS = \
 	dom/xmlreader.o \
 	dom/xpathimpl.o \
 	dom/xpathparser.o \
+	doxygen-main.o \
 	draw-anchor.o \
 	draw-context.o \
 	dropper-context.o \
@@ -586,7 +586,7 @@ OBJECTS = \
 	uri-references.o \
 	uri.o \
 	util/list-container-test.o \
-	util/shared-c-string-ptr.o \
+	util/share.o \
 	util/units.o \
 	verbs.o \
 	version.o \
@@ -658,7 +658,6 @@ LINTS = \
 	dialogs/clonetiler.lint \
 	dialogs/debugdialog.lint \
 	dialogs/dialog-events.lint \
-	dialogs/display-settings.lint \
 	dialogs/eek-preview.lint \
 	dialogs/export.lint \
 	dialogs/extensions.lint \
@@ -842,6 +841,7 @@ LINTS = \
 	dom/xmlreader.lint \
 	dom/xpathimpl.lint \
 	dom/xpathparser.lint \
+	doxygen-main.lint \
 	draw-anchor.lint \
 	draw-context.lint \
 	dropper-context.lint \
@@ -1216,7 +1216,7 @@ LINTS = \
 	uri-references.lint \
 	uri.lint \
 	util/list-container-test.lint \
-	util/shared-c-string-ptr.lint \
+	util/share.lint \
 	util/units.lint \
 	verbs.lint \
 	version.lint \
@@ -1290,6 +1290,7 @@ INCLUDEPATH = \
 	-Ilibnr \
 	-Ilibnrtype \
 	-Ilivarot \
+	-Ipixmaps \
 	-Iremoveoverlap \
 	-Iremoveoverlap/pairingheap \
 	-Iremoveoverlap \