vala r1929 - in trunk: . gobject

[juergbi svn gnome org]

Author: juergbi
Date: Sat Oct 25 21:38:22 2008
New Revision: 1929
URL: http://svn.gnome.org/viewvc/vala?rev=1929&view=rev

Log:
2008-10-25  JÃrg Billeter  <j bitron ch>

	* gobject/valaccodegenerator.vala:

	Support custom sentinels for constructors


Modified:
   trunk/ChangeLog
   trunk/gobject/valaccodegenerator.vala

Modified: trunk/gobject/valaccodegenerator.vala
==============================================================================
--- trunk/gobject/valaccodegenerator.vala	(original)
+++ trunk/gobject/valaccodegenerator.vala	Sat Oct 25 21:38:22 2008
@@ -3303,8 +3303,11 @@
 			}
 
 			if (ellipsis) {
-				// ensure variable argument list ends with NULL
-				creation_call.add_argument (new CCodeConstant ("NULL"));
+				/* ensure variable argument list ends with NULL
+				 * except when using printf-style arguments */
+				if (!m.printf_format && m.sentinel != "") {
+					creation_call.add_argument (new CCodeConstant (m.sentinel));
+				}
 			}
 
 			creation_expr = creation_call;