[libvtemm] Changed Glib::StringArrayHandle to StdStringArrayHandle

[Krzesimir Nowak <krnowak src gnome org>]

commit b46d973e85174301857040bdba31a37093dfc5b5
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Mon May 11 18:10:45 2009 +0200

    Changed Glib::StringArrayHandle to StdStringArrayHandle
    
    terminal.hg:
    libvtemm_convert.m4: Changed Glib::StringArrayHandle to
    StdStringArrayhandle, because system environment variables and such
    rather are ASCII or whatever instead of utf8.
    TODO: another task done and cleared.
---
 TODO                         |    2 --
 src/libvtemm/g/terminal.hg   |    5 +++--
 tools/m4/convert_libvtemm.m4 |    2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/TODO b/TODO
index 8888b5b..2a90267 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,6 @@
 src/libvtemm/g/terminal.(h|cc)g:
 	1. wrap commit signal by hand, when it will be possible.
 	("char, int" -> ("std::string"|"Glib::ustring"))
-	2. change Glib::StringArrayHandles to ArrayHandles<std::string>
-	or something where appropriate.
 src/libvtemm/g/*.(h|cc)g:
 src/libvtemm/*.(cc|h):
 	1. squashing bugs. as always.
diff --git a/src/libvtemm/g/terminal.hg b/src/libvtemm/g/terminal.hg
index db497d2..a771f07 100644
--- a/src/libvtemm/g/terminal.hg
+++ b/src/libvtemm/g/terminal.hg
@@ -50,9 +50,10 @@ class Terminal : public Gtk::Widget
   _CLASS_GTKOBJECT(Terminal, VteTerminal, VTE_TERMINAL, Gtk::Widget, GtkWidget)
 public:
   _CTOR_DEFAULT()
-  _WRAP_METHOD(Glib::Pid fork_command(const std::string& command, const Glib::StringArrayHandle& argv, const Glib::StringArrayHandle& envv, const std::string& directory, bool lastlog, bool utmp, bool wtmp), vte_terminal_fork_command)
+  typedef Glib::ArrayHandle<std::string> StdStringArrayHandle;
+  _WRAP_METHOD(Glib::Pid fork_command(const std::string& command, const StdStringArrayHandle& argv, const StdStringArrayHandle& envv, const std::string& directory, bool lastlog, bool utmp, bool wtmp), vte_terminal_fork_command)
 
-  _WRAP_METHOD(Glib::Pid forkpty(const Glib::StringArrayHandle& envv, const std::string& directory, bool lastlog, bool utmp, bool wtmp), vte_terminal_forkpty)
+  _WRAP_METHOD(Glib::Pid forkpty(const StdStringArrayHandle& envv, const std::string& directory, bool lastlog, bool utmp, bool wtmp), vte_terminal_forkpty)
 
   _WRAP_METHOD_DOCS_ONLY(vte_terminal_feed)
   void feed(const Glib::ustring& data);
diff --git a/tools/m4/convert_libvtemm.m4 b/tools/m4/convert_libvtemm.m4
index ec73829..821fa81 100644
--- a/tools/m4/convert_libvtemm.m4
+++ b/tools/m4/convert_libvtemm.m4
@@ -21,7 +21,7 @@ _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
 _CONVERSION(`GtkAdjustment*',`Gtk::Adjustment*',`Glib::wrap($3)')
 _CONVERSION(`const Terminal&',`VteTerminal*', __FR2P)
 _CONVERSION(`const std::string&', `const char*', `($3).c_str()')
-_CONVERSION(`const Glib::StringArrayHandle&', `char**', `const_cast<char**>(($3).data())')
+_CONVERSION(`const StdStringArrayHandle&', `char**', `const_cast<char**>(($3).data())')
 _CONVERSION(`guint',`bool',`($3)')
 _CONVERSION(`VteReaper*',`const Glib::RefPtr<Reaper>',`Glib::wrap($3)')
 _CONVERSION(`Glib::RefPtr<Glib::Regex>', `GRegex*', `($3)->gobj()')