[libvtemm] Compilation and documentation generation fixes.

[Krzesimir Nowak <krnowak src gnome org>]

commit 9b83084c719706780fa2fb5330eee76db3529f0b
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Wed Aug 19 22:18:12 2009 +0200

    Compilation and documentation generation fixes.
    
    * codegen/m4/convert.m4: Mention a correct .m4 file name.
    * docs/reference/Doxyfile.in: Correct a typo in GENERATE_TAGFILE
    header.
    * libvte/libvtemm/ptymaster.cc: Fixed some minor compilation
    errors.
    * libvte/src/charattributes.hg: Moved `const' to another place. It
    should be a pointer to const VteCharAttributes, not a const
    pointer to VteCharAttributes.
    * libvte/src/terminal.ccg: Mark first parameter of
    SignalProxy_selected_gtk_callback as unused to avoid warning
    (and thus compilation error) during distcheck.

 codegen/m4/convert.m4        |    2 +-
 docs/reference/Doxyfile.in   |    2 +-
 libvte/libvtemm/ptymaster.cc |    8 ++++----
 libvte/src/charattributes.hg |    2 +-
 libvte/src/terminal.ccg      |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/codegen/m4/convert.m4 b/codegen/m4/convert.m4
index f939ffe..9390b24 100644
--- a/codegen/m4/convert.m4
+++ b/codegen/m4/convert.m4
@@ -1,4 +1,4 @@
 # Override of the file of the same name in gtkmm.
 
 include(convert_gtkmm.m4)
-include(convert_libvtemm.m4)
+include(convert_libvte.m4)
diff --git a/docs/reference/Doxyfile.in b/docs/reference/Doxyfile.in
index f65daae..e2560f4 100644
--- a/docs/reference/Doxyfile.in
+++ b/docs/reference/Doxyfile.in
@@ -1318,7 +1318,7 @@ TAGFILES               = @DOXYGEN_TAGFILES@
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create 
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE       = "reference/@LIBVTEMM_MODULE_NAME.tag"
+GENERATE_TAGFILE       = "reference/@LIBVTEMM_MODULE_NAME  tag"
 
 # If the ALLEXTERNALS tag is set to YES all external classes will be listed 
 # in the class index. If set to NO only the inherited external classes 
diff --git a/libvte/libvtemm/ptymaster.cc b/libvte/libvtemm/ptymaster.cc
index 4b305cd..0e1bc2a 100644
--- a/libvte/libvtemm/ptymaster.cc
+++ b/libvte/libvtemm/ptymaster.cc
@@ -47,16 +47,16 @@ Master::Master(const Master& master)
 
 Master::~Master()
 {
-  if ((m_d != -1) && (is_main))
+  if ((m_d != -1) && (m_is_main))
   {
     close();
   }
 }
 
-Master& operator=(Master& master)
+Master& Master::operator=(Master& master)
 {
-  this->md = master.m_d;
-  this->m_is_main(false);
+  this->m_d = master.m_d;
+  this->m_is_main = false;
   return *this;
 }
 
diff --git a/libvte/src/charattributes.hg b/libvte/src/charattributes.hg
index 31c02c7..005b257 100644
--- a/libvte/src/charattributes.hg
+++ b/libvte/src/charattributes.hg
@@ -73,7 +73,7 @@ public:
   ///Provides access to the underlying C GtkObject.
   VteCharAttributes* gobj() {return gobject_;}
   ///Provides access to the underlying C GtkObject.
-  VteCharAttributes* const gobj() const {return gobject_;}
+  const VteCharAttributes* gobj() const {return gobject_;}
 protected:
   VteCharAttributes* gobject_;
 };
diff --git a/libvte/src/terminal.ccg b/libvte/src/terminal.ccg
index 20880a2..dd2f577 100644
--- a/libvte/src/terminal.ccg
+++ b/libvte/src/terminal.ccg
@@ -32,7 +32,7 @@ namespace Private
 {
 
 static gboolean
-SignalProxy_selected_gtk_callback(VteTerminal *terminal, glong column, glong row, gpointer user_data)
+SignalProxy_selected_gtk_callback(VteTerminal *terminal G_GNUC_UNUSED, glong column, glong row, gpointer user_data)
 {
   Gnome::Vte::Terminal::SlotSelectedCallback* the_slot = static_cast<Gnome::Vte::Terminal::SlotSelectedCallback*>(user_data);
 #ifdef GLIBMM_EXCEPTIONS_ENABLED