[libvtemm] Some fixes and additions to previous commit.

[Krzesimir Nowak <krnowak src gnome org>]

commit 12c4d99b20d4e329259e1f35b48062c364e73178
Author: Krzesimir Nowak <krnowak svn gnome org>
Date:   Fri May 22 04:44:06 2009 +0200

    Some fixes and additions to previous commit.
    
    * src/libvtemm/g/libvtem_docs_override.xml: Changed #g_iconv to
    Glib::IConv, so doxygen won't produce a warning about it.
    * src/libvtemm/g/terminal.hg: Changed Glib::ustring to std::string
    in set_encoding and get_encoding - std::string is taken by
    Glib::IConv, so it makes sense.
    * src/libvtemm/ptysize.h: Documented the undocumented third
    parameter of Size's constructor.
    * src/libvtemm/textandcharattrs.cc: Some variables renamed in
    previous commit were not renamed, now they are.
---
 src/libvtemm/g/libvte_docs_override.xml |   22 ++++++++++++++++++++++
 src/libvtemm/g/terminal.hg              |    4 ++--
 src/libvtemm/ptysize.h                  |    1 +
 src/libvtemm/textandcharattrs.cc        |    4 ++--
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/libvtemm/g/libvte_docs_override.xml b/src/libvtemm/g/libvte_docs_override.xml
index 19904fc..143a3be 100644
--- a/src/libvtemm/g/libvte_docs_override.xml
+++ b/src/libvtemm/g/libvte_docs_override.xml
@@ -1005,4 +1005,26 @@ the terminal.
 <return></return>
 </function>
 
+<function name="vte_terminal_set_encoding">
+<description>
+Changes the encoding the terminal will expect data from the child to
+be encoded with.  For certain terminal types, applications executing in the
+terminal can change the encoding.  The default encoding is defined by the
+application's locale settings.
+
+
+</description>
+<parameters>
+<parameter name="terminal">
+<parameter_description> a #VteTerminal
+</parameter_description>
+</parameter>
+<parameter name="codeset">
+<parameter_description> a valid Glib::IConv encoding
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
 </root>
diff --git a/src/libvtemm/g/terminal.hg b/src/libvtemm/g/terminal.hg
index 72f5f38..473884a 100644
--- a/src/libvtemm/g/terminal.hg
+++ b/src/libvtemm/g/terminal.hg
@@ -233,8 +233,8 @@ public:
   _WRAP_METHOD(Glib::ustring get_emulation() const, vte_terminal_get_emulation)
   _WRAP_METHOD(Glib::ustring get_default_emulation() const, vte_terminal_get_default_emulation)
 
-  _WRAP_METHOD(void set_encoding(const Glib::ustring& codeset), vte_terminal_set_encoding)
-  _WRAP_METHOD(Glib::ustring get_encoding() const, vte_terminal_get_encoding)
+  _WRAP_METHOD(void set_encoding(const std::string& codeset), vte_terminal_set_encoding)
+  _WRAP_METHOD(std::string get_encoding() const, vte_terminal_get_encoding)
 
   _WRAP_METHOD(Glib::ustring get_status_line() const, vte_terminal_get_status_line)
 
diff --git a/src/libvtemm/ptysize.h b/src/libvtemm/ptysize.h
index ca323f1..4491c6d 100644
--- a/src/libvtemm/ptysize.h
+++ b/src/libvtemm/ptysize.h
@@ -38,6 +38,7 @@ public:
   /** The only way to fill #Gnome::Vte::Pty::Size class.
    * @param columns Pseudo-terminals number of columns.
    * @param rows Pseudo-terminals number of rows.
+   * @param ok @c false, if an error occured while getting size of pseudo-terminal.
    */
   Size(int columns, int rows, bool ok = true);
   virtual ~Size();
diff --git a/src/libvtemm/textandcharattrs.cc b/src/libvtemm/textandcharattrs.cc
index 5bdf8af..73edc85 100644
--- a/src/libvtemm/textandcharattrs.cc
+++ b/src/libvtemm/textandcharattrs.cc
@@ -37,12 +37,12 @@ TextAndCharAttrs::~TextAndCharAttrs()
 
 Glib::ustring TextAndCharAttrs::get_text() const
 {
-  return text;
+  return m_text;
 }
 
 ArrayHandle_CharAttributes TextAndCharAttrs::get_attributes() const
 {
-  return attributes;
+  return m_attributes;
 }
 
 } // namespace Vte