[glibmm/gmmproc-refactor: 14/23] Merge branch 'master' into gmmproc-refactor

[Krzesimir Nowak <krnowak src gnome org>]

commit ea20b62e496132993f647d4db92032a6ffd92891
Merge: e321912 450b1b7
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Mon Sep 26 14:40:45 2011 +0200

    Merge branch 'master' into gmmproc-refactor

 ChangeLog                                 |  117 +++
 Makefile.am                               |    4 -
 NEWS                                      |   10 +
 autogen.sh                                |    2 +-
 build/c_std.m4                            |   53 +-
 build/cxx.m4                              |   34 +-
 build/cxx_std.m4                          |  131 ++--
 build/debug.m4                            |   36 +
 build/dk-feature.m4                       |    6 +-
 build/glibmm_check_perl.m4                |   57 --
 build/macros.m4                           |   72 --
 build/sun.m4                              |   45 +-
 configure.ac                              |    5 +-
 gio/src/action.ccg                        |   25 +
 gio/src/action.hg                         |  106 +++
 gio/src/actiongroup.hg                    |   29 +-
 gio/src/filelist.am                       |    3 +
 gio/src/gio_extra_objects.defs            |   31 +-
 gio/src/gio_methods.defs                  | 1415 ++++++++++++++++-------------
 gio/src/gio_signals.defs                  |  124 +++-
 gio/src/gio_vfuncs.defs                   |  121 +++
 gio/src/simpleaction.ccg                  |   23 +
 gio/src/simpleaction.hg                   |   82 ++
 gio/src/simpleactiongroup.ccg             |   24 +
 gio/src/simpleactiongroup.hg              |   54 ++
 glib/src/variant.ccg                      |   41 +-
 glib/src/variant.hg                       |    2 +
 tests/glibmm_variant/main.cc              |   10 +
 tools/extra_defs_gen/generate_defs_gio.cc |    2 +
 tools/m4/convert_gio.m4                   |   20 +-
 tools/pm/Common/DocsParser.pm             |    6 +-
 tools/pm/Common/WrapParser.pm             |    4 +
 32 files changed, 1758 insertions(+), 936 deletions(-)
---
diff --cc tools/pm/Common/WrapParser.pm
index 5ad4a81,1b34f3c..eb1b95b
--- a/tools/pm/Common/WrapParser.pm
+++ b/tools/pm/Common/WrapParser.pm
@@@ -984,9 -987,10 +987,10 @@@ sub on_wrap_method_docs_only($
    }
  
    # Extra ref needed?
+   $$objCfunc{throw_any_errors} = 0;
    while($#args >= 1) # If the optional ref/err arguments are there.
    {
 -    my $argRef = string_trim(pop @args);
 +    my $argRef = Util::string_trim(pop @args);
      if($argRef eq "errthrow")
      {
        $$objCfunc{throw_any_errors} = 1;