Index: gtkdoc-mkdb.in
===================================================================
RCS file: /cvs/gnome/gtk-doc/gtkdoc-mkdb.in,v
retrieving revision 1.62
diff -u -b -B -p -r1.62 gtkdoc-mkdb.in
--- gtkdoc-mkdb.in	12 Nov 2002 10:21:27 -0000	1.62
+++ gtkdoc-mkdb.in	25 Nov 2002 23:29:34 -0000
@@ -686,7 +686,7 @@ sub OutputStruct {
     my ($symbol, $declaration) = @_;
 
     my $is_widget_struct = 0;
-    if (&CheckIsObject ($symbol)) {
+    if (&CheckIsObject ($symbol) || ($symbol =~ /^(\S+)Class/)) {
 #	print "Found widget struct: $symbol\n";
 	$is_widget_struct = 1;
     }
@@ -706,8 +706,8 @@ sub OutputStruct {
     if ($declaration =~ m/^\s*$/) {
 #	print "Found opaque struct\n";
 	$decl_out = "struct $symbol;";
-    } elsif ($is_widget_struct) {
-	my $public = 0;
+    } else {
+	my $public = !$is_widget_struct;
 	my $new_declaration = "";
 	my $decl_line;
 	foreach $decl_line (split (/\n/, $declaration)) {
@@ -729,8 +729,6 @@ sub OutputStruct {
 	} else {
 	    $decl_out = "struct $symbol;";
 	}
-    } else {
-	$decl_out = $declaration;
     }
 
     $decl_out = &CreateValidSGML ($decl_out);
Index: gtkdoc-scan.in
===================================================================
RCS file: /cvs/gnome/gtk-doc/gtkdoc-scan.in,v
retrieving revision 1.20
diff -u -b -B -p -r1.20 gtkdoc-scan.in
--- gtkdoc-scan.in	23 Jan 2002 23:42:57 -0000	1.20
+++ gtkdoc-scan.in	25 Nov 2002 23:29:34 -0000
@@ -483,16 +483,14 @@ sub ScanHeader {
 		if ($symbol =~ m/^(\S+)Class/
                     && $1 ne 'GtkStyle' && $1 !~ /^(Pango|Bonobo)/) {
 #		    print "Found object: $1\n";
-		    $list .= "<TITLE>$1</TITLE>\n";
 		    push (@objects, $1);
-		} else {
+		}
 		    &AddSymbolToList (\$list, $symbol);
 
 		    if ($decl =~ m/^\s*typedef\s+struct\s*{/) {
 		      print DECL "<TYPEDEF>\n<NAME>$symbol</NAME>\n$deprecated$decl</TYPEDEF>\n";
 		    } else {
 		      print DECL "<STRUCT>\n<NAME>$symbol</NAME>\n$deprecated$decl</STRUCT>\n";
-		    }
 		}
 		$in_declaration = "";
 	    } else {
