Update to trunk

(bzr r12588.1.12)

3 files changed, 7 insertions, 19 deletions

diff --git a/src/ui/tool/node-tool.cpp b/src/ui/tool/node-tool.cpp
index 4b236e94c..76e33e506 100644
--- a/src/ui/tool/node-tool.cpp
+++ b/src/ui/tool/node-tool.cpp
@@ -534,11 +534,7 @@ bool InkNodeTool::root_handler(GdkEvent* event) {
     	break;
     }
     
-//    if (SP_EVENT_CONTEXT_CLASS(ink_node_tool_parent_class)->root_handler)
-//        return SP_EVENT_CONTEXT_CLASS(ink_node_tool_parent_class)->root_handler(event_context, event);
-    SPEventContext::root_handler(event);
-
-    return FALSE;
+    return SPEventContext::root_handler(event);
 }
 
 void InkNodeTool::update_tip(GdkEvent *event) {
@@ -607,12 +603,6 @@ void InkNodeTool::update_tip(GdkEvent *event) {
     }
 }
 
-bool InkNodeTool::item_handler(SPItem* item, GdkEvent* event) {
-	SPEventContext::item_handler(item, event);
-
-    return FALSE;
-}
-
 void InkNodeTool::select_area(Geom::Rect const &sel, GdkEventButton *event) {
     using namespace Inkscape::UI;
 
diff --git a/src/ui/tool/node-tool.h b/src/ui/tool/node-tool.h
index ce022cec6..c41f50650 100644
--- a/src/ui/tool/node-tool.h
+++ b/src/ui/tool/node-tool.h
@@ -49,7 +49,6 @@ public:
 	virtual void setup();
 	virtual void set(const Inkscape::Preferences::Entry& val);
 	virtual bool root_handler(GdkEvent* event);
-	virtual bool item_handler(SPItem* item, GdkEvent* event);
 
 	virtual const std::string& getPrefsPath();
 
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp
index 82eb697bd..76ec68c3e 100644
--- a/src/ui/tool/node.cpp
+++ b/src/ui/tool/node.cpp
@@ -493,9 +493,9 @@ Glib::ustring Handle::_getDragTip(GdkEventMotion */*event*/) const
     Inkscape::Util::Quantity x_q = Inkscape::Util::Quantity(dist[Geom::X], "px");
     Inkscape::Util::Quantity y_q = Inkscape::Util::Quantity(dist[Geom::Y], "px");
     Inkscape::Util::Quantity len_q = Inkscape::Util::Quantity(length(), "px");
-    GString *x = g_string_new(x_q.string(*_desktop->namedview->doc_units).c_str());
-    GString *y = g_string_new(y_q.string(*_desktop->namedview->doc_units).c_str());
-    GString *len = g_string_new(len_q.string(*_desktop->namedview->doc_units).c_str());
+    GString *x = g_string_new(x_q.string(_desktop->namedview->doc_units).c_str());
+    GString *y = g_string_new(y_q.string(_desktop->namedview->doc_units).c_str());
+    GString *len = g_string_new(len_q.string(_desktop->namedview->doc_units).c_str());
     Glib::ustring ret = format_tip(C_("Path handle tip",
         "Move handle by %s, %s; angle %.2f°, length %s"), x->str, y->str, angle, len->str);
     g_string_free(x, TRUE);
@@ -1300,10 +1300,9 @@ Glib::ustring Node::_getDragTip(GdkEventMotion */*event*/) const
     
     Inkscape::Util::Quantity x_q = Inkscape::Util::Quantity(dist[Geom::X], "px");
     Inkscape::Util::Quantity y_q = Inkscape::Util::Quantity(dist[Geom::Y], "px");
-    GString *x = g_string_new(x_q.string(*_desktop->namedview->doc_units).c_str());
-    GString *y = g_string_new(y_q.string(*_desktop->namedview->doc_units).c_str());
-    Glib::ustring ret = format_tip(C_("Path node tip", "Move node by %s, %s"),
-        x->str, y->str);
+    GString *x = g_string_new(x_q.string(_desktop->namedview->doc_units).c_str());
+    GString *y = g_string_new(y_q.string(_desktop->namedview->doc_units).c_str());
+    Glib::ustring ret = format_tip(C_("Path node tip", "Move node by %s, %s"), x->str, y->str);
     g_string_free(x, TRUE);
     g_string_free(y, TRUE);
     return ret;