Revert wrong changes and apply right fixes from prev-commit

(bzr r12409)

2 files changed, 1 insertions, 3 deletions

diff --git a/src/seltrans-handles.h b/src/seltrans-handles.h
index 5c3fdd269..740729a6e 100644
--- a/src/seltrans-handles.h
+++ b/src/seltrans-handles.h
@@ -33,7 +33,7 @@ enum SPSelTransType {
 };
 
 struct SPSelTransTypeInfo {
-        uint  const *color;
+        guint32 const *color;
         gchar const *tip;
 };
 // One per handle type in order
diff --git a/src/seltrans.h b/src/seltrans.h
index 67d581471..d97375520 100644
--- a/src/seltrans.h
+++ b/src/seltrans.h
@@ -71,7 +71,6 @@ public:
     gboolean skewRequest(SPSelTransHandle const &handle, Geom::Point &pt, guint state);
     gboolean rotateRequest(Geom::Point &pt, guint state);
     gboolean centerRequest(Geom::Point &pt, guint state);
-    void alignClick(SPSelTransHandle const &handle);
 
     gboolean handleRequest(SPKnot *knot, Geom::Point *position, guint state, SPSelTransHandle const &handle);
     void handleGrab(SPKnot *knot, guint state, SPSelTransHandle const &handle);
@@ -131,7 +130,6 @@ private:
     };
 
     SPDesktop *_desktop;
-    SPCanvasItem *aguide;
 
     std::vector<SPItem *> _items;
     std::vector<SPItem const *> _items_const;