[gtk-doc] mkdb: Allow annotations for property docs.

[Stefan Kost <stefkost src gnome org>]

commit d3ac88b596bf2232a653852a984b359eb2e80c04
Author: Stefan Sauer <ensonic users sf net>
Date:   Sat Apr 18 11:03:13 2015 +0200

    mkdb: Allow annotations for property docs.
    
    Fixes #727778

 gtkdoc-mkdb.in              |    8 ++++----
 tests/gobject/src/gobject.c |    5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in
index 8b00bfb..cdfb73c 100755
--- a/gtkdoc-mkdb.in
+++ b/gtkdoc-mkdb.in
@@ -3753,7 +3753,7 @@ sub GetArgs {
             }
 
             $AllSymbols{$symbol} = 1;
-            my $blurb;
+            my $blurb = "";
             if (defined($SymbolDocs{$symbol}) &&
                 !IsEmptyDoc($SymbolDocs{$symbol})) {
                 $blurb = &ConvertMarkDown($symbol, $SymbolDocs{$symbol});
@@ -3761,13 +3761,13 @@ sub GetArgs {
                 $AllDocumentedSymbols{$symbol} = 1;
             }
             else {
-                if (!($ArgBlurbs[$i] eq "")) {
+                if ($ArgBlurbs[$i] ne "") {
+                    $blurb = "<para>" . &CreateValidSGML ($ArgBlurbs[$i]) . "</para>";
                     $AllDocumentedSymbols{$symbol} = 1;
                 } else {
                     # FIXME: print a warning?
                     @TRACE@(".. no description\n");
                 }
-                $blurb = "<para>" . &CreateValidSGML ($ArgBlurbs[$i]) . "</para>";
             }
 
             my $pad1 = " " x (24 - length ($name));
@@ -4068,7 +4068,7 @@ sub ScanSourceFile {
             if (m%^\s*(SECTION:\s*\S+)%) {
                 $symbol = $1;
                 @TRACE@("SECTION DOCS found in source for : '$symbol'\n");
-            } elsif (m%^\s*([\w:-]*\w)\s*:?\s*(\([-A-Za-z0-9._ ]+\)\s*)*$%) {
+            } elsif (m%^\s*([\w:-]*\w)\s*:?\s*(\([-A-Za-z0-9._() ]+?\)\s*)*$%) {
                 $symbol = $1;
                 my $annotation = $2;
                 @TRACE@("SYMBOL DOCS found in source for : '$symbol'\n");
diff --git a/tests/gobject/src/gobject.c b/tests/gobject/src/gobject.c
index 7679562..c34bf55 100644
--- a/tests/gobject/src/gobject.c
+++ b/tests/gobject/src/gobject.c
@@ -352,15 +352,14 @@ static void gtkdoc_object_class_init (GtkdocObjectClass *klass) {
 #endif
 
   /**
-   * GtkdocObject:otest:
+   * GtkdocObject:otest: (type GList(GtkdocObject2j))
    *
    * Since: 0.1
    */
   g_object_class_install_property (gobject_class,GTKDOC_OBJECT_TEST,
-                                  g_param_spec_string ("otest",
+                                  g_param_spec_pointer ("otest",
                                      "otest prop",
                                      "dummy property for object",
-                                     "dummy", /* default value */
                                      G_PARAM_READWRITE));
 
   /**