Commit 0e64d336 authored by Jürg Billeter's avatar Jürg Billeter Committed by Jürg Billeter

get D-Bus sample working again

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

svn path=/trunk/; revision=1274
parent 5bed9071
2008-04-19 Jürg Billeter <j@bitron.ch>
* vala/valaattributeprocessor.vala, vala/valaerrortype.vala,
vapi/dbus-glib-1.vapi, gobject/valaccodegenerator.vala: get D-Bus
sample working again
2008-04-19 Jürg Billeter <j@bitron.ch>
* vala/valaclass.vala:, vala/valadestructor.vala,
......
......@@ -3580,6 +3580,8 @@ public class Vala.CCodeGenerator : CodeGenerator {
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 ();
......
......@@ -70,6 +70,10 @@ public class Vala.AttributeProcessor : CodeVisitor {
en.process_attributes ();
}
public override void visit_error_domain (ErrorDomain edomain) {
edomain.process_attributes ();
}
public override void visit_method (Method m) {
m.process_attributes ();
......
......@@ -32,7 +32,7 @@ public class Vala.ErrorType : ReferenceType {
*/
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;
......
......@@ -50,9 +50,8 @@ namespace DBus {
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 @@ namespace DBus {
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 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment