fix global constants add NoArrayLength attribute to Process functions

2007-02-04  Jürg Billeter  <j@bitron.ch>

	* vala/valaconstant.vala: fix global constants
	* vapi/glib-2.0.vala: add NoArrayLength attribute to Process functions

svn path=/trunk/; revision=187

diff --git a/vala/ChangeLog b/vala/ChangeLog
index 0cf6b55ed28600e687614b9b43ccb6cedcede2d5..afaea7e01b31296812776a308b784a1f34dccfbf 100644 (file)
--- a/vala/ChangeLog
+++ b/vala/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-04  Jürg Billeter  <j@bitron.ch>
+
+       * vala/valaconstant.vala: fix global constants
+       * vapi/glib-2.0.vala: add NoArrayLength attribute to Process functions
+
 2007-02-04  Jürg Billeter  <j@bitron.ch>
 
        * vala/valacodegenerator.vala: use correct type cname in array creation

diff --git a/vala/vala/valaconstant.vala b/vala/vala/valaconstant.vala
index e69c57859ad785a21a0d1886c1310d29aee9c6f2..868b11a12af0c6d949992973ec1fc963eb496fc9 100644 (file)
--- a/vala/vala/valaconstant.vala
+++ b/vala/vala/valaconstant.vala
@@ -93,7 +93,12 @@ public class Vala.Constant : Member, Lockable {
                                cname = "%s_%s".printf (t.get_upper_case_cname (null), name);
                        } else {
                                var ns = (Namespace) symbol.parent_symbol.node;
-                               cname = "%s%s".printf (ns.get_cprefix ().up (), name);
+                               if (ns == null) {
+                                       // global constant
+                                       cname = name;
+                               } else {
+                                       cname = "%s%s".printf (ns.get_cprefix ().up (), name);
+                               }
                        }
                }
                return cname;

diff --git a/vala/vapi/glib-2.0.vala b/vala/vapi/glib-2.0.vala
index 2937414147462e016909a5c14cf6b9c89b500592..1bfe9d034c15792b44513fa06c5de8c86a999a5b 100644 (file)
--- a/vala/vapi/glib-2.0.vala
+++ b/vala/vapi/glib-2.0.vala
@@ -778,8 +778,11 @@ namespace GLib {
        
        [CCode (cprefix = "g_")]
        public struct Process {
+               [NoArrayLength ()]
                public static bool spawn_async_with_pipes (string working_directory, string[] argv, string[] envp, SpawnFlags _flags, SpawnChildSetupFunc child_setup, pointer user_data, Pid child_pid, ref int standard_input, ref int standard_output, ref int standard_error, out Error error);
+               [NoArrayLength ()]
                public static bool spawn_async (string working_directory, string[] argv, string[] envp, SpawnFlags _flags, SpawnChildSetupFunc child_setup, pointer user_data, Pid child_pid, out Error error);
+               [NoArrayLength ()]
                public static bool spawn_sync (string working_directory, string[] argv, string[] envp, SpawnFlags _flags, SpawnChildSetupFunc child_setup, pointer user_data, out string standard_output, out string standard_error, ref int exit_status, out Error error);
                public static bool spawn_command_line_async (string! command_line, out Error error);
                public static bool spawn_command_line_sync (string! command_line, out string standard_output, out string standard_error, ref int exit_status, out Error error);