Hello everyone,
Here's a patch to update the GIO bindings. Right now it requires you
have a version of GIO from Glib trunk.
It also fixes a small issue with GDummyFile being exposed even though
it is a private API. It probably still
needs some work beyond this, but at least this fixes it so that GIO
should work for anyone with a trunk
version from the past two weeks. If necessary I can make a patch for
GIO Standalone, but since it's been
merged with Glib (and GIO both in Glib and standalone should be
considered unstable), I don't see much
of a point at the moment.
Enjoy and thanks for Vala.
A. Walton
Index: vapi/gio-2.0.vapi
===================================================================
--- vapi/gio-2.0.vapi (revision 761)
+++ vapi/gio-2.0.vapi (working copy)
@@ -2,37 +2,37 @@
[CCode (cprefix = "G", lower_case_cprefix = "g_")]
namespace GLib {
- [CCode (cprefix = "G_APP_INFO_CREATE_", cheader_filename = "gio/gvfs.h")]
+ [CCode (cprefix = "G_APP_INFO_CREATE_", cheader_filename = "gio/gio.h")]
public enum AppInfoCreateFlags {
FLAGS_NONE,
NEEDS_TERMINAL,
}
- [CCode (cprefix = "G_DATA_STREAM_BYTE_ORDER_", cheader_filename = "gio/gvfs.h")]
+ [CCode (cprefix = "G_DATA_STREAM_BYTE_ORDER_", cheader_filename = "gio/gio.h")]
public enum DataStreamByteOrder {
BIG_ENDIAN,
LITTLE_ENDIAN,
HOST_ENDIAN,
}
- [CCode (cprefix = "G_DATA_STREAM_NEWLINE_TYPE_", cheader_filename = "gio/gvfs.h")]
+ [CCode (cprefix = "G_DATA_STREAM_NEWLINE_TYPE_", cheader_filename = "gio/gio.h")]
public enum DataStreamNewlineType {
LF,
CR,
CR_LF,
ANY,
}
- [CCode (cprefix = "G_FILE_ATTRIBUTE_FLAGS_", cheader_filename = "gio/gvfs.h")]
+ [CCode (cprefix = "G_FILE_ATTRIBUTE_FLAGS_", cheader_filename = "gio/gio.h")]
public enum FileAttributeFlags {
NONE,
COPY_WITH_FILE,
COPY_WHEN_MOVED,
}
- [CCode (cprefix = "G_FILE_ATTRIBUTE_STATUS_", cheader_filename = "gio/gvfs.h")]
+ [CCode (cprefix = "G_FILE_ATTRIBUTE_STATUS_", cheader_filename = "gio/gio.h")]
public enum FileAttributeStatus {
UNSET,
SET,
ERROR_SETTING,
}
- [CCode (cprefix = "G_FILE_ATTRIBUTE_TYPE_", cheader_filename = "gio/gvfs.h")]
+ [CCode (cprefix = "G_FILE_ATTRIBUTE_TYPE_", cheader_filename = "gio/gio.h")]
public enum FileAttributeType {
INVALID,
STRING,
@@ -44,19 +44,19 @@
INT64,
OBJECT,
}
- [CCode (cprefix = "G_FILE_COPY_", cheader_filename = "gio/gvfs.h")]
+ [CCode (cprefix = "G_FILE_COPY_", cheader_filename = "gio/gio.h")]
public enum FileCopyFlags {
OVERWRITE,
BACKUP,
NOFOLLOW_SYMLINKS,
ALL_METADATA,
}
- [CCode (cprefix = "G_FILE_CREATE_FLAGS_", cheader_filename = "gio/gvfs.h")]
+ [CCode (cprefix = "G_FILE_CREATE_FLAGS_", cheader_filename = "gio/gio.h")]
public enum FileCreateFlags {
NONE,
PRIVATE,
}
- [CCode (cprefix = "G_FILE_MONITOR_EVENT_", cheader_filename = "gio/gvfs.h")]
+ [CCode (cprefix = "G_FILE_MONITOR_EVENT_", cheader_filename = "gio/gio.h")]
public enum FileMonitorEvent {
CHANGED,
CHANGES_DONE_HINT,
@@ -66,16 +66,16 @@
PRE_UNMOUNT,
UNMOUNTED,
}
- [CCode (cprefix = "G_FILE_MONITOR_FLAGS_", cheader_filename = "gio/gvfs.h")]
+ [CCode (cprefix = "G_FILE_MONITOR_FLAGS_", cheader_filename = "gio/gio.h")]
public enum FileMonitorFlags {
NONE,
MONITOR_MOUNTS,
}
- [CCode (cprefix = "G_FILE_QUERY_INFO_NOFOLLOW_", cheader_filename = "gio/gvfs.h")]
+ [CCode (cprefix = "G_FILE_QUERY_INFO_NOFOLLOW_", cheader_filename = "gio/gio.h")]
public enum FileQueryInfoFlags {
SYMLINKS,
}
- [CCode (cprefix = "G_FILE_TYPE_", cheader_filename = "gio/gvfs.h")]
+ [CCode (cprefix = "G_FILE_TYPE_", cheader_filename = "gio/gio.h")]
public enum FileType {
UNKNOWN,
REGULAR,
@@ -85,7 +85,7 @@
SHORTCUT,
MOUNTABLE,
}
- [CCode (cprefix = "G_IO_ERROR_", cheader_filename = "gio/gvfs.h")]
+ [CCode (cprefix = "G_IO_ERROR_", cheader_filename = "gio/gio.h")]
public enum IOErrorEnum {
FAILED,
NOT_FOUND,
@@ -117,13 +117,13 @@
WOULD_BLOCK,
HOST_NOT_FOUND,
}
- [CCode (cprefix = "G_OUTPUT_STREAM_SPLICE_FLAGS_", cheader_filename = "gio/gvfs.h")]
+ [CCode (cprefix = "G_OUTPUT_STREAM_SPLICE_FLAGS_", cheader_filename = "gio/gio.h")]
public enum OutputStreamSpliceFlags {
NONE,
CLOSE_SOURCE,
CLOSE_TARGET,
}
- [CCode (cprefix = "G_PASSWORD_FLAGS_", cheader_filename = "gio/gvfs.h")]
+ [CCode (cprefix = "G_PASSWORD_FLAGS_", cheader_filename = "gio/gio.h")]
public enum PasswordFlags {
NEED_PASSWORD,
NEED_USERNAME,
@@ -131,19 +131,19 @@
SAVING_SUPPORTED,
ANON_SUPPORTED,
}
- [CCode (cprefix = "G_PASSWORD_SAVE_", cheader_filename = "gio/gvfs.h")]
+ [CCode (cprefix = "G_PASSWORD_SAVE_", cheader_filename = "gio/gio.h")]
public enum PasswordSave {
NEVER,
FOR_SESSION,
PERMANENTLY,
}
- [CCode (cheader_filename = "gio/gfileattribute.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class FileAttributeInfo {
public weak string name;
public GLib.FileAttributeType type;
public GLib.FileAttributeFlags flags;
}
- [CCode (ref_function = "g_file_attribute_info_list_ref", unref_function = "g_file_attribute_info_list_unref", cheader_filename = "gio/gfileattribute.h")]
+ [CCode (ref_function = "g_file_attribute_info_list_ref", unref_function = "g_file_attribute_info_list_unref", cheader_filename = "gio/gio.h")]
public class FileAttributeInfoList {
public weak GLib.FileAttributeInfo infos;
public int n_infos;
@@ -152,7 +152,7 @@
public weak GLib.FileAttributeInfo lookup (string name);
public FileAttributeInfoList ();
}
- [CCode (ref_function = "g_file_attribute_matcher_ref", unref_function = "g_file_attribute_matcher_unref", cheader_filename = "gio/gfileattribute.h")]
+ [CCode (ref_function = "g_file_attribute_matcher_ref", unref_function = "g_file_attribute_matcher_unref", cheader_filename = "gio/gio.h")]
public class FileAttributeMatcher {
public bool enumerate_namespace (string ns);
public weak string enumerate_next ();
@@ -160,7 +160,7 @@
public bool matches_only (string attribute);
public FileAttributeMatcher (string attributes);
}
- [CCode (cheader_filename = "gio/gfileattribute.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class FileAttributeValue {
public GLib.FileAttributeType type;
public GLib.FileAttributeStatus status;
@@ -187,33 +187,33 @@
public void set_uint32 (uint value);
public void set_uint64 (uint64 value);
}
- [CCode (cheader_filename = "gio/gvfs.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class FileIconClass {
}
- [CCode (cheader_filename = "gio/gvfs.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class FileInfoClass {
}
- [CCode (cheader_filename = "gio/gioscheduler.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class IOJob {
public void send_to_mainloop (GLib.IODataFunc func, pointer user_data, GLib.DestroyNotify notify, bool block);
}
- [CCode (cheader_filename = "gio/gvfs.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class IOModuleClass {
}
- [CCode (cheader_filename = "gio/gvfs.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class SimpleAsyncResultClass {
}
- [CCode (cheader_filename = "gio/gvfs.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class ThemedIconClass {
}
- [CCode (cheader_filename = "gio/gvfs.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class AppLaunchContext : GLib.Object {
public virtual weak string get_display (GLib.AppInfo info, GLib.List files);
public virtual weak string get_startup_notify_id (GLib.AppInfo info, GLib.List files);
public virtual void launch_failed (string startup_notify_id);
public AppLaunchContext ();
}
- [CCode (cheader_filename = "gio/gbufferedinputstream.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class BufferedInputStream : GLib.FilterInputStream {
public virtual long fill (long count, GLib.Cancellable cancellable) throws GLib.Error;
public virtual void fill_async (long count, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
@@ -226,7 +226,7 @@
public void set_buffer_size (ulong size);
public weak uint buffer_size { get; set construct; }
}
- [CCode (cheader_filename = "gio/gbufferedoutputstream.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class BufferedOutputStream : GLib.FilterOutputStream {
public bool get_auto_grow ();
public ulong get_buffer_size ();
@@ -236,7 +236,7 @@
public void set_buffer_size (ulong size);
public weak uint buffer_size { get; construct; }
}
- [CCode (cheader_filename = "gio/gcancellable.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class Cancellable : GLib.Object {
public void cancel ();
public static weak GLib.Cancellable get_current ();
@@ -247,7 +247,7 @@
public bool set_error_if_cancelled () throws GLib.Error;
public signal void cancelled ();
}
- [CCode (cheader_filename = "gio/gdatainputstream.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class DataInputStream : GLib.BufferedInputStream {
public GLib.DataStreamByteOrder get_byte_order ();
public GLib.DataStreamNewlineType get_newline_type ();
@@ -264,7 +264,7 @@
public void set_byte_order (GLib.DataStreamByteOrder order);
public void set_newline_type (GLib.DataStreamNewlineType type);
}
- [CCode (cheader_filename = "gio/gdataoutputstream.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class DataOutputStream : GLib.FilterOutputStream {
public GLib.DataStreamByteOrder get_byte_order ();
public DataOutputStream (GLib.OutputStream base_stream);
@@ -279,7 +279,7 @@
public void set_byte_order (GLib.DataStreamByteOrder order);
public void set_expand_buffer (bool expand_buffer);
}
- [CCode (cheader_filename = "gio/gdirectorymonitor.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class DirectoryMonitor : GLib.Object {
public virtual bool cancel ();
public void emit_event (GLib.File child, GLib.File other_file, GLib.FileMonitorEvent event_type);
@@ -287,11 +287,7 @@
public void set_rate_limit (int limit_msecs);
public signal void changed (GLib.File child, GLib.File other_file, int event_type);
}
- [CCode (cheader_filename = "gio/gdummyfile.h")]
- public class DummyFile : GLib.Object, GLib.File {
- public DummyFile (string uri);
- }
- [CCode (cheader_filename = "gio/gfileenumerator.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class FileEnumerator : GLib.Object {
public virtual bool close (GLib.Cancellable cancellable) throws GLib.Error;
public virtual void close_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
@@ -303,12 +299,12 @@
public virtual weak GLib.List next_files_finish (GLib.AsyncResult result) throws GLib.Error;
public void set_pending (bool pending);
}
- [CCode (cheader_filename = "gio/gfileicon.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class FileIcon : GLib.Object, GLib.Icon, GLib.LoadableIcon {
public weak GLib.File get_file ();
public FileIcon (GLib.File file);
}
- [CCode (cheader_filename = "gio/gfileinfo.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class FileInfo : GLib.Object {
public void clear_status ();
public void copy_into (GLib.FileInfo dest_info);
@@ -365,7 +361,7 @@
public void set_symlink_target (string symlink_target);
public void unset_attribute_mask ();
}
- [CCode (cheader_filename = "gio/gfileinputstream.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class FileInputStream : GLib.InputStream, GLib.Seekable {
public virtual bool can_seek ();
public virtual weak GLib.FileInfo query_info (string attributes, GLib.Cancellable cancellable) throws GLib.Error;
@@ -374,7 +370,7 @@
public virtual bool seek (int64 offset, GLib.SeekType type, GLib.Cancellable cancellable) throws GLib.Error;
public virtual int64 tell ();
}
- [CCode (cheader_filename = "gio/gfilemonitor.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class FileMonitor : GLib.Object {
public virtual bool cancel ();
public static weak GLib.DirectoryMonitor directory (GLib.File file, GLib.FileMonitorFlags flags, GLib.Cancellable cancellable);
@@ -384,7 +380,7 @@
public void set_rate_limit (int limit_msecs);
public signal void changed (GLib.File file, GLib.File other_file, int event_type);
}
- [CCode (cheader_filename = "gio/gfileoutputstream.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class FileOutputStream : GLib.OutputStream, GLib.Seekable {
public virtual bool can_seek ();
public virtual bool can_truncate ();
@@ -396,7 +392,7 @@
public virtual int64 tell ();
public virtual bool truncate (int64 size, GLib.Cancellable cancellable) throws GLib.Error;
}
- [CCode (cheader_filename = "gio/gfilenamecompleter.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class FilenameCompleter : GLib.Object {
public weak string get_completion_suffix (string initial_text);
public weak string get_completions (string initial_text);
@@ -404,25 +400,25 @@
public void set_dirs_only (bool dirs_only);
public signal void got_completion_data ();
}
- [CCode (cheader_filename = "gio/gfilterinputstream.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class FilterInputStream : GLib.InputStream {
public weak GLib.InputStream get_base_stream ();
[NoAccessorMethod]
public weak GLib.InputStream base_stream { get; construct; }
}
- [CCode (cheader_filename = "gio/gfilteroutputstream.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class FilterOutputStream : GLib.OutputStream {
public weak GLib.OutputStream get_base_stream ();
[NoAccessorMethod]
public weak GLib.OutputStream base_stream { get; construct; }
}
- [CCode (cheader_filename = "gio/giomodule.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class IOModule : GLib.TypeModule, GLib.TypePlugin {
public void load ();
public IOModule (string filename);
public void unload ();
}
- [CCode (cheader_filename = "gio/ginputstream.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class InputStream : GLib.Object {
public virtual bool close (GLib.Cancellable cancellable) throws GLib.Error;
public virtual void close_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
@@ -438,14 +434,14 @@
public virtual void skip_async (ulong count, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
public virtual long skip_finish (GLib.AsyncResult result) throws GLib.Error;
}
- [CCode (cheader_filename = "gio/gmemoryinputstream.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class MemoryInputStream : GLib.InputStream, GLib.Seekable {
public static weak GLib.InputStream from_data (pointer data, long len);
public pointer get_data ();
public ulong get_data_size ();
public void set_free_data (bool free_data);
}
- [CCode (cheader_filename = "gio/gmemoryoutputstream.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class MemoryOutputStream : GLib.OutputStream, GLib.Seekable {
public weak GLib.ByteArray get_data ();
public MemoryOutputStream (GLib.ByteArray data);
@@ -458,7 +454,7 @@
[NoAccessorMethod]
public weak uint size_limit { get; set; }
}
- [CCode (cheader_filename = "gio/gmountoperation.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class MountOperation : GLib.Object {
public bool get_anonymous ();
public int get_choice ();
@@ -478,7 +474,7 @@
[HasEmitter]
public signal void reply (bool abort);
}
- [CCode (cheader_filename = "gio/goutputstream.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class OutputStream : GLib.Object {
public virtual bool close (GLib.Cancellable cancellable) throws GLib.Error;
public virtual void close_async (int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
@@ -497,7 +493,7 @@
public virtual void write_async (pointer buffer, ulong count, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
public virtual long write_finish (GLib.AsyncResult result) throws GLib.Error;
}
- [CCode (cheader_filename = "gio/gsimpleasyncresult.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class SimpleAsyncResult : GLib.Object, GLib.AsyncResult {
public void complete ();
public void complete_in_idle ();
@@ -518,22 +514,22 @@
public void set_op_res_gpointer (pointer op_res, GLib.DestroyNotify destroy_op_res);
public void set_op_res_gssize (long op_res);
}
- [CCode (cheader_filename = "gio/gsocketinputstream.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class SocketInputStream : GLib.InputStream {
public SocketInputStream (int fd, bool close_fd_at_close);
}
- [CCode (cheader_filename = "gio/gsocketoutputstream.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class SocketOutputStream : GLib.OutputStream {
public SocketOutputStream (int fd, bool close_fd_at_close);
}
- [CCode (cheader_filename = "gio/gthemedicon.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class ThemedIcon : GLib.Object, GLib.Icon {
public weak string get_names ();
public ThemedIcon (string iconname);
[NoArrayLength]
public ThemedIcon.from_names (string[] iconnames, int len);
}
- [CCode (cheader_filename = "gio/gvfs.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class Vfs : GLib.Object {
public static weak GLib.Vfs get_default ();
public virtual weak GLib.File get_file_for_path (string path);
@@ -543,7 +539,7 @@
public virtual bool is_active ();
public virtual weak GLib.File parse_name (string parse_name);
}
- [CCode (cheader_filename = "gio/gvolumemonitor.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public class VolumeMonitor : GLib.Object {
public static weak GLib.VolumeMonitor get ();
public virtual weak GLib.List get_connected_drives ();
@@ -554,7 +550,7 @@
public signal void volume_pre_unmount (GLib.Volume volume);
public signal void volume_unmounted (GLib.Volume volume);
}
- [CCode (cheader_filename = "gio/gappinfo.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public interface AppInfo : GLib.Object {
public abstract bool add_supports_type (string content_type) throws GLib.Error;
public abstract bool can_remove_supports_type ();
@@ -578,12 +574,12 @@
public abstract bool should_show (string desktop_env);
public abstract bool supports_uris ();
}
- [CCode (cheader_filename = "gio/gvfs.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public interface AsyncResult : GLib.Object {
public abstract weak GLib.Object get_source_object ();
public abstract pointer get_user_data ();
}
- [CCode (cheader_filename = "gio/gvfs.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public interface Drive : GLib.Object {
public abstract bool can_eject ();
public abstract bool can_mount ();
@@ -598,7 +594,7 @@
public abstract bool mount_finish (GLib.AsyncResult result) throws GLib.Error;
public signal void changed ();
}
- [CCode (cheader_filename = "gio/gfile.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public interface File : GLib.Object {
public abstract weak GLib.FileOutputStream append_to (GLib.FileCreateFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
public abstract void append_to_async (GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
@@ -676,18 +672,18 @@
public abstract void unmount_mountable (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
public abstract bool unmount_mountable_finish (GLib.AsyncResult result) throws GLib.Error;
}
- [CCode (cheader_filename = "gio/gicon.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public interface Icon : GLib.Object {
public abstract bool equal (GLib.Icon icon2);
public static uint hash (pointer icon);
}
- [CCode (cheader_filename = "gio/gvfs.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public interface LoadableIcon : GLib.Icon, GLib.Object {
public abstract weak GLib.InputStream load (int size, out string type, GLib.Cancellable cancellable) throws GLib.Error;
public abstract void load_async (int size, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
public abstract weak GLib.InputStream load_finish (GLib.AsyncResult res, out string type) throws GLib.Error;
}
- [CCode (cheader_filename = "gio/gseekable.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public interface Seekable : GLib.Object {
public abstract bool can_seek ();
public abstract bool can_truncate ();
@@ -695,7 +691,7 @@
public abstract int64 tell ();
public abstract bool truncate (int64 offset, GLib.Cancellable cancellable) throws GLib.Error;
}
- [CCode (cheader_filename = "gio/gvolume.h")]
+ [CCode (cheader_filename = "gio/gio.h")]
public interface Volume : GLib.Object {
public abstract bool can_eject ();
public abstract bool can_unmount ();
_______________________________________________
Vala-list mailing list
[email protected]
http://mail.gnome.org/mailman/listinfo/vala-list
