Commit a582b75d authored by Luca Bruno's avatar Luca Bruno

gio-2.0: Fix some regressions intruduced by the GIR switch

parent 71cab952
......@@ -2555,6 +2555,7 @@ public class Vala.GirParser : CodeVisitor {
Property parse_property () {
start_element ("property");
push_node (element_get_name().replace ("-", "_"), false);
bool is_abstract = metadata.get_bool (ArgumentType.ABSTRACT, current.parent.symbol is Interface);
next ();
bool no_array_length;
......@@ -2564,9 +2565,7 @@ public class Vala.GirParser : CodeVisitor {
var prop = new Property (current.name, type, null, null, current.source_reference);
prop.access = SymbolAccessibility.PUBLIC;
prop.external = true;
if (current.parent.symbol is Interface) {
prop.is_abstract = true;
}
prop.is_abstract = is_abstract;
if (no_array_length) {
prop.set_attribute_bool ("CCode", "array_length", false);
}
......
This diff is collapsed.
......@@ -26,11 +26,12 @@ namespace GLib {
public async T get_proxy<T> (string? name, string object_path, GLib.DBusProxyFlags flags = 0, GLib.Cancellable? cancellable = null) throws GLib.IOError;
public T get_proxy_sync<T> (string? name, string object_path, GLib.DBusProxyFlags flags = 0, GLib.Cancellable? cancellable = null) throws GLib.IOError;
public uint register_object<T> (string object_path, T object) throws GLib.IOError;
public async GLib.DBusMessage send_message_with_reply (GLib.DBusMessage message, GLib.DBusSendMessageFlags flags, int timeout_msec, out uint32 out_serial, GLib.Cancellable? cancellable = null) throws GLib.IOError;
public GLib.DBusMessage send_message_with_reply_sync (GLib.DBusMessage message, GLib.DBusSendMessageFlags flags, int timeout_msec, out uint32 out_serial, GLib.Cancellable? cancellable = null) throws GLib.IOError;
public async GLib.DBusMessage send_message_with_reply (GLib.DBusMessage message, GLib.DBusSendMessageFlags flags, int timeout_msec, out uint32 out_serial = null, GLib.Cancellable? cancellable = null) throws GLib.IOError;
public GLib.DBusMessage send_message_with_reply_sync (GLib.DBusMessage message, GLib.DBusSendMessageFlags flags, int timeout_msec, out uint32 out_serial = null, GLib.Cancellable? cancellable = null) throws GLib.IOError;
}
public class DBusMessage : GLib.Object {
[CCode (has_construct_function = false)]
public DBusMessage.method_call (string name, string path, string interface_, string method);
[PrintfFormat, CCode (has_construct_function = false)]
public DBusMessage.method_error (GLib.DBusMessage method_call_message, string error_name, string error_message_format, ...);
......@@ -98,7 +99,8 @@ namespace GLib {
}
public abstract class IOStream : GLib.Object {
public bool close (GLib.Cancellable? cancellable = null) throws GLib.IOError;
[CCode (vfunc_name = "close_fn")]
public virtual bool close (GLib.Cancellable? cancellable = null) throws GLib.IOError;
public virtual async bool close_async (int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.IOError;
}
......@@ -114,7 +116,7 @@ namespace GLib {
public virtual async ssize_t skip_async (size_t count, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.IOError;
}
public class MemoryOutputStream : GLib.OutputStream, GLib.Seekable {
public class MemoryOutputStream : GLib.OutputStream {
[CCode (has_construct_function = false, type = "GOutputStream*")]
public MemoryOutputStream ([CCode (array_length_type = "gsize")] owned uint8[]? data, GLib.ReallocFunc? realloc_function, GLib.DestroyNotify? destroy_function);
}
......@@ -162,9 +164,12 @@ namespace GLib {
}
public class SimpleAsyncResult : GLib.Object, GLib.AsyncResult {
[CCode (has_construct_function = false)]
public SimpleAsyncResult (GLib.Object? source_object, void* source_tag);
[CCode (has_construct_function = false)]
[PrintfFormat]
public SimpleAsyncResult.error (GLib.Object? source_object, GLib.Quark domain, int code, string format, ...);
[CCode (has_construct_function = false)]
public SimpleAsyncResult.from_error (GLib.Object? source_object, GLib.Error error);
[CCode (simple_generics = true)]
public unowned T get_op_res_gpointer<T> ();
......@@ -172,7 +177,7 @@ namespace GLib {
public void set_op_res_gpointer<T> (owned T op_res);
}
public class Socket : GLib.Object, GLib.Initable {
public class Socket : GLib.Object {
public bool condition_wait (GLib.IOCondition condition, GLib.Cancellable? cancellable = null) throws GLib.IOError;
}
......
......@@ -9,14 +9,14 @@ DesktopAppInfo* skip
DesktopAppLaunchCallback skip
FileDescriptorBased* skip
Unix* skip
UnixFDList skip=false
unix_* skip
*.*unix_fd_list* skip
// UnixSocketAddress.abstract#property skip
// DBusConnection
// .call_with_unix_fd_list*.fd_list default=null
// .call_with_unix_fd_list*.out_fd_list nullable default=null
// DBusProxy
// .call_with_unix_fd*.*fd_list nullable default=null
DBusConnection
.call_with_unix_fd_list*.fd_list default=null
.call_with_unix_fd_list*.out_fd_list nullable default=null
DBusProxy
.call_with_unix_fd*.*fd_list nullable default=null
// Move constants around
FILE_ATTRIBUTE_* parent="GLib.FileAttribute" name="FILE_ATTRIBUTE_(.*)"
......@@ -52,6 +52,8 @@ dbus_address_get_for_bus_sync parent="GLib.BusType" name="get_address_sync"
ActionEntry
.activate type="GLib.Callback"
.change_state type="GLib.Callback"
ActionGroup
.query_action#virtual_method virtual
Application.local_command_line
.arguments ref type="unowned string[]"
.exit_status out
......@@ -94,6 +96,9 @@ FileAttributeInfo struct=false
io_extension_get_type skip
IOModuleScope
.free skip
IOStream
.input_stream abstract
.output_stream abstract
InetAddress
.to_bytes type="unowned uint8[]" skip=false
MemoryOutputStream
......@@ -101,6 +106,9 @@ MemoryOutputStream
.steal_data type="uint8[]"
.destroy_function skip=false type="GLib.DestroyNotify?"
.realloc_function skip=false type="GLib.ReallocFunc?"
MenuItem
.set_action_and_target skip=false
.set_attribute skip=false
MenuModel
.get_item_attribute skip=false
Resolver
......@@ -175,7 +183,7 @@ Initable
PollableInputStream
.create_source type="GLib.PollableSource"
.read_nonblocking.buffer type="uint8[]" array_length_idx=1
.read_nonblocking#virtual_method name="read_nonblocking_fn"
.read_nonblocking#virtual_method vfunc_name="read_nonblocking_fn"
PollableOutputStream
.create_source type="GLib.PollableSource"
TlsClientConnection
......@@ -213,6 +221,7 @@ DataOutputStream
.put_* skip
IOStream
.close* skip
.closed skip=false
InputStream
.close* skip
.read* skip
......@@ -289,5 +298,25 @@ DBus*Info.generate_xml.string_builder out=false
// Forward upstream
content_type_from_mime_type nullable
content_type_get_mime_type nullable
ActionGroup
.get_action* nullable
.get_action_state_type unowned
ActionMap
.add_action_entries.entries array array_length_idx=1
\ No newline at end of file
.add_action_entries.entries array array_length_idx=1
AppInfo
.launch.files nullable
.launch_uris.uris nullable
AsyncReadyCallback.source_object nullable
DBusSubtreeDispatchFunc nullable unowned
DBusSubtreeVTable.enumerate skip=false
LoadableIcon
.load_finish.type out nullable unowned=false default=null
Socket
.receive.buffer type="uint8[]" array_length_idx=1
.receive_with_blocking.buffer type="uint8[]" array_length_idx=1
TlsBackend
.get_certificate_type abstract
.get_client_connection_type abstract
.get_file_database_type abstract
.get_server_connection_type abstract
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