Use the local .pm files for gmmproc instead of installed ones. This was a

2008-02-02  Murray Cumming  <murrayc@murrayc.com>

* build_shared/Makefile_gensrc.am_fragment: Use the local .pm files 
for gmmproc instead of installed ones. This was a regression that I 
introduced when I added gio to the build.
* tools/pm/DocsParser.pm: append_parameter_docs(): Ignore error 
parameters because they are almost always wrapped as exceptions.

svn path=/trunk/; revision=556

1 files changed, 10 insertions, 7 deletions

diff --git a/tools/pm/DocsParser.pm b/tools/pm/DocsParser.pm
index 43074c34..c5d61c6d 100644
--- a/tools/pm/DocsParser.pm
+++ b/tools/pm/DocsParser.pm
@@ -291,14 +291,17 @@ sub append_parameter_docs($$)
 
   foreach my $param (@param_names)
   {
-    my $desc = $$param_descriptions->{$param};
-    
-    $param =~ s/([a-zA-Z0-9]*(_[a-zA-Z0-9]+)*)_?/$1/g;
-    DocsParser::convert_docs_to_cpp($obj_function, \$desc);
-    if(length($desc) > 0)
+    if ($param ne "error" ) #We wrap GErrors as exceptions, so ignore these.
     {
-      $desc  .= '.' unless($desc =~ /(?:^|\.)$/);
-      $$text .= "\n\@param ${param} \u${desc}";
+      my $desc = $$param_descriptions->{$param};
+    
+      $param =~ s/([a-zA-Z0-9]*(_[a-zA-Z0-9]+)*)_?/$1/g;
+      DocsParser::convert_docs_to_cpp($obj_function, \$desc);
+      if(length($desc) > 0)
+      {
+        $desc  .= '.' unless($desc =~ /(?:^|\.)$/);
+        $$text .= "\n\@param ${param} \u${desc}";
+      }
     }
   }
 }