updated to latest trunk

(bzr r14876.2.4)

1 files changed, 6 insertions, 17 deletions

diff --git a/src/live_effects/lpe-lattice2.cpp b/src/live_effects/lpe-lattice2.cpp
index 0c403daec..e827491c0 100644
--- a/src/live_effects/lpe-lattice2.cpp
+++ b/src/live_effects/lpe-lattice2.cpp
@@ -6,7 +6,7 @@
  * Authors:
  *   Johan Engelen <j.b.c.engelen@utwente.nl>
  *   Steren Giannini
- *   Noé Falzon
+ *   No� Falzon
  *   Victor Navez
  *   ~suv
  *   Jabiertxo Arraiza
@@ -16,26 +16,15 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <gtkmm.h>
 #include "live_effects/lpe-lattice2.h"
-
-#include <gtkmm/expander.h>
-
-#include "sp-shape.h"
-#include "sp-item.h"
-#include "sp-path.h"
 #include "display/curve.h"
-#include "svg/svg.h"
 #include "helper/geom.h"
-#include <2geom/path.h>
-#include <2geom/sbasis.h>
 #include <2geom/sbasis-2d.h>
-#include "helper/geom-curves.h"
-#include <2geom/sbasis-geometric.h>
 #include <2geom/bezier-to-sbasis.h>
-#include <2geom/sbasis-to-bezier.h>
-#include <2geom/d2.h>
-#include <2geom/piecewise.h>
-#include <2geom/transforms.h>
+
+// TODO due to internal breakage in glibmm headers, this must be last:
+#include <glibmm/i18n.h>
 
 using namespace Geom;
 
@@ -280,7 +269,7 @@ void
 LPELattice2::onExpanderChanged()
 {
     expanded = expander->get_expanded();
-    if(expander->get_expanded()) {
+    if(expanded) {
         expander->set_label (Glib::ustring(_("Hide Points")));
     } else {
         expander->set_label (Glib::ustring(_("Show Points")));