Update to trunk

(bzr r13090.1.72)

3 files changed, 9 insertions, 6 deletions

diff --git a/src/extension/dbus/document-interface.cpp b/src/extension/dbus/document-interface.cpp
index 221a3e879..e3452f4ce 100644
--- a/src/extension/dbus/document-interface.cpp
+++ b/src/extension/dbus/document-interface.cpp
@@ -169,7 +169,7 @@ selection_get_center_x (Inkscape::Selection *sel){
 gdouble
 selection_get_center_y (Inkscape::Selection *sel){
     Geom::OptRect box = sel->documentBounds(SPItem::GEOMETRIC_BBOX);
-    return box ? box->midpoint()[Geom::X] : 0;
+    return box ? box->midpoint()[Geom::Y] : 0;
 }
 
 /* 
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 559398a84..b6095fa8b 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -500,10 +500,12 @@ void InkscapePreferences::initPageTools()
     _page_connector.add_line(false, "", _connector_ignore_text, "",
             _("If on, connector attachment points will not be shown for text objects"));
 
+#ifdef WITH_LPETOOL
     //LPETool
-    // commented out, because the LPETool is not finished yet.
-    //this->AddPage(_page_lpetool, _("LPE Tool"), iter_tools, PREFS_PAGE_TOOLS_LPETOOL);
-    //this->AddNewObjectsStyle(_page_lpetool, "/tools/lpetool");
+    //disabled, because the LPETool is not finished yet.
+    this->AddPage(_page_lpetool, _("LPE Tool"), iter_tools, PREFS_PAGE_TOOLS_LPETOOL);
+    this->AddNewObjectsStyle(_page_lpetool, "/tools/lpetool");
+#endif // WITH_LPETOOL
 }
 
 void InkscapePreferences::initPageUI()
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 02da805bf..3d6f73ef1 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -1301,8 +1301,9 @@ void setup_tool_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
         "    <toolitem action='ToolDropper' />"
 
         "    <toolitem action='ToolConnector' />"
-
-//        "    <toolitem action='ToolLPETool' />"
+#ifdef WITH_LPETOOL
+        "    <toolitem action='ToolLPETool' />"
+#endif
         "  </toolbar>"
         "</ui>";