[glibmm/gmmproc-refactor] Fix some runtime/compile bugs.

[Krzesimir Nowak <krnowak src gnome org>]

commit e4576ea71c080c1cad0cd8b09b7ad3f3254a803b
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Mon Jul 9 22:18:28 2012 +0200

    Fix some runtime/compile bugs.

 tools/pm/Common/Output/GError.pm         |    2 +-
 tools/pm/Common/TypeDetails/Container.pm |    2 +-
 tools/pm/Common/WrapParser.pm            |   12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/tools/pm/Common/Output/GError.pm b/tools/pm/Common/Output/GError.pm
index e55b361..d3ca2b9 100644
--- a/tools/pm/Common/Output/GError.pm
+++ b/tools/pm/Common/Output/GError.pm
@@ -78,7 +78,7 @@ sub _output_gerror_impl ($$$)
   my ($wrap_parser, $cxx_type, $domain) = @_;
   my $container_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
   my $full_cxx_type = join '::', $container_cxx_type, $cxx_type;
-  my $section_manager->get_section_manager;
+  my $section_manager = $wrap_parser->get_section_manager;
   my $code_string = nl (Common::Output::Shared::open_namespaces $wrap_parser) .
                     nl ($full_cxx_type . '::' . $cxx_type . '(' . $full_cxx_type . '::Code error_code, const Glib::ustring& error_message)') .
                     nl (':') .
diff --git a/tools/pm/Common/TypeDetails/Container.pm b/tools/pm/Common/TypeDetails/Container.pm
index b666059..f79f672 100644
--- a/tools/pm/Common/TypeDetails/Container.pm
+++ b/tools/pm/Common/TypeDetails/Container.pm
@@ -127,7 +127,7 @@ sub equal ($$$)
     my $self_contained_type = $self->_get_contained_type;
     my $other_contained_type = $self->_get_contained_type;
 
-    return $self_contained_type->equal ($other_contained_type);
+    return $self_contained_type->equal ($other_contained_type, $flags);
   }
 
   return 1;
diff --git a/tools/pm/Common/WrapParser.pm b/tools/pm/Common/WrapParser.pm
index 8b85df6..69b0c04 100644
--- a/tools/pm/Common/WrapParser.pm
+++ b/tools/pm/Common/WrapParser.pm
@@ -1253,9 +1253,9 @@ sub _on_wrap_enum ($)
 
   for my $subst (@sed)
   {
-    if ($subst =~ /^\s*s#([^#]+)#([^#]*)#\s*$/)
+    if ($subst =~ /^\s*s#([^#]*)#([^#]*)#\s*$/)
     {
-      push @substs, $subst;
+      push (@substs, [$1, $2]);
     }
     else
     {
@@ -2866,7 +2866,7 @@ sub _on_config_include
 
   my $include_file = shift (@args);
   my $section_manager = $self->get_section_manager ();
-  my $section = Common::Output::Shared::get_section ($self, Common::Sections::SECTION_HEADER_BEGIN);
+  my $section = Common::Output::Shared::get_section ($self, Common::Sections::H_BEGIN);
   my $code_string = nl (join ('', '#include <', $include_file, '>'));
 
   $section_manager->append_string_to_section ($code_string,
@@ -2908,14 +2908,14 @@ sub _on_custom_default_ctor
   $section_manager->set_variable ($variable, 1);
 }
 
-sub _deprecate_ifdef_start
+sub _on_deprecate_ifdef_start
 {
   my ($self) = @_;
 
   Common::Output::Shared::deprecate_start ($self);
 }
 
-sub _deprecate_ifdef_end
+sub _on_deprecate_ifdef_end
 {
   my ($self) = @_;
 
@@ -3199,7 +3199,7 @@ sub new ($$$$$$)
     '_MEMBER_GET_PTR' => sub { $self->_on_member_get_ptr (@_); },
     '_MEMBER_GET_GOBJECT' => sub { $self->_on_member_get_gobject (@_); },
     '_MEMBER_GET_REF_PTR' => sub { $self->_on_member_get_ref_ptr (@_); },
-    '_GMMPROC_EXTRA_NAMESPACE' => { $self->_on_gmmproc_extra_namespace (@_); }
+    '_GMMPROC_EXTRA_NAMESPACE' => sub { $self->_on_gmmproc_extra_namespace (@_); }
   };
 
   return $self;