scan: better matching of types

1 files changed, 6 insertions, 6 deletions

diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in
index aff585b..0de762b 100755
--- a/gtkdoc-scan.in
+++ b/gtkdoc-scan.in
@@ -842,18 +842,18 @@ sub ScanHeader {
     my ($class,$lclass);
     my ($standard_decl) = "";
     do {
-        if ($list =~ m/^\S+_IS_(\S*)_CLASS/m) {
+        if ($list =~ m/^\S+_IS_(\S*)_CLASS\n/m) {
             $class = $1;
             $lclass = lc($class);
-            @TRACE@("Found gobject class '$class'\n");
-        } elsif ($list =~ m/^\S+_IS_(\S*)/m) {
+            @TRACE@("Found gobject class '$class' from is class macro\n");
+        } elsif ($list =~ m/^\S+_IS_(\S*)\n/m) {
             $class = $1;
             $lclass = lc($class);
-            @TRACE@("Found gobject class '$class'\n");
-        } elsif ($list =~ m/^\S+_(\S*)_get_type\n/m) {
+            @TRACE@("Found gobject class '$class' from is macro\n");
+        } elsif ($list =~ m/^\S+?_(\S*)_get_type\n/m) {
             $lclass = $1;
             $class = uc($lclass);
-            @TRACE@("Found gobject class '$class'\n");
+            @TRACE@("Found gobject class '$class' from get_type function\n");
         } else {
           $class = $lclass = "";
         }