vala r1274 - in trunk: . gobject vala vapi

[juergbi svn gnome org]

Author: juergbi
Date: Sat Apr 19 16:42:51 2008
New Revision: 1274
URL: http://svn.gnome.org/viewvc/vala?rev=1274&view=rev

Log:
2008-04-19  Juerg Billeter  <j bitron ch>

	* vala/valaattributeprocessor.vala, vala/valaerrortype.vala,
	  vapi/dbus-glib-1.vapi, gobject/valaccodegenerator.vala: get D-Bus
	  sample working again


Modified:
   trunk/ChangeLog
   trunk/gobject/valaccodegenerator.vala
   trunk/vala/valaattributeprocessor.vala
   trunk/vala/valaerrortype.vala
   trunk/vapi/dbus-glib-1.vapi

Modified: trunk/gobject/valaccodegenerator.vala
==============================================================================
--- trunk/gobject/valaccodegenerator.vala	(original)
+++ trunk/gobject/valaccodegenerator.vala	Sat Apr 19 16:42:51 2008
@@ -3580,6 +3580,8 @@
 			type = new ValueType ((Struct) sym);
 		} else if (sym is Enum) {
 			type = new ValueType ((Enum) sym);
+		} else if (sym is ErrorDomain) {
+			type = new ErrorType ((ErrorDomain) sym);
 		} else {
 			Report.error (null, "internal error: `%s' is not a supported type".printf (sym.get_full_name ()));
 			return new InvalidType ();

Modified: trunk/vala/valaattributeprocessor.vala
==============================================================================
--- trunk/vala/valaattributeprocessor.vala	(original)
+++ trunk/vala/valaattributeprocessor.vala	Sat Apr 19 16:42:51 2008
@@ -70,6 +70,10 @@
 		en.process_attributes ();
 	}
 
+	public override void visit_error_domain (ErrorDomain edomain) {
+		edomain.process_attributes ();
+	}
+
 	public override void visit_method (Method m) {
 		m.process_attributes ();
 

Modified: trunk/vala/valaerrortype.vala
==============================================================================
--- trunk/vala/valaerrortype.vala	(original)
+++ trunk/vala/valaerrortype.vala	Sat Apr 19 16:42:51 2008
@@ -32,7 +32,7 @@
 	 */
 	public weak ErrorDomain? error_domain { get; set; }
 
-	public ErrorType (ErrorDomain? error_domain, SourceReference? source_reference) {
+	public ErrorType (ErrorDomain? error_domain, SourceReference? source_reference = null) {
 		this.error_domain = error_domain;
 		this.data_type = error_domain;
 		this.source_reference = source_reference;

Modified: trunk/vapi/dbus-glib-1.vapi
==============================================================================
--- trunk/vapi/dbus-glib-1.vapi	(original)
+++ trunk/vapi/dbus-glib-1.vapi	Sat Apr 19 16:42:51 2008
@@ -50,9 +50,8 @@
 		public bool is_set ();
 	}
 
-	[ErrorDomain]
 	[CCode (cname = "DBusGError", lower_case_csuffix = "gerror", cprefix = "DBUS_GERROR_")]
-	public enum Error {
+	public errordomain Error {
 		FAILED,
 		NO_MEMORY,
 		SERVICE_UNKNOWN,
@@ -102,13 +101,13 @@
 	public class Proxy {
 		public Proxy.for_name (Connection connection, string name, string path, string interface_);
 		public bool call (string method, out GLib.Error error, GLib.Type first_arg_type, ...);
-		public weak ProxyCall begin_call (string method, ProxyCallNotify notify, pointer data, GLib.DestroyNotify destroy, GLib.Type first_arg_type, ...);
+		public weak ProxyCall begin_call (string method, ProxyCallNotify notify, void* data, GLib.DestroyNotify destroy, GLib.Type first_arg_type, ...);
 		public bool end_call (ProxyCall call, out GLib.Error error, GLib.Type first_arg_type, ...);
 		public void cancel_call (ProxyCall call);
 	}
 
 	[CCode (cname = "DBusGProxyCallNotify")]
-	public static delegate void ProxyCallNotify (Proxy proxy, ProxyCall call_id, pointer user_data);
+	public static delegate void ProxyCallNotify (Proxy proxy, ProxyCall call_id, void* user_data);
 
 	[CCode (cname = "DBusGProxyCall")]
 	public class ProxyCall {