Start cleanup for merge into trunk

(bzr r13090.1.20)

6 files changed, 25 insertions, 13 deletions

diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 17b229352..2ffff153c 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -47,7 +47,7 @@
 #include "live_effects/lpe-extrude.h"
 #include "live_effects/lpe-powerstroke.h"
 #include "live_effects/lpe-clone-original.h"
-#include "live_effects/lpe-attach-path.h"
+//#include "live_effects/lpe-attach-path.h"
 #include "live_effects/lpe-fill-between-strokes.h"
 #include "live_effects/lpe-fill-between-many.h"
 #include "live_effects/lpe-ellipse_5pts.h"
@@ -130,7 +130,7 @@ const Util::EnumData<EffectType> LPETypeData[] = {
     {POWERSTROKE,           N_("Power stroke"),            "powerstroke"},
     {CLONE_ORIGINAL,        N_("Clone original path"),     "clone_original"},
 /* Ponyscape */
-    {ATTACH_PATH,           N_("Attach path"),             "attach_path"},
+//    {ATTACH_PATH,           N_("Attach path"),             "attach_path"},
     {FILL_BETWEEN_STROKES,  N_("Fill between strokes"),    "fill_between_strokes"},
     {FILL_BETWEEN_MANY,     N_("Fill between many"),       "fill_between_many"},
     {ELLIPSE_5PTS,          N_("Ellipse by 5 points"),     "ellipse_5pts"},
@@ -258,9 +258,9 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj)
         case CLONE_ORIGINAL:
             neweffect = static_cast<Effect*> ( new LPECloneOriginal(lpeobj) );
             break;
-        case ATTACH_PATH:
+        /*case ATTACH_PATH:
             neweffect = static_cast<Effect*> ( new LPEAttachPath(lpeobj) );
-            break;
+            break;*/
         case FILL_BETWEEN_STROKES:
             neweffect = static_cast<Effect*> ( new LPEFillBetweenStrokes(lpeobj) );
             break;
diff --git a/src/live_effects/lpe-fill-between-many.cpp b/src/live_effects/lpe-fill-between-many.cpp
index 00cc1fed5..7cf354044 100644
--- a/src/live_effects/lpe-fill-between-many.cpp
+++ b/src/live_effects/lpe-fill-between-many.cpp
@@ -4,7 +4,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glibmm/i18n.h>
 #include <gtkmm/box.h>
 
 #include "live_effects/lpe-fill-between-many.h"
@@ -16,6 +15,8 @@
 #include "sp-text.h"
 #include "2geom/bezier-curve.h"
 
+#include <glibmm/i18n.h>
+
 namespace Inkscape {
 namespace LivePathEffect {
 
diff --git a/src/live_effects/lpe-jointype.cpp b/src/live_effects/lpe-jointype.cpp
index 97c0a1b8a..93e645783 100644
--- a/src/live_effects/lpe-jointype.cpp
+++ b/src/live_effects/lpe-jointype.cpp
@@ -12,6 +12,9 @@
 
 #include <math.h>
 
+#include "live_effects/parameter/enum.h"
+#include "live_effects/pathoutlineprovider.h"
+
 #include "sp-shape.h"
 #include "style.h"
 #include "xml/repr.h"
@@ -20,11 +23,9 @@
 #include "desktop-style.h"
 #include "svg/css-ostringstream.h"
 #include "display/curve.h"
-#include "live_effects/parameter/enum.h"
 
 #include <2geom/path.h>
 #include <2geom/svg-elliptical-arc.h>
-#include "live_effects/pathoutlineprovider.h"
 
 #include "lpe-jointype.h"
 
diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp
index 29e4c409c..ed47db28d 100644
--- a/src/live_effects/parameter/originalpatharray.cpp
+++ b/src/live_effects/parameter/originalpatharray.cpp
@@ -4,6 +4,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
+#include <glibmm/threads.h>
+#endif
+
 #include "live_effects/parameter/originalpatharray.h"
 
 #include <gtkmm/widget.h>
@@ -89,9 +97,11 @@ OriginalPathArrayParam::OriginalPathArrayParam( const Glib::ustring& label,
     _toggle_renderer->signal_toggled().connect(sigc::mem_fun(*this, &OriginalPathArrayParam::on_reverse_toggled));
     col->add_attribute(_toggle_renderer->property_active(), _model->_colReverse);
     
+    //quick little hack -- new versions of gtk did not give the item enough space
+    _scroller.property_height_request() = 120;
     _scroller.add(_tree);
     _scroller.set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC );
-    _scroller.set_shadow_type(Gtk::SHADOW_IN);
+    //_scroller.set_shadow_type(Gtk::SHADOW_IN);
     
     oncanvas_editable = true;
     
diff --git a/src/live_effects/parameter/powerstrokepointarray.cpp b/src/live_effects/parameter/powerstrokepointarray.cpp
index ac0000b1a..7fa837689 100644
--- a/src/live_effects/parameter/powerstrokepointarray.cpp
+++ b/src/live_effects/parameter/powerstrokepointarray.cpp
@@ -4,8 +4,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glibmm/i18n.h>
-
 #include "ui/dialog/lpe-powerstroke-properties.h"
 #include "live_effects/parameter/powerstrokepointarray.h"
 
@@ -22,6 +20,8 @@
 #include "desktop.h"
 #include "live_effects/lpeobject.h"
 
+#include <glibmm/i18n.h>
+
 namespace Inkscape {
 
 namespace LivePathEffect {
@@ -145,7 +145,7 @@ public:
     virtual Geom::Point knot_get() const;
     virtual void knot_click(guint state);
 
-    /** Checks whether the index falls within the size of the parameter's vector /
+    // Checks whether the index falls within the size of the parameter's vector
     bool valid_index(unsigned int index) const {
         return (_pparam->_vector.size() > index);
     };
diff --git a/src/live_effects/parameter/transformedpoint.cpp b/src/live_effects/parameter/transformedpoint.cpp
index f5b01e267..0d03432c3 100644
--- a/src/live_effects/parameter/transformedpoint.cpp
+++ b/src/live_effects/parameter/transformedpoint.cpp
@@ -4,8 +4,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glibmm/i18n.h>
-
 #include "ui/widget/registered-widget.h"
 #include "live_effects/parameter/transformedpoint.h"
 #include "sp-lpe-item.h"
@@ -17,6 +15,8 @@
 #include "desktop.h"
 #include "verbs.h"
 
+#include <glibmm/i18n.h>
+
 namespace Inkscape {
 
 namespace LivePathEffect {