From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 29 May 2011 19:50:06 +0000 (+0200)
Subject: girparser: Fix criticals when enums or error domains have no children
X-Git-Tag: 0.13.0~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edc3d3b7409ee486aec7f4aa8393214a952bc379;p=thirdparty%2Fvala.git

girparser: Fix criticals when enums or error domains have no children
---

diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index 0140f6e18..bd85b4104 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -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);
+				}
 			}
 		}