[vala: 3/3] Merge branch 'staging'

[Luca Bruno <lucabru src gnome org>]

commit 4038abdfdde146ec46c3037035a4e4c14e97942e
Merge: b05fa33 aa6c377
Author: Luca Bruno <lucabru src gnome org>
Date:   Mon Oct 21 20:10:03 2013 +0200

    Merge branch 'staging'
    
    Conflicts:
        vala/valagirparser.vala

 vala/valaarraytype.vala   |    7 +++----
 vala/valadatatype.vala    |    7 +++----
 vala/valagirparser.vala   |   34 +++++++++++++++++++++++-----------
 vala/valamethodcall.vala  |    2 +-
 vala/valapointertype.vala |    7 +++----
 vapi/atk.vapi             |   17 +++++++++++++++++
 vapi/gdl-3.0.vapi         |    4 ++++
 vapi/gio-2.0.vapi         |    5 +++++
 vapi/libsoup-2.4.vapi     |   12 ++++++++++++
 vapi/libwnck-3.0.vapi     |    3 +++
 vapi/poppler-glib.vapi    |    1 +
 11 files changed, 75 insertions(+), 24 deletions(-)
---
diff --cc vala/valagirparser.vala
index 5fab592,e685706..4f130ce
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@@ -2053,21 -2059,25 +2057,29 @@@ public class Vala.GirParser : CodeVisit
        }
  
        Comment? parse_doc () {
-               if (reader.name != "doc") {
-                       return null;
-               }
 -              skip_other_docs ();
++              Comment? comment = null;
  
-               start_element ("doc");
-               next ();
 -              if (reader.name != "doc") {
 -                      return null;
 -              }
++              while (current_token == MarkupTokenType.START_ELEMENT) {
++                      unowned string reader_name = reader.name;
  
-               Comment? comment = null;
 -              start_element ("doc");
 -              next ();
++                      if (reader_name == "doc") {
++                              start_element ("doc");
++                              next ();
  
-               if (current_token == MarkupTokenType.TEXT) {
-                       comment = new Comment (reader.content, current.source_reference);
-                       next ();
 -              Comment? comment = null;
+ 
 -              if (current_token == MarkupTokenType.TEXT) {
 -                      comment = new Comment (reader.content, current.source_reference);
 -                      next ();
 -              }
++                              if (current_token == MarkupTokenType.TEXT) {
++                                      comment = new Comment (reader.content, current.source_reference);
++                                      next ();
++                              }
+ 
 -              end_element ("doc");
++                              end_element ("doc");
++                      } else if (reader_name == "doc-version" || reader_name == "doc-deprecated" || 
reader_name == "doc-stability") {
++                              skip_element ();
++                      } else {
++                              break;
++                      }
 +              }
  
-               end_element ("doc");
 -              skip_other_docs ();
                return comment;
        }