]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
girparser: Fix criticals when enums or error domains have no children
authorLuca Bruno <lucabru@src.gnome.org>
Sun, 29 May 2011 19:50:06 +0000 (21:50 +0200)
committerLuca Bruno <lucabru@src.gnome.org>
Sun, 29 May 2011 20:01:29 +0000 (22:01 +0200)
vala/valagirparser.vala

index 0140f6e189b009c468195051daced5660bd63489..bd85b410482670216a84b199d740a640a1d373fa 100644 (file)
@@ -1785,11 +1785,19 @@ public class Vala.GirParser : CodeVisitor {
 
                if (cname != null) {
                        if (sym is Enum) {
-                               ((Enum) sym).set_cname (cname);
-                               ((Enum) sym).set_cprefix (common_prefix);
+                               if (cname != null) {
+                                       ((Enum) sym).set_cname (cname);
+                               }
+                               if (common_prefix != null) {
+                                       ((Enum) sym).set_cprefix (common_prefix);
+                               }
                        } else {
-                               ((ErrorDomain) sym).set_cname (cname);
-                               ((ErrorDomain) sym).set_cprefix (common_prefix);
+                               if (cname != null) {
+                                       ((ErrorDomain) sym).set_cname (cname);
+                               }
+                               if (common_prefix != null) {
+                                       ((ErrorDomain) sym).set_cprefix (common_prefix);
+                               }
                        }
                }