[passepartout] Fixed the project to compile now

[Sven Herzberg <herzi src gnome org>]

commit 8667922e56a59e5f9f184517b866f890dde174a2
Author: Sven Herzberg <herzi src gnome org>
Date:   Wed Jun 13 11:48:35 2007 +0000

    Fixed the project to compile now
    
    git-svn-id: http://svn.gnome.org/svn/passepartout/trunk 1507 910bfebc-b532-0410-a802-fb3981afa09c
---
 src/pptout/document/group.h   |    4 ++--
 src/pptout/propertiesdialog.h |    2 +-
 src/ps/Makefile.am            |    2 +-
 src/xml2ps/canvas.hh          |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pptout/document/group.h b/src/pptout/document/group.h
index 0d183b0..dd3e94c 100644
--- a/src/pptout/document/group.h
+++ b/src/pptout/document/group.h
@@ -30,7 +30,7 @@ public:
   void set_flow_around(bool);
   bool get_flow_around() const;
   Boundary get_obstacle_boundary() const;
-  BoundaryVect Group::obstacle_list() const;
+  BoundaryVect obstacle_list() const;
   
   void add(Pagent* obj);
   Pagent* ungroup(Pagent* obj);
@@ -55,7 +55,7 @@ public:
   /** Raised on direct changes to the group (i.e. new / ungrouped member) */
   sigc::signal<void> group_changed_signal; 
 private:
-  Boundary Group::get_untransformed_box() const;
+  Boundary get_untransformed_box() const;
   
   ChildVec childs;
 };
diff --git a/src/pptout/propertiesdialog.h b/src/pptout/propertiesdialog.h
index 07c142b..3b42f3c 100644
--- a/src/pptout/propertiesdialog.h
+++ b/src/pptout/propertiesdialog.h
@@ -39,7 +39,7 @@ private:
   // no destructor
   ~PropertiesDialog();
 
-  void PropertiesDialog::show_page_contents(GtkNotebookPage*, guint index);
+  void show_page_contents(GtkNotebookPage*, guint index);
 
   Gtk::Notebook book;
   std::vector<PropBase*> pages;
diff --git a/src/ps/Makefile.am b/src/ps/Makefile.am
index dfa934a..386b70b 100644
--- a/src/ps/Makefile.am
+++ b/src/ps/Makefile.am
@@ -10,7 +10,7 @@ libps_a_SOURCES = encode.cc glyphs.cc pdf.cc unicode.cc pfb2pfa.cc misc.cc \
 examinepdf_SOURCES = examinepdf.cc
 
 # for Glib::ustring
-libps_a_CXXFLAGS = $(GTKMM_CFLAGS)
+libps_a_CXXFLAGS = $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
 
 libps_a_CXXFLAGS += -I$(top_srcdir)/src
 
diff --git a/src/xml2ps/canvas.hh b/src/xml2ps/canvas.hh
index 6dd7ac1..41683da 100644
--- a/src/xml2ps/canvas.hh
+++ b/src/xml2ps/canvas.hh
@@ -52,7 +52,7 @@ namespace xml2ps {
     HBox hbox(bool span, float margin_left, float margin_right, 
 	      float ascender, float descender);
     
-    virtual void xml2ps::Canvas::addRelObstacle
+    virtual void addRelObstacle
     (const float left, const float bottom, const float right, const float top);
     
     // Check where the current column starts.