vala r1154 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Sun Mar 23 10:22:35 2008
New Revision: 1154
URL: http://svn.gnome.org/viewvc/vala?rev=1154&view=rev

Log:
2008-03-23  Juerg Billeter  <j bitron ch>

	* vala/valanamespace.vala: fix vapigen crash


Modified:
   trunk/ChangeLog
   trunk/vala/valanamespace.vala

Modified: trunk/vala/valanamespace.vala
==============================================================================
--- trunk/vala/valanamespace.vala	(original)
+++ trunk/vala/valanamespace.vala	Sun Mar 23 10:22:35 2008
@@ -260,7 +260,13 @@
 		if (cprefixes.size > 0) {
 			return cprefixes[0];
 		} else if (null != name) {
-			return parent_symbol.get_cprefix () + name;
+			string parent_prefix;
+			if (parent_symbol == null) {
+				parent_prefix = "";
+			} else {
+				parent_prefix = parent_symbol.get_cprefix ();
+			}
+			return parent_prefix + name;
 		} else {
 			return "";
 		}
@@ -295,7 +301,13 @@
 			if (name == null) {
 				lower_case_cprefix = "";
 			} else {
-				lower_case_cprefix = "%s%s_".printf (parent_symbol.get_lower_case_cprefix (), camel_case_to_lower_case (name));
+				string parent_prefix;
+				if (parent_symbol == null) {
+					parent_prefix = "";
+				} else {
+					parent_prefix = parent_symbol.get_lower_case_cprefix ();
+				}
+				lower_case_cprefix = "%s%s_".printf (parent_prefix, camel_case_to_lower_case (name));
 			}
 		}
 		return lower_case_cprefix;