Minor fixes

diff --git a/dbusgen/valadbusparser.vala b/dbusgen/valadbusparser.vala
index 25d362b8d08ca92245409b68ec4ef780a9414bd7..4acf2d3ef935b24090cbf5aa3360ed00fb79c406 100644 (file)
--- a/dbusgen/valadbusparser.vala
+++ b/dbusgen/valadbusparser.vala
@@ -281,14 +281,17 @@ public class Vala.DBusParser : CodeVisitor {
                        case "org.gtk.GDBus.DocString":
                                // A string with Docbook content for documentation. This annotation can be used on <interface>, <method>, <signal>,
                                // <property> and <arg> elements.
-                               if (val != null) {
+                               if (val != null && current_node is Symbol) {
                                        ((Symbol) current_node).comment = new Vala.Comment (val, get_current_src ());
                                }
                                break;
                        case "org.gtk.GDBus.DocString.Short":
                                // A string with Docbook content for short/brief documentation. This annotation can only be used on <interface>
                                // elements.
-                               //TODO
+                               // Prefer long comments over short comments
+                               if (val != null && current_node is Symbol && ((Symbol) current_node).comment == null) {
+                                       ((Symbol) current_node).comment = new Vala.Comment (val, get_current_src ());
+                               }
                                break;
                        default:
                                break;