Index: gtkdoc-mktmpl.in
===================================================================
RCS file: /cvs/gnome/gtk-doc/gtkdoc-mktmpl.in,v
retrieving revision 1.48
diff -u -u -r1.48 gtkdoc-mktmpl.in
--- gtkdoc-mktmpl.in	9 Dec 2005 09:07:39 -0000	1.48
+++ gtkdoc-mktmpl.in	23 Dec 2005 14:33:36 -0000
@@ -138,7 +138,7 @@
 my %SymbolTypes;
 my %SymbolParams;
 
-# These global arrays store GtkObject and subclasses and the hierarchy.
+# These global arrays store GObject and subclasses and the hierarchy.
 my @Objects;
 my @ObjectLevels;
 
@@ -268,7 +268,7 @@
 	    my $declaration = $Declarations{$1};
 	    if (defined ($declaration)) {
 		# We don't want templates for standard macros/functions of
-		# GtkObjects or private declarations.
+		# GObjects or private declarations.
 		if ($subsection ne "Standard" && $subsection ne "Private") {
 		    $output .= &OutputDeclaration ($DeclarationTypes {$symbol},
 						   $symbol, $declaration);
@@ -1236,10 +1236,11 @@
 
 #############################################################################
 # Function    : CheckIsObject
-# Description : Returns 1 if the given name is a GtkObject or a subclass.
+# Description : Returns 1 if the given name is a GObject or a subclass, as
+#               well as a GObjectClass or a subtype.
 #		It uses the global @Objects array.
 #		Note that the @Objects array only contains classes in the
-#		current module and their ancestors - not all GTK classes.
+#		current module and their ancestors - not all GObject classes.
 # Arguments   : $name - the name to check.
 #############################################################################
 
@@ -1248,10 +1249,9 @@
 
     my $object;
     foreach $object (@Objects) {
-	if ($object eq $name) {
+	if ($name =~ m/^$object(Class)?/) {
 	    return 1;
 	}
     }
     return 0;
 }
-
