vala r1338 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Sat May  3 12:04:49 2008
New Revision: 1338
URL: http://svn.gnome.org/viewvc/vala?rev=1338&view=rev

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

	* vala/valainterfacewriter.vala:
	* vala/valastruct.vala:

	Support custom cname for structs in InterfaceWriter


Modified:
   trunk/ChangeLog
   trunk/vala/valainterfacewriter.vala
   trunk/vala/valastruct.vala

Modified: trunk/vala/valainterfacewriter.vala
==============================================================================
--- trunk/vala/valainterfacewriter.vala	(original)
+++ trunk/vala/valainterfacewriter.vala	Sat May  3 12:04:49 2008
@@ -188,6 +188,12 @@
 		
 		write_indent ();
 
+		write_string ("[CCode (");
+
+		if (st.get_cname () != st.get_default_cname ()) {
+			write_string ("cname = \"%s\", ".printf (st.get_cname ()));
+		}
+
 		var first = true;
 		string cheaders;
 		foreach (string cheader in st.get_cheader_filenames ()) {
@@ -198,7 +204,7 @@
 				cheaders = "%s,%s".printf (cheaders, cheader);
 			}
 		}
-		write_string ("[CCode (cheader_filename = \"%s\")]".printf (cheaders));
+		write_string ("cheader_filename = \"%s\")]".printf (cheaders));
 		write_newline ();
 
 		if (st.is_simple_type ()) {

Modified: trunk/vala/valastruct.vala
==============================================================================
--- trunk/vala/valastruct.vala	(original)
+++ trunk/vala/valastruct.vala	Sat May  3 12:04:49 2008
@@ -186,11 +186,20 @@
 		}
 		
 		if (cname == null) {
-			cname = "%s%s".printf (parent_symbol.get_cprefix (), name);
+			cname = get_default_cname ();
 		}
 		return cname;
 	}
-	
+
+	/**
+	 * Returns the default name of this struct as it is used in C code.
+	 *
+	 * @return the name to be used in C code by default
+	 */
+	public string get_default_cname () {
+		return "%s%s".printf (parent_symbol.get_cprefix (), name);
+	}
+
 	private void set_cname (string cname) {
 		this.cname = cname;
 	}