Do not overwrite declaration variable with sgml-ified variant to not

	* gtkdoc-mkdb.in:
	  Do not overwrite declaration variable with sgml-ified variant to not confuse
	  further parsing.


svn path=/trunk/; revision=701

2 files changed, 18 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 1d6f3b9..f205dcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-12  Stefan Kost  <ensonic@users.sf.net>
+
+	* gtkdoc-mkdb.in:
+	  Do not overwrite declaration variable with sgml-ified variant to not confuse
+	  further parsing.
+
 2009-03-10  Stefan Kost  <ensonic@users.sf.net>
 
 	patch by: Nicola Fontana <ntd@entidi.it>
diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in
index d4945c2..321d57b 100755
--- a/gtkdoc-mkdb.in
+++ b/gtkdoc-mkdb.in
@@ -1222,8 +1222,8 @@ sub OutputMacro {
     # g_assert.
     if (!defined ($DeclarationConditional{$symbol}) && ($symbol !~ m/^g_/)
 	&& ($symbol !~ m/^_?gnome_/) && (($declaration =~ tr/\n//) < 2)) {
-	$declaration = &CreateValidSGML ($declaration);
-	$desc .= "<programlisting>$declaration</programlisting>\n";
+	my $decl_out = &CreateValidSGML ($declaration);
+	$desc .= "<programlisting>$decl_out</programlisting>\n";
     } else {
 	$desc .= "<programlisting>" . &MakeReturnField("#define") . "$symbol";
 	# Align each line so that if should all line up OK.
@@ -1279,8 +1279,8 @@ sub OutputTypedef {
     $desc .= OutputSymbolExtraLinks($symbol);
 
     if (!defined ($DeclarationConditional{$symbol})) {
-	$declaration = &CreateValidSGML ($declaration);
-	$desc .= "<programlisting>$declaration</programlisting>\n";
+	my $decl_out = &CreateValidSGML ($declaration);
+	$desc .= "<programlisting>$decl_out</programlisting>\n";
     }
 
     $desc .= &MakeDeprecationNote($symbol);
@@ -1485,8 +1485,8 @@ sub OutputEnum {
     $desc .= "\n";
     $desc .= OutputSymbolExtraLinks($symbol);
 
-    $declaration = &CreateValidSGML ($declaration);
-    $desc .= "<programlisting>$declaration</programlisting>\n";
+    my $decl_out = &CreateValidSGML ($declaration);
+    $desc .= "<programlisting>$decl_out</programlisting>\n";
 
     $desc .= &MakeDeprecationNote($symbol);
 
@@ -1559,8 +1559,8 @@ sub OutputUnion {
     $desc .= "\n";
     $desc .= OutputSymbolExtraLinks($symbol);
 
-    $declaration = &CreateValidSGML ($declaration);
-    $desc .= "<programlisting>$declaration</programlisting>\n";
+    my $decl_out = &CreateValidSGML ($declaration);
+    $desc .= "<programlisting>$decl_out</programlisting>\n";
 
     $desc .= &MakeDeprecationNote($symbol);
 
@@ -1602,8 +1602,8 @@ sub OutputVariable {
     $desc .= "\n";
     $desc .= OutputSymbolExtraLinks($symbol);
 
-    $declaration = &CreateValidSGML ($declaration);
-    $desc .= "<programlisting>$declaration</programlisting>\n";
+    my $decl_out = &CreateValidSGML ($declaration);
+    $desc .= "<programlisting>$decl_out</programlisting>\n";
 
     $desc .= &MakeDeprecationNote($symbol);
 
@@ -3181,9 +3181,9 @@ sub GetArgs {
 	    my $type = $ArgTypes[$i];
 	    my $type_output;
 	    my $range = $ArgRanges[$i];
-	    my $range_output = CreateValidSGML($range);
+	    my $range_output = CreateValidSGML ($range);
 	    my $default = $ArgDefaults[$i];
-	    my $default_output = CreateValidSGML($default);
+	    my $default_output = CreateValidSGML ($default);
 
 	    if ($type eq "GtkString") {
 		$type = "char*";