From 615e046387eba9dd3f29f36988815b6bf02d47a1 Mon Sep 17 00:00:00 2001 From: Juerg Billeter Date: Wed, 12 Dec 2007 19:44:26 +0000 Subject: [PATCH] readd support for void UnresolvedType, still required for vapigen 2007-12-12 Juerg Billeter * vala/valasymbolresolver.vala: readd support for void UnresolvedType, still required for vapigen * gobject-introspection/gidl.vapi: add IdlNodeUnion * vapigen/valagidlparser.vala: add support for unions * vapi/packages/libgnome-2.0/, vapi/packages/libgnomeui-2.0/: remove bindings for deprecated functions * vapi/gconf-2.0.vapi, vapi/gio-2.0.vapi, vapi/gnome-vfs-2.0.vapi, vapi/gstreamer-0.10.vapi, vapi/libgnome-2.0.vapi, vapi/libgnomeui-2.0.vapi, vapi/libnotify.vapi, vapi/libsoup-2.2.vapi, vapi/poppler-glib.vapi: regenerated svn path=/trunk/; revision=766 --- ChangeLog | 17 + gobject-introspection/gidl.vapi | 7 + vala/valasymbolresolver.vala | 5 + vapi/gconf-2.0.vapi | 4 +- vapi/gio-2.0.vapi | 16 +- vapi/gnome-vfs-2.0.vapi | 68 +- vapi/gstreamer-0.10.vapi | 45 +- vapi/libgnome-2.0.vapi | 50 +- vapi/libgnomeui-2.0.vapi | 559 ---- vapi/libnotify.vapi | 2 +- vapi/libsoup-2.2.vapi | 33 +- vapi/packages/libgnome-2.0/libgnome-2.0.defines | 1 + vapi/packages/libgnome-2.0/libgnome-2.0.gi | 267 +- .../packages/libgnomeui-2.0/libgnomeui-2.0.defines | 1 + vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi | 3212 +------------------- vapi/packages/libsoup-2.2/libsoup-2.2-custom.vala | 33 - vapi/packages/libsoup-2.2/libsoup-2.2.gi | 12 + vapi/poppler-glib.vapi | 2 +- vapigen/valagidlparser.vala | 124 + 19 files changed, 375 insertions(+), 4083 deletions(-) create mode 100644 vapi/packages/libgnome-2.0/libgnome-2.0.defines create mode 100644 vapi/packages/libgnomeui-2.0/libgnomeui-2.0.defines delete mode 100644 vapi/packages/libsoup-2.2/libsoup-2.2-custom.vala diff --git a/ChangeLog b/ChangeLog index 79cf1d4..641586a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,22 @@ 2007-12-12 Jürg Billeter + * vala/valasymbolresolver.vala: readd support for void UnresolvedType, + still required for vapigen + + * gobject-introspection/gidl.vapi: add IdlNodeUnion + + * vapigen/valagidlparser.vala: add support for unions + + * vapi/packages/libgnome-2.0/, vapi/packages/libgnomeui-2.0/: remove + bindings for deprecated functions + + * vapi/gconf-2.0.vapi, vapi/gio-2.0.vapi, vapi/gnome-vfs-2.0.vapi, + vapi/gstreamer-0.10.vapi, vapi/libgnome-2.0.vapi, + vapi/libgnomeui-2.0.vapi, vapi/libnotify.vapi, vapi/libsoup-2.2.vapi, + vapi/poppler-glib.vapi: regenerated + +2007-12-12 Jürg Billeter + * vala/valasemanticanalyzer.vala: support assignment of lambda expressions to local variables diff --git a/gobject-introspection/gidl.vapi b/gobject-introspection/gidl.vapi index 0d2181a..28498a0 100644 --- a/gobject-introspection/gidl.vapi +++ b/gobject-introspection/gidl.vapi @@ -190,6 +190,13 @@ namespace GLib { } [CCode (free_function = "g_idl_node_free", cheader_filename = "gidlnode.h")] + public class IdlNodeUnion { + public bool deprecated; + + public List members; + } + + [CCode (free_function = "g_idl_node_free", cheader_filename = "gidlnode.h")] public class IdlNodeType { public bool is_pointer; public bool is_basic; diff --git a/vala/valasymbolresolver.vala b/vala/valasymbolresolver.vala index bb715da..40b8c27 100644 --- a/vala/valasymbolresolver.vala +++ b/vala/valasymbolresolver.vala @@ -192,6 +192,11 @@ public class Vala.SymbolResolver : CodeVisitor { type.add_type_argument (type_arg); } + // still required for vapigen + if (unresolved_type.type_name == "void") { + return type; + } + if (unresolved_type.namespace_name == null) { Symbol sym = null; Scope scope = current_scope; diff --git a/vapi/gconf-2.0.vapi b/vapi/gconf-2.0.vapi index 8339a14..d70d619 100644 --- a/vapi/gconf-2.0.vapi +++ b/vapi/gconf-2.0.vapi @@ -198,7 +198,7 @@ namespace GConf { } [CCode (ref_function = "gconf_change_set_ref", unref_function = "gconf_change_set_unref", cheader_filename = "gconf/gconf.h")] public class ChangeSet : GLib.Boxed { - public bool check_value (string key, out GConf.Value value_retloc); + public bool check_value (string key, out weak GConf.Value value_retloc); public void clear (); public void @foreach (GConf.ChangeSetForeachFunc func, pointer user_data); public pointer get_user_data (); @@ -290,7 +290,7 @@ namespace GConf { public static weak string enum_to_string (GConf.EnumStringPair[] lookup_table, int enum_value); public static GLib.Quark error_quark (); public static weak string escape_key (string arbitrary_text, int len); - public static bool init (int argc, out string argv) throws GLib.Error; + public static bool init (int argc, out weak string argv) throws GLib.Error; public static bool is_initialized (); public static bool key_is_below (string above, string below); [NoArrayLength] diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index 3eb2561..7860a44 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -629,11 +629,11 @@ namespace GLib { public abstract bool has_uri_scheme (string uri_scheme); public static uint hash (pointer file); public abstract bool is_native (); - public bool load_contents (GLib.Cancellable cancellable, out string contents, ulong length, out string etag_out) throws GLib.Error; + public bool load_contents (GLib.Cancellable cancellable, out weak string contents, ulong length, out weak string etag_out) throws GLib.Error; public void load_contents_async (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public bool load_contents_finish (GLib.AsyncResult res, out string contents, ulong length, out string etag_out) throws GLib.Error; + public bool load_contents_finish (GLib.AsyncResult res, out weak string contents, ulong length, out weak string etag_out) throws GLib.Error; public void load_partial_contents_async (GLib.Cancellable cancellable, GLib.FileReadMoreCallback read_more_callback, GLib.AsyncReadyCallback callback, pointer user_data); - public bool load_partial_contents_finish (GLib.AsyncResult res, out string contents, ulong length, out string etag_out) throws GLib.Error; + public bool load_partial_contents_finish (GLib.AsyncResult res, out weak string contents, ulong length, out weak string etag_out) throws GLib.Error; public abstract bool make_directory (GLib.Cancellable cancellable) throws GLib.Error; public abstract bool make_symbolic_link (string symlink_value, GLib.Cancellable cancellable) throws GLib.Error; public abstract void mount_mountable (GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); @@ -654,9 +654,9 @@ namespace GLib { public abstract weak GLib.FileInputStream read_finish (GLib.AsyncResult res) throws GLib.Error; public abstract weak GLib.FileOutputStream replace (string etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable cancellable) throws GLib.Error; public abstract void replace_async (string etag, bool make_backup, GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public bool replace_contents (string contents, ulong length, string etag, bool make_backup, GLib.FileCreateFlags flags, out string new_etag, GLib.Cancellable cancellable) throws GLib.Error; + public bool replace_contents (string contents, ulong length, string etag, bool make_backup, GLib.FileCreateFlags flags, out weak string new_etag, GLib.Cancellable cancellable) throws GLib.Error; public void replace_contents_async (string contents, ulong length, string etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public bool replace_contents_finish (GLib.AsyncResult res, out string new_etag) throws GLib.Error; + public bool replace_contents_finish (GLib.AsyncResult res, out weak string new_etag) throws GLib.Error; public abstract weak GLib.FileOutputStream replace_finish (GLib.AsyncResult res) throws GLib.Error; public abstract weak GLib.File resolve_relative_path (string relative_path); public abstract bool set_attribute (string attribute, GLib.FileAttributeValue value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error; @@ -667,7 +667,7 @@ namespace GLib { public bool set_attribute_uint32 (string attribute, uint value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error; public bool set_attribute_uint64 (string attribute, uint64 value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error; public abstract void set_attributes_async (GLib.FileInfo info, GLib.FileQueryInfoFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); - public abstract bool set_attributes_finish (GLib.AsyncResult result, out GLib.FileInfo info) throws GLib.Error; + public abstract bool set_attributes_finish (GLib.AsyncResult result, out weak GLib.FileInfo info) throws GLib.Error; public abstract bool set_attributes_from_info (GLib.FileInfo info, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error; public abstract weak GLib.File set_display_name (string display_name, GLib.Cancellable cancellable) throws GLib.Error; public abstract void set_display_name_async (string display_name, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data); @@ -683,9 +683,9 @@ namespace GLib { } [CCode (cheader_filename = "gio/gvfs.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 weak GLib.InputStream load (int size, out weak 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; + public abstract weak GLib.InputStream load_finish (GLib.AsyncResult res, out weak string type) throws GLib.Error; } [CCode (cheader_filename = "gio/gseekable.h")] public interface Seekable : GLib.Object { diff --git a/vapi/gnome-vfs-2.0.vapi b/vapi/gnome-vfs-2.0.vapi index 5b2607b..2430341 100644 --- a/vapi/gnome-vfs-2.0.vapi +++ b/vapi/gnome-vfs-2.0.vapi @@ -427,7 +427,7 @@ namespace GnomeVFS { public pointer action; public pointer reserved1; public GnomeVFS.Result launch (GLib.List uris); - public GnomeVFS.Result launch_with_env (GLib.List uris, out string envp); + public GnomeVFS.Result launch_with_env (GLib.List uris, out weak string envp); } [CCode (copy_function = "gnome_vfs_mime_application_copy", cheader_filename = "libgnomevfs/gnome-vfs.h")] public class MimeApplication { @@ -449,7 +449,7 @@ namespace GnomeVFS { public weak string get_name (); public weak string get_startup_wm_class (); public GnomeVFS.Result launch (GLib.List uris); - public GnomeVFS.Result launch_with_env (GLib.List uris, out string envp); + public GnomeVFS.Result launch_with_env (GLib.List uris, out weak string envp); public static void list_free (GLib.List list); public MimeApplication.from_desktop_id (string id); public MimeApplication.from_id (string id); @@ -928,52 +928,52 @@ namespace GnomeVFS { public static void application_registry_unset_key (string app_id, string key); public static void async_cancel (GnomeVFS.AsyncHandle handle); public static void async_close (GnomeVFS.AsyncHandle handle, GnomeVFS.AsyncCloseCallback callback, pointer callback_data); - public static void async_create (out GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data); - public static void async_create_as_channel (out GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncCreateAsChannelCallback callback, pointer callback_data); - public static void async_create_symbolic_link (out GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, string uri_reference, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data); - public static void async_create_uri (out GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data); - public static void async_create_uri_as_channel (out GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncCreateAsChannelCallback callback, pointer callback_data); + public static void async_create (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data); + public static void async_create_as_channel (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncCreateAsChannelCallback callback, pointer callback_data); + public static void async_create_symbolic_link (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, string uri_reference, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data); + public static void async_create_uri (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data); + public static void async_create_uri_as_channel (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncCreateAsChannelCallback callback, pointer callback_data); public static void async_file_control (GnomeVFS.AsyncHandle handle, string operation, pointer operation_data, GLib.DestroyNotify operation_data_destroy_func, GnomeVFS.AsyncFileControlCallback callback, pointer callback_data); - public static void async_find_directory (out GnomeVFS.AsyncHandle handle_return, GLib.List near_uri_list, GnomeVFS.FindDirectoryKind kind, bool create_if_needed, bool find_if_needed, uint permissions, int priority, GnomeVFS.AsyncFindDirectoryCallback callback, pointer user_data); - public static void async_get_file_info (out GnomeVFS.AsyncHandle handle_return, GLib.List uri_list, GnomeVFS.FileInfoOptions options, int priority, GnomeVFS.AsyncGetFileInfoCallback callback, pointer callback_data); + public static void async_find_directory (out weak GnomeVFS.AsyncHandle handle_return, GLib.List near_uri_list, GnomeVFS.FindDirectoryKind kind, bool create_if_needed, bool find_if_needed, uint permissions, int priority, GnomeVFS.AsyncFindDirectoryCallback callback, pointer user_data); + public static void async_get_file_info (out weak GnomeVFS.AsyncHandle handle_return, GLib.List uri_list, GnomeVFS.FileInfoOptions options, int priority, GnomeVFS.AsyncGetFileInfoCallback callback, pointer callback_data); public static int async_get_job_limit (); - public static void async_load_directory (out GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.FileInfoOptions options, uint items_per_notification, int priority, GnomeVFS.AsyncDirectoryLoadCallback callback, pointer callback_data); - public static void async_load_directory_uri (out GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.FileInfoOptions options, uint items_per_notification, int priority, GnomeVFS.AsyncDirectoryLoadCallback callback, pointer callback_data); + public static void async_load_directory (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.FileInfoOptions options, uint items_per_notification, int priority, GnomeVFS.AsyncDirectoryLoadCallback callback, pointer callback_data); + public static void async_load_directory_uri (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.FileInfoOptions options, uint items_per_notification, int priority, GnomeVFS.AsyncDirectoryLoadCallback callback, pointer callback_data); public static void async_module_callback_pop (string callback_name); public static void async_module_callback_push (string callback_name, GnomeVFS.AsyncModuleCallback callback, pointer callback_data, GLib.DestroyNotify destroy_notify); public static void async_module_callback_set_default (string callback_name, GnomeVFS.AsyncModuleCallback callback, pointer callback_data, GLib.DestroyNotify destroy_notify); - public static void async_open (out GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data); - public static void async_open_as_channel (out GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, uint advised_block_size, int priority, GnomeVFS.AsyncOpenAsChannelCallback callback, pointer callback_data); - public static void async_open_uri (out GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data); - public static void async_open_uri_as_channel (out GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, uint advised_block_size, int priority, GnomeVFS.AsyncOpenAsChannelCallback callback, pointer callback_data); + public static void async_open (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data); + public static void async_open_as_channel (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, uint advised_block_size, int priority, GnomeVFS.AsyncOpenAsChannelCallback callback, pointer callback_data); + public static void async_open_uri (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data); + public static void async_open_uri_as_channel (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, uint advised_block_size, int priority, GnomeVFS.AsyncOpenAsChannelCallback callback, pointer callback_data); public static void async_read (GnomeVFS.AsyncHandle handle, pointer buffer, uint bytes, GnomeVFS.AsyncReadCallback callback, pointer callback_data); public static void async_seek (GnomeVFS.AsyncHandle handle, GnomeVFS.SeekPosition whence, GnomeVFS.FileOffset offset, GnomeVFS.AsyncSeekCallback callback, pointer callback_data); - public static void async_set_file_info (out GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.FileInfo info, GnomeVFS.SetFileInfoMask mask, GnomeVFS.FileInfoOptions options, int priority, GnomeVFS.AsyncSetFileInfoCallback callback, pointer callback_data); + public static void async_set_file_info (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.FileInfo info, GnomeVFS.SetFileInfoMask mask, GnomeVFS.FileInfoOptions options, int priority, GnomeVFS.AsyncSetFileInfoCallback callback, pointer callback_data); public static void async_set_job_limit (int limit); public static void async_write (GnomeVFS.AsyncHandle handle, pointer buffer, uint bytes, GnomeVFS.AsyncWriteCallback callback, pointer callback_data); - public static GnomeVFS.Result async_xfer (out GnomeVFS.AsyncHandle handle_return, GLib.List source_uri_list, GLib.List target_uri_list, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOverwriteMode overwrite_mode, int priority, GnomeVFS.AsyncXferProgressCallback progress_update_callback, pointer update_callback_data, GnomeVFS.XferProgressCallback progress_sync_callback, pointer sync_callback_data); + public static GnomeVFS.Result async_xfer (out weak GnomeVFS.AsyncHandle handle_return, GLib.List source_uri_list, GLib.List target_uri_list, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOverwriteMode overwrite_mode, int priority, GnomeVFS.AsyncXferProgressCallback progress_update_callback, pointer update_callback_data, GnomeVFS.XferProgressCallback progress_sync_callback, pointer sync_callback_data); public static GnomeVFS.Result check_same_fs (string source, string target, bool same_fs_return); public static GnomeVFS.Result check_same_fs_uris (GnomeVFS.URI source_uri, GnomeVFS.URI target_uri, bool same_fs_return); public static GnomeVFS.Result close (GnomeVFS.Handle handle); public static void connect_to_server (string uri, string display_name, string icon); - public static GnomeVFS.Result create (out GnomeVFS.Handle handle, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm); + public static GnomeVFS.Result create (out weak GnomeVFS.Handle handle, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm); public static GnomeVFS.Result create_symbolic_link (GnomeVFS.URI uri, string target_reference); - public static GnomeVFS.Result create_uri (out GnomeVFS.Handle handle, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm); + public static GnomeVFS.Result create_uri (out weak GnomeVFS.Handle handle, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm); public static GnomeVFS.Result directory_close (GnomeVFS.DirectoryHandle handle); public static GnomeVFS.Result directory_list_load (GLib.List list, string text_uri, GnomeVFS.FileInfoOptions options); - public static GnomeVFS.Result directory_open (out GnomeVFS.DirectoryHandle handle, string text_uri, GnomeVFS.FileInfoOptions options); - public static GnomeVFS.Result directory_open_from_uri (out GnomeVFS.DirectoryHandle handle, GnomeVFS.URI uri, GnomeVFS.FileInfoOptions options); + public static GnomeVFS.Result directory_open (out weak GnomeVFS.DirectoryHandle handle, string text_uri, GnomeVFS.FileInfoOptions options); + public static GnomeVFS.Result directory_open_from_uri (out weak GnomeVFS.DirectoryHandle handle, GnomeVFS.URI uri, GnomeVFS.FileInfoOptions options); public static GnomeVFS.Result directory_read_next (GnomeVFS.DirectoryHandle handle, GnomeVFS.FileInfo file_info); public static GnomeVFS.Result directory_visit (string text_uri, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, pointer data); public static GnomeVFS.Result directory_visit_files (string text_uri, GLib.List file_list, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, pointer data); public static GnomeVFS.Result directory_visit_files_at_uri (GnomeVFS.URI uri, GLib.List file_list, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, pointer data); public static GnomeVFS.Result directory_visit_uri (GnomeVFS.URI uri, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, pointer data); - public static GnomeVFS.Result dns_sd_browse (out GnomeVFS.DNSSDBrowseHandle handle, string domain, string type, GnomeVFS.DNSSDBrowseCallback callback, pointer callback_data, GLib.DestroyNotify callback_data_destroy_func); - public static GnomeVFS.Result dns_sd_browse_sync (string domain, string type, int timeout_msec, int n_services, out GnomeVFS.DNSSDService services); + public static GnomeVFS.Result dns_sd_browse (out weak GnomeVFS.DNSSDBrowseHandle handle, string domain, string type, GnomeVFS.DNSSDBrowseCallback callback, pointer callback_data, GLib.DestroyNotify callback_data_destroy_func); + public static GnomeVFS.Result dns_sd_browse_sync (string domain, string type, int timeout_msec, int n_services, out weak GnomeVFS.DNSSDService services); public static GnomeVFS.Result dns_sd_cancel_resolve (GnomeVFS.DNSSDResolveHandle handle); public static GnomeVFS.Result dns_sd_list_browse_domains_sync (string domain, int timeout_msec, GLib.List domains); - public static GnomeVFS.Result dns_sd_resolve (out GnomeVFS.DNSSDResolveHandle handle, string name, string type, string domain, int timeout, GnomeVFS.DNSSDResolveCallback callback, pointer callback_data, GLib.DestroyNotify callback_data_destroy_func); - public static GnomeVFS.Result dns_sd_resolve_sync (string name, string type, string domain, int timeout_msec, out string host, int port, GLib.HashTable text, int text_raw_len_out, out string text_raw_out); + public static GnomeVFS.Result dns_sd_resolve (out weak GnomeVFS.DNSSDResolveHandle handle, string name, string type, string domain, int timeout, GnomeVFS.DNSSDResolveCallback callback, pointer callback_data, GLib.DestroyNotify callback_data_destroy_func); + public static GnomeVFS.Result dns_sd_resolve_sync (string name, string type, string domain, int timeout_msec, out weak string host, int port, GLib.HashTable text, int text_raw_len_out, out weak string text_raw_out); public static GnomeVFS.Result dns_sd_stop_browse (GnomeVFS.DNSSDBrowseHandle handle); public static weak string escape_host_and_path_string (string path); public static weak string escape_path_string (string path); @@ -982,7 +982,7 @@ namespace GnomeVFS { public static weak string escape_string (string string); public static weak string expand_initial_tilde (string path); public static GnomeVFS.Result file_control (GnomeVFS.Handle handle, string operation, pointer operation_data); - public static GnomeVFS.Result find_directory (GnomeVFS.URI near_uri, GnomeVFS.FindDirectoryKind kind, out GnomeVFS.URI result, bool create_if_needed, bool find_if_needed, uint permissions); + public static GnomeVFS.Result find_directory (GnomeVFS.URI near_uri, GnomeVFS.FindDirectoryKind kind, out weak GnomeVFS.URI result, bool create_if_needed, bool find_if_needed, uint permissions); public static GnomeVFS.Result forget_cache (GnomeVFS.Handle handle, GnomeVFS.FileOffset offset, GnomeVFS.FileSize size); public static weak string format_file_size_for_display (GnomeVFS.FileSize size); public static weak string format_uri_for_display (string uri); @@ -1072,22 +1072,22 @@ namespace GnomeVFS { public static void module_callback_pop (string callback_name); public static void module_callback_push (string callback_name, GnomeVFS.ModuleCallback callback, pointer callback_data, GLib.DestroyNotify destroy_notify); public static void module_callback_set_default (string callback_name, GnomeVFS.ModuleCallback callback, pointer callback_data, GLib.DestroyNotify destroy_notify); - public static GnomeVFS.Result monitor_add (out GnomeVFS.MonitorHandle handle, string text_uri, GnomeVFS.MonitorType monitor_type, GnomeVFS.MonitorCallback callback, pointer user_data); + public static GnomeVFS.Result monitor_add (out weak GnomeVFS.MonitorHandle handle, string text_uri, GnomeVFS.MonitorType monitor_type, GnomeVFS.MonitorCallback callback, pointer user_data); public static GnomeVFS.Result monitor_cancel (GnomeVFS.MonitorHandle handle); public static GnomeVFS.Result move (string old_text_uri, string new_text_uri, bool force_replace); public static GnomeVFS.Result move_uri (GnomeVFS.URI old_uri, GnomeVFS.URI new_uri, bool force_replace); - public static GnomeVFS.Result open (out GnomeVFS.Handle handle, string text_uri, GnomeVFS.OpenMode open_mode); - public static GnomeVFS.Result open_fd (out GnomeVFS.Handle handle, int filedes); - public static GnomeVFS.Result open_uri (out GnomeVFS.Handle handle, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode); + public static GnomeVFS.Result open (out weak GnomeVFS.Handle handle, string text_uri, GnomeVFS.OpenMode open_mode); + public static GnomeVFS.Result open_fd (out weak GnomeVFS.Handle handle, int filedes); + public static GnomeVFS.Result open_uri (out weak GnomeVFS.Handle handle, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode); public static void postinit (pointer app, pointer modinfo); public static void preinit (pointer app, pointer modinfo); public static GnomeVFS.Result read (GnomeVFS.Handle handle, pointer buffer, GnomeVFS.FileSize bytes, GnomeVFS.FileSize bytes_read); - public static GnomeVFS.Result read_entire_file (string uri, int file_size, out string file_contents); + public static GnomeVFS.Result read_entire_file (string uri, int file_size, out weak string file_contents); public static GnomeVFS.Result remove_directory (string text_uri); public static GnomeVFS.Result remove_directory_from_uri (GnomeVFS.URI uri); - public static GnomeVFS.Result resolve (string hostname, out GnomeVFS.ResolveHandle handle); + public static GnomeVFS.Result resolve (string hostname, out weak GnomeVFS.ResolveHandle handle); public static void resolve_free (GnomeVFS.ResolveHandle handle); - public static bool resolve_next_address (GnomeVFS.ResolveHandle handle, out GnomeVFS.Address address); + public static bool resolve_next_address (GnomeVFS.ResolveHandle handle, out weak GnomeVFS.Address address); public static void resolve_reset_to_beginning (GnomeVFS.ResolveHandle handle); public static GnomeVFS.Result result_from_errno (); public static GnomeVFS.Result result_from_errno_code (int errno_code); @@ -1108,7 +1108,7 @@ namespace GnomeVFS { public static GnomeVFS.Result unlink_from_uri (GnomeVFS.URI uri); public static bool uris_match (string uri_1, string uri_2); public static GnomeVFS.Result url_show (string url); - public static GnomeVFS.Result url_show_with_env (string url, out string envp); + public static GnomeVFS.Result url_show_with_env (string url, out weak string envp); public static GnomeVFS.Result write (GnomeVFS.Handle handle, pointer buffer, GnomeVFS.FileSize bytes, GnomeVFS.FileSize bytes_written); public static GnomeVFS.Result xfer_delete_list (GLib.List source_uri_list, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferProgressCallback progress_callback, pointer data); public static GnomeVFS.Result xfer_uri (GnomeVFS.URI source_uri, GnomeVFS.URI target_uri, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOverwriteMode overwrite_mode, GnomeVFS.XferProgressCallback progress_callback, pointer data); diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi index 65b3761..603a175 100644 --- a/vapi/gstreamer-0.10.vapi +++ b/vapi/gstreamer-0.10.vapi @@ -647,7 +647,7 @@ namespace Gst { public void parse_new_segment_full (bool update, double rate, double applied_rate, Gst.Format format, int64 start, int64 stop, int64 position); public void parse_qos (double proportion, int64 diff, uint64 timestamp); public void parse_seek (double rate, Gst.Format format, Gst.SeekFlags flags, Gst.SeekType start_type, int64 start, Gst.SeekType stop_type, int64 stop); - public void parse_tag (out Gst.TagList taglist); + public void parse_tag (out weak Gst.TagList taglist); public static Gst.EventTypeFlags type_get_flags (Gst.EventType type); public static weak string type_get_name (Gst.EventType type); public static GLib.Quark type_to_quark (Gst.EventType type); @@ -729,16 +729,16 @@ namespace Gst { public Message.warning (Gst.Object src, string debug) throws GLib.Error; public void parse_async_start (bool new_base_time); public void parse_buffering (int percent); - public void parse_clock_lost (out Gst.Clock clock); - public void parse_clock_provide (out Gst.Clock clock, bool ready); + public void parse_clock_lost (out weak Gst.Clock clock); + public void parse_clock_provide (out weak Gst.Clock clock, bool ready); public void parse_duration (Gst.Format format, int64 duration); public void parse_error (string debug) throws GLib.Error; public void parse_info (string debug) throws GLib.Error; - public void parse_new_clock (out Gst.Clock clock); + public void parse_new_clock (out weak Gst.Clock clock); public void parse_segment_done (Gst.Format format, int64 position); public void parse_segment_start (Gst.Format format, int64 position); public void parse_state_changed (Gst.State oldstate, Gst.State newstate, Gst.State pending); - public void parse_tag (out Gst.TagList tag_list); + public void parse_tag (out weak Gst.TagList tag_list); public void parse_warning (string debug) throws GLib.Error; public static weak string type_get_name (Gst.MessageType type); public static GLib.Quark type_to_quark (Gst.MessageType type); @@ -871,8 +871,8 @@ namespace Gst { public bool get_boolean_index (string tag, uint index, bool value); public bool get_char (string tag, string value); public bool get_char_index (string tag, uint index, string value); - public bool get_date (string tag, out GLib.Date value); - public bool get_date_index (string tag, uint index, out GLib.Date value); + public bool get_date (string tag, out weak GLib.Date value); + public bool get_date_index (string tag, uint index, out weak GLib.Date value); public bool get_double (string tag, double value); public bool get_double_index (string tag, uint index, double value); public bool get_float (string tag, float value); @@ -929,12 +929,19 @@ namespace Gst { public class TypeFind { public pointer data; public weak pointer[] _gst_reserved; + [CCode (cname = "gst_type_find_get_length")] public uint64 get_length (); + [CCode (cname = "gst_type_find_helper")] public static weak Gst.Caps helper (Gst.Pad src, uint64 size); + [CCode (cname = "gst_type_find_helper_for_buffer")] public static weak Gst.Caps helper_for_buffer (Gst.Object obj, Gst.Buffer buf, Gst.TypeFindProbability prob); + [CCode (cname = "gst_type_find_helper_get_range")] public static weak Gst.Caps helper_get_range (Gst.Object obj, Gst.TypeFindHelperGetRangeFunction func, uint64 size, Gst.TypeFindProbability prob); + [CCode (cname = "gst_type_find_peek")] public uchar peek (int64 offset, uint size); + [CCode (cname = "gst_type_find_register")] public static bool register (Gst.Plugin plugin, string name, uint rank, Gst.TypeFindFunction func, string extensions, Gst.Caps possible_caps, pointer data, GLib.DestroyNotify data_notify); + [CCode (cname = "gst_type_find_suggest")] public void suggest (uint probability, Gst.Caps caps); } [CCode (cheader_filename = "gst/gst.h")] @@ -1049,7 +1056,7 @@ namespace Gst { public static weak Gst.Structure from_string (string string, string end); public bool get_boolean (string fieldname, bool value); public bool get_clock_time (string fieldname, uint64 value); - public bool get_date (string fieldname, out GLib.Date value); + public bool get_date (string fieldname, out weak GLib.Date value); public bool get_double (string fieldname, double value); public bool get_enum (string fieldname, GLib.Type enumtype, int value); public GLib.Type get_field_type (string fieldname); @@ -1362,7 +1369,7 @@ namespace Gst { public bool is_full (); public void limits_changed (); public DataQueue (Gst.DataQueueCheckFullFunction checkfull, pointer checkdata); - public bool pop (out Gst.DataQueueItem item); + public bool pop (out weak Gst.DataQueueItem item); public bool push (Gst.DataQueueItem item); public void set_flushing (bool flushing); [NoAccessorMethod] @@ -1602,8 +1609,8 @@ namespace Gst { public ulong add_buffer_probe (GLib.Callback handler, pointer data); public ulong add_data_probe (GLib.Callback handler, pointer data); public ulong add_event_probe (GLib.Callback handler, pointer data); - public Gst.FlowReturn alloc_buffer (uint64 offset, int size, Gst.Caps caps, out Gst.Buffer buf); - public Gst.FlowReturn alloc_buffer_and_set_caps (uint64 offset, int size, Gst.Caps caps, out Gst.Buffer buf); + public Gst.FlowReturn alloc_buffer (uint64 offset, int size, Gst.Caps caps, out weak Gst.Buffer buf); + public Gst.FlowReturn alloc_buffer_and_set_caps (uint64 offset, int size, Gst.Caps caps, out weak Gst.Buffer buf); public bool can_link (Gst.Pad sinkpad); public Gst.FlowReturn chain (Gst.Buffer buffer); public bool check_pull_range (); @@ -1624,7 +1631,7 @@ namespace Gst { public weak Gst.Pad get_peer (); public Gst.QueryType get_query_types (); public Gst.QueryType get_query_types_default (); - public Gst.FlowReturn get_range (uint64 offset, uint size, out Gst.Buffer buffer); + public Gst.FlowReturn get_range (uint64 offset, uint size, out weak Gst.Buffer buffer); public bool is_active (); public bool is_blocked (); public bool is_blocking (); @@ -1640,7 +1647,7 @@ namespace Gst { public bool peer_query (Gst.Query query); public weak Gst.Caps proxy_getcaps (); public bool proxy_setcaps (Gst.Caps caps); - public Gst.FlowReturn pull_range (uint64 offset, uint size, out Gst.Buffer buffer); + public Gst.FlowReturn pull_range (uint64 offset, uint size, out weak Gst.Buffer buffer); public Gst.FlowReturn push (Gst.Buffer buffer); public bool push_event (Gst.Event event); public bool query (Gst.Query query); @@ -1828,9 +1835,13 @@ namespace Gst { public weak Gst.Caps caps; public pointer user_data; public GLib.DestroyNotify user_data_notify; + [CCode (cname = "gst_type_find_factory_call_function")] public void call_function (Gst.TypeFind find); + [CCode (cname = "gst_type_find_factory_get_caps")] public weak Gst.Caps get_caps (); + [CCode (cname = "gst_type_find_factory_get_extensions")] public weak string get_extensions (); + [CCode (cname = "gst_type_find_factory_get_list")] public static weak GLib.List get_list (); } [CCode (cheader_filename = "gst/gst.h")] @@ -1860,7 +1871,7 @@ namespace Gst { public abstract uint get_children_count (); public static void get_property (Gst.Object object, string name, GLib.Value value); public static void get_valist (Gst.Object object, string first_property_name, pointer var_args); - public static bool lookup (Gst.Object object, string name, out Gst.Object target, out GLib.ParamSpec pspec); + public static bool lookup (Gst.Object object, string name, out weak Gst.Object target, out weak GLib.ParamSpec pspec); public static void set (Gst.Object object, ...); public static void set_property (Gst.Object object, string name, GLib.Value value); public static void set_valist (Gst.Object object, string first_property_name, pointer var_args); @@ -1906,14 +1917,14 @@ namespace Gst { public static delegate bool PadActivateFunction (Gst.Pad pad); public static delegate bool PadActivateModeFunction (Gst.Pad pad, bool active); public static delegate void PadBlockCallback (Gst.Pad pad, bool blocked, pointer user_data); - public static delegate Gst.FlowReturn PadBufferAllocFunction (Gst.Pad pad, uint64 offset, uint size, Gst.Caps caps, out Gst.Buffer buf); + public static delegate Gst.FlowReturn PadBufferAllocFunction (Gst.Pad pad, uint64 offset, uint size, Gst.Caps caps, out weak Gst.Buffer buf); public static delegate Gst.FlowReturn PadChainFunction (Gst.Pad pad, Gst.Buffer buffer); public static delegate bool PadCheckGetRangeFunction (Gst.Pad pad); public static delegate bool PadDispatcherFunction (Gst.Pad pad, pointer data); public static delegate bool PadEventFunction (Gst.Pad pad, Gst.Event event); public static delegate void PadFixateCapsFunction (Gst.Pad pad, Gst.Caps caps); public static delegate weak Gst.Caps PadGetCapsFunction (Gst.Pad pad); - public static delegate Gst.FlowReturn PadGetRangeFunction (Gst.Pad pad, uint64 offset, uint length, out Gst.Buffer buffer); + public static delegate Gst.FlowReturn PadGetRangeFunction (Gst.Pad pad, uint64 offset, uint length, out weak Gst.Buffer buffer); public static delegate weak GLib.List PadIntLinkFunction (Gst.Pad pad); public static delegate Gst.PadLinkReturn PadLinkFunction (Gst.Pad pad, Gst.Pad peer); public static delegate bool PadQueryFunction (Gst.Pad pad, Gst.Query query); @@ -1929,7 +1940,7 @@ namespace Gst { public static delegate void TagMergeFunc (GLib.Value dest, GLib.Value src); public static delegate void TaskFunction (pointer data); public static delegate void TypeFindFunction (Gst.TypeFind find, pointer data); - public static delegate Gst.FlowReturn TypeFindHelperGetRangeFunction (Gst.Object obj, uint64 offset, uint length, out Gst.Buffer buffer); + public static delegate Gst.FlowReturn TypeFindHelperGetRangeFunction (Gst.Object obj, uint64 offset, uint length, out weak Gst.Buffer buffer); public static delegate int ValueCompareFunc (GLib.Value value1, GLib.Value value2); public static delegate bool ValueDeserializeFunc (GLib.Value dest, string s); public static delegate bool ValueIntersectFunc (GLib.Value dest, GLib.Value value1, GLib.Value value2); diff --git a/vapi/libgnome-2.0.vapi b/vapi/libgnome-2.0.vapi index 1e9f585..f097fc3 100644 --- a/vapi/libgnome-2.0.vapi +++ b/vapi/libgnome-2.0.vapi @@ -60,6 +60,7 @@ namespace Gnome { public Gnome.ModuleHook instance_init; public Gnome.ModuleHook pre_args_parse; public Gnome.ModuleHook post_args_parse; + public pointer _options; public Gnome.ModuleInitHook init_pass; public Gnome.ModuleClassInitHook class_init; public weak string opt_prefix; @@ -82,8 +83,6 @@ namespace Gnome { public static weak Gnome.ModuleInfo module_load (string mod_name); public static void module_register (Gnome.ModuleInfo module_info); public static bool module_registered (Gnome.ModuleInfo module_info); - public void parse_args (); - public void postinit (); [NoAccessorMethod] public weak string app_datadir { get; set; } public weak string app_id { get; } @@ -150,37 +149,6 @@ namespace Gnome { public static weak Gnome.ModuleInfo bonobo_module_info_get (); public static void clearenv (); [NoArrayLength] - public static weak string config_assemble_vector (int argc, string[] argv); - public static void config_clean_file_ (string path, bool priv); - public static void config_clean_key_ (string path, bool priv); - public static void config_clean_section_ (string path, bool priv); - public static void config_drop_all (); - public static void config_drop_file_ (string path, bool priv); - public static bool config_get_bool_with_default_ (string path, bool def, bool priv); - public static double config_get_float_with_default_ (string path, bool def, bool priv); - public static int config_get_int_with_default_ (string path, bool def, bool priv); - public static weak string config_get_string_with_default_ (string path, bool def, bool priv); - public static weak string config_get_translated_string_with_default_ (string path, bool def, bool priv); - public static void config_get_vector_with_default_ (string path, int argcp, out string argvp, bool def, bool priv); - public static bool config_has_section_ (string path, bool priv); - public static pointer config_init_iterator_ (string path, bool priv); - public static pointer config_init_iterator_sections_ (string path, bool priv); - public static pointer config_iterator_next (pointer iterator_handle, out string key, out string value); - public static void config_make_vector (string string, int argcp, out string argvp); - public static void config_pop_prefix (); - public static void config_push_prefix (string path); - public static void config_set_bool_ (string path, bool value, bool priv); - public static void config_set_float_ (string path, double value, bool priv); - public static void config_set_int_ (string path, int value, bool priv); - public static void config_set_set_handler (GLib.Callback func, pointer data); - public static void config_set_string_ (string path, string value, bool priv); - public static void config_set_sync_handler (GLib.Callback func, pointer data); - public static void config_set_translated_string_ (string path, string value, bool priv); - [NoArrayLength] - public static void config_set_vector_ (string path, int argc, string[] argv, bool priv); - public static bool config_sync (); - public static bool config_sync_file_ (string path, bool priv); - [NoArrayLength] public static int execute_async (string dir, int argc, string[] argv); [NoArrayLength] public static int execute_async_fds (string dir, int argc, string[] argv, bool close_fds); @@ -198,21 +166,15 @@ namespace Gnome { public static weak string gconf_get_gnome_libs_settings_relative (string subkey); public static bool help_display (string file_name, string link_id) throws GLib.Error; public static bool help_display_desktop (Gnome.Program program, string doc_id, string file_name, string link_id) throws GLib.Error; - public static bool help_display_desktop_with_env (Gnome.Program program, string doc_id, string file_name, string link_id, out string envp) throws GLib.Error; + public static bool help_display_desktop_with_env (Gnome.Program program, string doc_id, string file_name, string link_id, out weak string envp) throws GLib.Error; public static bool help_display_uri (string help_uri) throws GLib.Error; - public static bool help_display_uri_with_env (string help_uri, out string envp) throws GLib.Error; + public static bool help_display_uri_with_env (string help_uri, out weak string envp) throws GLib.Error; public static bool help_display_with_doc_id (Gnome.Program program, string doc_id, string file_name, string link_id) throws GLib.Error; - public static bool help_display_with_doc_id_and_env (Gnome.Program program, string doc_id, string file_name, string link_id, out string envp) throws GLib.Error; + public static bool help_display_with_doc_id_and_env (Gnome.Program program, string doc_id, string file_name, string link_id, out weak string envp) throws GLib.Error; public static GLib.Quark help_error_quark (); - public static weak GLib.List i18n_get_language_list (string category_name); - public static void i18n_pop_c_numeric_locale (); - public static void i18n_push_c_numeric_locale (); [CCode (cname = "libgnome_module_info_get")] public static weak Gnome.ModuleInfo libgnome_module_info_get (); - public static void prepend_terminal_to_vector (int argc, out string argv); - public static int score_get_notable (string gamename, string level, string names, float scores, ulong scoretimes); - public static int score_init (string gamename); - public static int score_log (float score, string level, bool higher_to_lower_score_order); + public static void prepend_terminal_to_vector (int argc, out weak string argv); public static int setenv (string name, string value, bool overwrite); public static int sound_connection_get (); public static void sound_init (string hostname); @@ -228,7 +190,7 @@ namespace Gnome { public static void unsetenv (string name); public static GLib.Quark url_error_quark (); public static bool url_show (string url) throws GLib.Error; - public static bool url_show_with_env (string url, out string envp) throws GLib.Error; + public static bool url_show_with_env (string url, out weak string envp) throws GLib.Error; public static weak string user_accels_dir_get (); public static weak string user_dir_get (); public static weak string user_private_dir_get (); diff --git a/vapi/libgnomeui-2.0.vapi b/vapi/libgnomeui-2.0.vapi index 2357809..b0c34f2 100644 --- a/vapi/libgnomeui-2.0.vapi +++ b/vapi/libgnomeui-2.0.vapi @@ -75,12 +75,6 @@ namespace Gnome { LOCAL, BOTH, } - [CCode (cprefix = "GNOME_THEME_FILE_PARSE_ERROR_INVALID_", cheader_filename = "libgnomeui/libgnomeui.h")] - public enum ThemeFileParseError { - SYNTAX, - ESCAPES, - CHARS, - } [CCode (cprefix = "GNOME_THUMBNAIL_SIZE_", cheader_filename = "libgnomeui/libgnomeui.h")] public enum ThumbnailSize { NORMAL, @@ -174,65 +168,12 @@ namespace Gnome { public class AppBarMsg { } [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class AppProgressKey { - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] public class GdkPixbufAsyncHandle { } [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class IconData { - public bool has_embedded_rect; - public int x0; - public int y0; - public int x1; - public int y1; - public weak Gnome.IconDataPoint attach_points; - public int n_attach_points; - public weak string display_name; - public weak Gnome.IconData dup (); - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class IconDataPoint { - public int x; - public int y; - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class IconTheme : GLib.Object { - public void append_search_path (string path); - public bool get_allow_svg (); - public weak string get_example_icon_name (); - public void get_search_path (string path, int n_elements); - public bool has_icon (string icon_name); - public weak GLib.List list_icons (string context); - public weak string lookup_icon (string icon_name, int size, out Gnome.IconData icon_data, int base_size); - public IconTheme (); - public void prepend_search_path (string path); - public bool rescan_if_needed (); - public void set_allow_svg (bool allow_svg); - public void set_custom_theme (string theme_name); - [NoArrayLength] - public void set_search_path (string[] path, int n_elements); - public signal void changed (); - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class MessageBoxButton { - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] public class PasswordDialogDetails { } [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class ThemeFile { - public void foreach_key (string section, bool include_localized, Gnome.ThemeFileLineFunc func, pointer user_data); - public void foreach_section (Gnome.ThemeFileSectionFunc func, pointer user_data); - public bool get_integer (string section, string keyname, int val); - public bool get_locale_string (string section, string keyname, out string val); - public bool get_raw (string section, string keyname, string locale, out string val); - public bool get_string (string section, string keyname, out string val); - public ThemeFile.from_string (string data) throws GLib.Error; - public static GLib.Quark parse_error_quark (); - public weak string to_string (); - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] public class UIBuilderData { public Gnome.UISignalConnectFunc connect_func; public pointer data; @@ -255,27 +196,6 @@ namespace Gnome { public weak Gtk.Widget widget; } [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class About : Gtk.Dialog, Atk.Implementor, Gtk.Buildable { - public void @construct (string name, string version, string copyright, string comments, string authors, string documenters, string translator_credits, Gdk.Pixbuf logo_pixbuf); - public About (string name, string version, string copyright, string comments, string authors, string documenters, string translator_credits, Gdk.Pixbuf logo_pixbuf); - [NoAccessorMethod] - public weak GLib.ValueArray authors { set; } - [NoAccessorMethod] - public weak string comments { get; set; } - [NoAccessorMethod] - public weak string copyright { get; set; } - [NoAccessorMethod] - public weak GLib.ValueArray documenters { set; } - [NoAccessorMethod] - public weak Gdk.Pixbuf logo { set; } - [NoAccessorMethod] - public weak string name { get; set; } - [NoAccessorMethod] - public weak string translator_credits { get; set; } - [NoAccessorMethod] - public weak string version { get; set; } - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] public class App : Gtk.Window, Atk.Implementor, Gtk.Buildable { public weak string name; public weak string prefix; @@ -295,7 +215,6 @@ namespace Gnome { public void create_toolbar_interp (Gnome.UIInfo uiinfo, Gtk.CallbackMarshal relay_func, pointer data, Gtk.DestroyNotify destroy_func); public void create_toolbar_with_data (Gnome.UIInfo uiinfo, pointer user_data); public void enable_layout_config (bool enable); - public weak Gtk.Widget error (string error); public static void fill_menu (Gtk.MenuShell menu_shell, Gnome.UIInfo uiinfo, Gtk.AccelGroup accel_group, bool uline_accels, int pos); public static void fill_menu_custom (Gtk.MenuShell menu_shell, Gnome.UIInfo uiinfo, Gnome.UIBuilderData uibdata, Gtk.AccelGroup accel_group, bool uline_accels, int pos); public static void fill_menu_with_data (Gtk.MenuShell menu_shell, Gnome.UIInfo uiinfo, Gtk.AccelGroup accel_group, bool uline_accels, int pos, pointer user_data); @@ -303,7 +222,6 @@ namespace Gnome { public static void fill_toolbar_custom (Gtk.Toolbar toolbar, Gnome.UIInfo uiinfo, Gnome.UIBuilderData uibdata, Gtk.AccelGroup accel_group); public static void fill_toolbar_with_data (Gtk.Toolbar toolbar, Gnome.UIInfo uiinfo, Gtk.AccelGroup accel_group, pointer user_data); public static weak Gtk.Widget find_menu_pos (Gtk.Widget parent, string path, int pos); - public void flash (string flash); public static weak string helper_gettext (string string); public void insert_menus (string path, Gnome.UIInfo menuinfo); public void insert_menus_custom (string path, Gnome.UIInfo uiinfo, Gnome.UIBuilderData uibdata); @@ -312,27 +230,15 @@ namespace Gnome { public static void install_appbar_menu_hints (Gnome.AppBar appbar, Gnome.UIInfo uiinfo); public void install_menu_hints (Gnome.UIInfo uiinfo); public static void install_statusbar_menu_hints (Gtk.Statusbar bar, Gnome.UIInfo uiinfo); - public weak Gtk.Widget message (string message); public App (string appname, string title); - public weak Gtk.Widget ok_cancel (string message, Gnome.ReplyCallback callback, pointer data); - public weak Gtk.Widget ok_cancel_modal (string message, Gnome.ReplyCallback callback, pointer data); - public static void progress_done (Gnome.AppProgressKey key); - public weak Gnome.AppProgressKey progress_manual (string description, Gnome.AppProgressCancelFunc cancel_cb, pointer data); - public weak Gnome.AppProgressKey progress_timeout (string description, uint interval, Gnome.AppProgressFunc percentage_cb, Gnome.AppProgressCancelFunc cancel_cb, pointer data); - public weak Gtk.Widget question (string question, Gnome.ReplyCallback callback, pointer data); - public weak Gtk.Widget question_modal (string question, Gnome.ReplyCallback callback, pointer data); public void remove_menu_range (string path, int start, int items); public void remove_menus (string path, int items); - public weak Gtk.Widget request_password (string prompt, Gnome.StringCallback callback, pointer data); - public weak Gtk.Widget request_string (string prompt, Gnome.StringCallback callback, pointer data); public void set_contents (Gtk.Widget contents); public void set_menus (Gtk.MenuBar menubar); - public static void set_progress (Gnome.AppProgressKey key, double percent); public void set_statusbar (Gtk.Widget statusbar); public void set_statusbar_custom (Gtk.Widget container, Gtk.Widget statusbar); public void set_toolbar (Gtk.Toolbar toolbar); public static void ui_configure_configurable (Gnome.UIInfo uiinfo); - public weak Gtk.Widget warning (string warning); [NoAccessorMethod] public weak string app_id { get; set construct; } } @@ -403,7 +309,6 @@ namespace Gnome { public uint save_yourself_emitted; public pointer reserved; public void add_static_arg (); - public static void disable_master_connection (); public void flush (); public weak string get_config_prefix (); public weak string get_desktop_id (); @@ -449,37 +354,8 @@ namespace Gnome { public signal void shutdown_cancelled (); } [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class ColorPicker : Gtk.Button, Atk.Implementor, Gtk.Buildable { - public void get_d (double r, double g, double b, double a); - public bool get_dither (); - public void get_i16 (ushort r, ushort g, ushort b, ushort a); - public void get_i8 (uchar r, uchar g, uchar b, uchar a); - public weak string get_title (); - public bool get_use_alpha (); - public ColorPicker (); - public void set_d (double r, double g, double b, double a); - public void set_dither (bool dither); - public void set_i16 (ushort r, ushort g, ushort b, ushort a); - public void set_i8 (uchar r, uchar g, uchar b, uchar a); - public void set_title (string title); - public void set_use_alpha (bool use_alpha); - [NoAccessorMethod] - public weak uint alpha { get; set; } - [NoAccessorMethod] - public weak uint blue { get; set; } - public weak bool dither { get; set; } - [NoAccessorMethod] - public weak uint green { get; set; } - [NoAccessorMethod] - public weak uint red { get; set; } - public weak string title { get; set; } - public weak bool use_alpha { get; set; } - public signal void color_set (uint r, uint g, uint b, uint a); - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] public class DateEdit : Gtk.HBox, Atk.Implementor, Gtk.Buildable { public void @construct (ulong the_time, Gnome.DateEditFlags flags); - public ulong get_date (); public int get_flags (); public ulong get_initial_time (); public ulong get_time (); @@ -501,235 +377,6 @@ namespace Gnome { public signal void time_changed (); } [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class Dialog : Gtk.Window, Atk.Implementor, Gtk.Buildable { - public weak Gtk.Widget vbox; - public weak GLib.List buttons; - public weak Gtk.Widget action_area; - public weak Gtk.AccelGroup accelerators; - public uint click_closes; - public uint just_hide; - public void append_button (string button_name); - public void append_button_with_pixmap (string button_name, string pixmap_name); - public void append_buttons (string first); - public void append_buttons_with_pixmaps (string names, string pixmaps); - public void append_buttonsv (string buttons); - public void button_connect (int button, GLib.Callback callback, pointer data); - public void button_connect_object (int button, GLib.Callback callback, Gtk.Object obj); - public void close_hides (bool just_hide); - public void @construct (string title, pointer ap); - public void constructv (string title, string buttons); - public void editable_enters (Gtk.Editable editable); - public void grab_focus (int button); - public Dialog (string title); - [CCode (cname = "gnome_dialog_newv")] - public Dialog.newv (string title, string buttons); - public int run (); - public int run_and_close (); - public void set_accelerator (int button, uchar accelerator_key, uchar accelerator_mods); - public void set_close (bool click_closes); - public void set_default (int button); - public void set_parent (Gtk.Window parent); - public void set_sensitive (int button, bool setting); - public signal void clicked (int button_number); - [HasEmitter] - public signal bool close (); - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class Druid : Gtk.Container, Atk.Implementor, Gtk.Buildable { - public weak Gtk.Widget help; - public weak Gtk.Widget back; - public weak Gtk.Widget next; - public weak Gtk.Widget cancel; - public weak Gtk.Widget finish; - public void append_page (Gnome.DruidPage page); - public void construct_with_window (string title, Gtk.Window parent, bool close_on_cancel, out Gtk.Widget window); - public void insert_page (Gnome.DruidPage back_page, Gnome.DruidPage page); - public Druid (); - public Druid.with_window (string title, Gtk.Window parent, bool close_on_cancel, out Gtk.Widget window); - public void prepend_page (Gnome.DruidPage page); - public void set_buttons_sensitive (bool back_sensitive, bool next_sensitive, bool cancel_sensitive, bool help_sensitive); - public void set_page (Gnome.DruidPage page); - public void set_show_finish (bool show_finish); - public void set_show_help (bool show_help); - [NoAccessorMethod] - public weak bool show_finish { get; set; } - [NoAccessorMethod] - public weak bool show_help { get; set; } - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class DruidPage : Gtk.Bin, Atk.Implementor, Gtk.Buildable { - public DruidPage (); - [HasEmitter] - public signal bool back (Gtk.Widget druid); - [HasEmitter] - public signal bool cancel (Gtk.Widget druid); - [HasEmitter] - public signal void finish (Gtk.Widget druid); - [HasEmitter] - public signal bool next (Gtk.Widget druid); - [HasEmitter] - public signal void prepare (Gtk.Widget druid); - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class DruidPageEdge : Gnome.DruidPage, Atk.Implementor, Gtk.Buildable { - public weak string title; - public weak string text; - public weak Gdk.Pixbuf logo_image; - public weak Gdk.Pixbuf watermark_image; - public weak Gdk.Pixbuf top_watermark_image; - public Gdk.Color background_color; - public Gdk.Color textbox_color; - public Gdk.Color logo_background_color; - public Gdk.Color title_color; - public Gdk.Color text_color; - public uint position; - public void @construct (Gnome.EdgePosition position, bool antialiased, string title, string text, Gdk.Pixbuf logo, Gdk.Pixbuf watermark, Gdk.Pixbuf top_watermark); - public DruidPageEdge (Gnome.EdgePosition position); - public DruidPageEdge.aa (Gnome.EdgePosition position); - public DruidPageEdge.with_vals (Gnome.EdgePosition position, bool antialiased, string title, string text, Gdk.Pixbuf logo, Gdk.Pixbuf watermark, Gdk.Pixbuf top_watermark); - public void set_bg_color (out Gdk.Color color); - public void set_logo (Gdk.Pixbuf logo_image); - public void set_logo_bg_color (out Gdk.Color color); - public void set_text (string text); - public void set_text_color (out Gdk.Color color); - public void set_textbox_color (out Gdk.Color color); - public void set_title (string title); - public void set_title_color (out Gdk.Color color); - public void set_top_watermark (Gdk.Pixbuf top_watermark_image); - public void set_watermark (Gdk.Pixbuf watermark); - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class DruidPageStandard : Gnome.DruidPage, Atk.Implementor, Gtk.Buildable { - public weak Gtk.Widget vbox; - public void append_item (string question, Gtk.Widget item, string additional_info); - public DruidPageStandard (); - public DruidPageStandard.with_vals (string title, Gdk.Pixbuf logo, Gdk.Pixbuf top_watermark); - public void set_background (out Gdk.Color color); - public void set_contents_background (out Gdk.Color color); - public void set_logo (Gdk.Pixbuf logo_image); - public void set_logo_background (out Gdk.Color color); - public void set_title (string title); - public void set_title_foreground (out Gdk.Color color); - public void set_top_watermark (Gdk.Pixbuf top_watermark_image); - public weak string background { set; } - [NoAccessorMethod] - public weak Gdk.Color background_gdk { get; set; } - [NoAccessorMethod] - public weak bool background_set { get; set; } - public weak string contents_background { set; } - [NoAccessorMethod] - public weak Gdk.Color contents_background_gdk { get; set; } - [NoAccessorMethod] - public weak bool contents_background_set { get; set; } - [NoAccessorMethod] - public weak Gdk.Pixbuf logo { get; set; } - public weak string logo_background { set; } - [NoAccessorMethod] - public weak Gdk.Color logo_background_gdk { get; set; } - [NoAccessorMethod] - public weak bool logo_background_set { get; set; } - [NoAccessorMethod] - public weak string title { get; set; } - public weak string title_foreground { set; } - [NoAccessorMethod] - public weak Gdk.Color title_foreground_gdk { get; set; } - [NoAccessorMethod] - public weak bool title_foreground_set { get; set; } - [NoAccessorMethod] - public weak Gdk.Pixbuf top_watermark { get; set; } - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class Entry : Gtk.Combo, Atk.Implementor, Gtk.Buildable, Gtk.Editable { - public void append_history (bool save, string text); - public void clear_history (); - public weak string get_history_id (); - public uint get_max_saved (); - public Entry (string history_id); - public void prepend_history (bool save, string text); - public void set_history_id (string history_id); - public void set_max_saved (uint max_saved); - [NoAccessorMethod] - public weak Gtk.Entry gtk_entry { get; } - public weak string history_id { get; set; } - public signal void activate (); - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class FileEntry : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.Editable { - public weak Gtk.Widget fsw; - public void @construct (string history_id, string browse_dialog_title); - public bool get_directory_entry (); - public weak string get_full_path (bool file_must_exist); - public bool get_modal (); - public FileEntry (string history_id, string browse_dialog_title); - public void set_default_path (string path); - public void set_directory (bool directory_entry); - public void set_directory_entry (bool directory_entry); - public void set_filename (string filename); - public void set_modal (bool is_modal); - public void set_title (string browse_dialog_title); - [NoAccessorMethod] - public weak string browse_dialog_title { get; set; } - [NoAccessorMethod] - public weak string default_path { get; set; } - public weak bool directory_entry { get; set; } - [NoAccessorMethod] - public weak Gtk.FileChooserAction filechooser_action { get; set; } - [NoAccessorMethod] - public weak string filename { get; set; } - [NoAccessorMethod] - public weak Gnome.Entry gnome_entry { get; } - [NoAccessorMethod] - public weak Gtk.Entry gtk_entry { get; } - [NoAccessorMethod] - public weak string history_id { get; set; } - public weak bool modal { get; set; } - [NoAccessorMethod] - public weak bool use_filechooser { get; set; } - public signal void activate (); - public signal void browse_clicked (); - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class FontPicker : Gtk.Button, Atk.Implementor, Gtk.Buildable { - public void fi_set_show_size (bool show_size); - public void fi_set_use_font_in_label (bool use_font_in_label, int size); - public weak Gdk.Font get_font (); - public weak string get_font_name (); - public Gnome.FontPickerMode get_mode (); - public weak string get_preview_text (); - public weak string get_title (); - public FontPicker (); - public bool set_font_name (string fontname); - public void set_mode (Gnome.FontPickerMode mode); - public void set_preview_text (string text); - public void set_title (string title); - public weak Gtk.Widget uw_get_widget (); - public void uw_set_widget (Gtk.Widget widget); - public weak pointer font { get; } - public weak string font_name { get; set; } - [NoAccessorMethod] - public weak int label_font_size { get; set; } - public weak Gnome.FontPickerMode mode { get; set; } - public weak string preview_text { get; set; } - [NoAccessorMethod] - public weak bool show_size { get; set; } - public weak string title { get; set; } - [NoAccessorMethod] - public weak bool use_font_in_label { get; set; } - public signal void font_set (string font_name); - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class HRef : Gtk.Button, Atk.Implementor, Gtk.Buildable { - public weak string get_label (); - public weak string get_text (); - public weak string get_url (); - public HRef (string url, string text); - public void set_label (string label); - public void set_text (string text); - public void set_url (string url); - public weak string text { get; set; } - public weak string url { get; set; } - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] public class IconEntry : Gtk.VBox, Atk.Implementor, Gtk.Buildable { public void @construct (string history_id, string browse_dialog_title); public weak string get_filename (); @@ -771,110 +418,6 @@ namespace Gnome { public void stop_loading (); } [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class MDI : Gtk.Object { - public Gnome.MDIMode mode; - public Gtk.PositionType tab_pos; - public uint signal_id; - public uint in_drag; - public weak string appname; - public weak string title; - public weak Gnome.UIInfo menu_template; - public weak Gnome.UIInfo toolbar_template; - public weak Gnome.MDIChild active_child; - public weak Gtk.Widget active_view; - public weak Gnome.App active_window; - public weak GLib.List windows; - public weak GLib.List children; - public weak GLib.SList registered; - public weak string child_menu_path; - public weak string child_list_path; - public pointer reserved; - public int add_toplevel_view (Gnome.MDIChild child); - public weak Gnome.MDIChild find_child (string name); - public weak Gnome.MDIChild get_active_child (); - public weak Gtk.Widget get_active_view (); - public weak Gnome.App get_active_window (); - public static weak Gnome.App get_app_from_view (Gtk.Widget view); - public static weak Gnome.MDIChild get_child_from_view (Gtk.Widget view); - public static weak Gnome.UIInfo get_child_menu_info (Gnome.App app); - public static weak Gnome.UIInfo get_menubar_info (Gnome.App app); - public static weak Gnome.UIInfo get_toolbar_info (Gnome.App app); - public weak Gtk.Widget get_view_from_window (Gnome.App app); - public MDI (string appname, string title); - public void open_toplevel (); - public void register (Gtk.Object object); - public int remove_all (int force); - public bool restore_state (string section, Gnome.MDIChildCreator create_child_func); - public void save_state (string section); - public void set_active_view (Gtk.Widget view); - public void set_child_list_path (string path); - public void set_child_menu_path (string path); - public void set_menubar_template (Gnome.UIInfo menu_tmpl); - public void set_mode (Gnome.MDIMode mode); - public void set_toolbar_template (Gnome.UIInfo tbar_tmpl); - public void unregister (Gtk.Object object); - public void update_child (Gnome.MDIChild child); - [HasEmitter] - public signal bool add_child (Gnome.MDIChild p0); - [HasEmitter] - public signal bool add_view (Gtk.Widget p0); - public signal void app_created (Gnome.App p0); - public signal void child_changed (Gnome.MDIChild p0); - [HasEmitter] - public signal bool remove_child (Gnome.MDIChild p0); - [HasEmitter] - public signal bool remove_view (Gtk.Widget p0); - public signal void view_changed (Gtk.Widget p0); - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class MDIChild : Gtk.Object { - public weak Gtk.Object parent; - public weak string name; - public weak GLib.List views; - public weak Gnome.UIInfo menu_template; - public pointer reserved; - public weak Gtk.Widget add_view (); - public void remove_view (Gtk.Widget view); - public void set_menu_template (Gnome.UIInfo menu_tmpl); - public void set_name (string name); - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class MDIGenericChild : Gnome.MDIChild { - public Gnome.MDIChildViewCreator create_view; - public Gnome.MDIChildMenuCreator create_menus; - public Gnome.MDIChildConfigFunc get_config_string; - public Gnome.MDIChildLabelFunc set_label; - public Gtk.CallbackMarshal create_view_cbm; - public Gtk.CallbackMarshal create_menus_cbm; - public Gtk.CallbackMarshal get_config_string_cbm; - public Gtk.CallbackMarshal set_label_cbm; - public Gtk.DestroyNotify create_view_dn; - public Gtk.DestroyNotify create_menus_dn; - public Gtk.DestroyNotify get_config_string_dn; - public Gtk.DestroyNotify set_label_dn; - public pointer create_view_data; - public pointer create_menus_data; - public pointer get_config_string_data; - public pointer set_label_data; - public pointer reserved; - public MDIGenericChild (string name); - public void set_config_func (Gnome.MDIChildConfigFunc func, pointer data); - public void set_config_func_full (Gnome.MDIChildConfigFunc func, Gtk.CallbackMarshal marshal, pointer data, Gtk.DestroyNotify notify); - public void set_label_func (Gnome.MDIChildLabelFunc func, pointer data); - public void set_label_func_full (Gnome.MDIChildLabelFunc func, Gtk.CallbackMarshal marshal, pointer data, Gtk.DestroyNotify notify); - public void set_menu_creator (Gnome.MDIChildMenuCreator func, pointer data); - public void set_menu_creator_full (Gnome.MDIChildMenuCreator func, Gtk.CallbackMarshal marshal, pointer data, Gtk.DestroyNotify notify); - public void set_view_creator (Gnome.MDIChildViewCreator func, pointer data); - public void set_view_creator_full (Gnome.MDIChildViewCreator func, Gtk.CallbackMarshal marshal, pointer data, Gtk.DestroyNotify notify); - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class MessageBox : Gnome.Dialog, Atk.Implementor, Gtk.Buildable { - public void @construct (string message, string message_box_type, string buttons); - public MessageBox (string message, string message_box_type); - [CCode (cname = "gnome_message_box_newv")] - public MessageBox.newv (string message, string message_box_type, string buttons); - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] public class PasswordDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable { public weak Gnome.PasswordDialogDetails details; public bool anon_selected (); @@ -932,65 +475,6 @@ namespace Gnome { public weak string username { get; set; } } [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class Pixmap : Gtk.Image, Atk.Implementor, Gtk.Buildable { - public void load_file (string filename); - public void load_file_at_size (string filename, int width, int height); - public void load_xpm_d (out string xpm_data); - public void load_xpm_d_at_size (out string xpm_data, int width, int height); - public Pixmap.from_file (string filename); - public Pixmap.from_file_at_size (string filename, int width, int height); - public Pixmap.from_gnome_pixmap (Gnome.Pixmap gpixmap); - public Pixmap.from_xpm_d (string xpm_data); - public Pixmap.from_xpm_d_at_size (string xpm_data, int width, int height); - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class PixmapEntry : Gnome.FileEntry, Atk.Implementor, Gtk.Buildable, Gtk.Editable { - public void @construct (string history_id, string browse_dialog_title, bool do_preview); - public weak string get_filename (); - public weak Gtk.Widget gnome_entry (); - public weak Gtk.Widget gnome_file_entry (); - public weak Gtk.Widget gtk_entry (); - public PixmapEntry (string history_id, string browse_dialog_title, bool do_preview); - public weak Gtk.Widget preview_widget (); - public weak Gtk.Widget scrolled_window (); - public void set_pixmap_subdir (string subdir); - public void set_preview (bool do_preview); - public void set_preview_size (int preview_w, int preview_h); - [NoAccessorMethod] - public weak bool do_preview { get; set; } - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class PropertyBox : Gnome.Dialog, Atk.Implementor, Gtk.Buildable { - public weak Gtk.Widget notebook; - public weak Gtk.Widget ok_button; - public weak Gtk.Widget apply_button; - public weak Gtk.Widget cancel_button; - public weak Gtk.Widget help_button; - public pointer reserved; - public int append_page (Gtk.Widget child, Gtk.Widget tab_label); - public void changed (); - public PropertyBox (); - public void set_modified (bool state); - public void set_state (bool state); - public signal void apply (int page_num); - public signal void help (int page_num); - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] - public class Scores : Gtk.Dialog, Atk.Implementor, Gtk.Buildable { - public void @construct (uint n_scores, string names, float scores, ulong times, bool clear); - public static weak Gtk.Widget display (string title, string app_name, string level, int pos); - public static weak Gtk.Widget display_with_pixmap (string pixmap_logo, string app_name, string level, int pos); - public Scores (uint n_scores, string names, float scores, ulong times, bool clear); - public void set_color (uint n, out Gdk.Color col); - public void set_colors (out Gdk.Color col); - public void set_current_player (int i); - public void set_def_color (out Gdk.Color col); - public void set_logo_label (string txt, string font, out Gdk.Color col); - public void set_logo_label_title (string txt); - public void set_logo_pixmap (string pix_name); - public void set_logo_widget (Gtk.Widget w); - } - [CCode (cheader_filename = "libgnomeui/libgnomeui.h")] public class ThumbnailFactory : GLib.Object { public bool can_thumbnail (string uri, string mime_type, ulong mtime); public void create_failed_thumbnail (string uri, ulong mtime); @@ -1000,21 +484,12 @@ namespace Gnome { public ThumbnailFactory (Gnome.ThumbnailSize size); public void save_thumbnail (Gdk.Pixbuf thumbnail, string uri, ulong original_mtime); } - public static delegate void AppProgressCancelFunc (pointer data); - public static delegate double AppProgressFunc (pointer data); public static delegate void GdkPixbufDoneCallback (Gnome.GdkPixbufAsyncHandle handle, pointer cb_data); public static delegate void GdkPixbufLoadCallback (Gnome.GdkPixbufAsyncHandle handle, GnomeVFS.Result error, Gdk.Pixbuf pixbuf, pointer cb_data); public static delegate void InteractFunction (Gnome.Client client, int key, Gnome.DialogType dialog_type, pointer data); - public static delegate weak string MDIChildConfigFunc (Gnome.MDIChild p1, pointer p2); - public static delegate weak Gnome.MDIChild MDIChildCreator (string p1); - public static delegate weak Gtk.Widget MDIChildLabelFunc (Gnome.MDIChild p1, Gtk.Widget p2, pointer p3); - public static delegate weak GLib.List MDIChildMenuCreator (Gnome.MDIChild p1, Gtk.Widget p2, pointer p3); - public static delegate weak Gtk.Widget MDIChildViewCreator (Gnome.MDIChild p1, pointer p2); public static delegate double PasswordDialogQualityFunc (Gnome.PasswordDialog password_dialog, string password, pointer user_data); public static delegate void ReplyCallback (int reply, pointer data); public static delegate void StringCallback (string string, pointer data); - public static delegate void ThemeFileLineFunc (Gnome.ThemeFile df, string key, string locale, string value, pointer data); - public static delegate void ThemeFileSectionFunc (Gnome.ThemeFile df, string name, pointer data); public static delegate void UISignalConnectFunc (Gnome.UIInfo uiinfo, string signal_name, Gnome.UIBuilderData uibdata); public const string GNOMEUIINFO_KEY_UIBDATA; public const string GNOMEUIINFO_KEY_UIDATA; @@ -1086,14 +561,11 @@ namespace Gnome { public static void accelerators_sync (); public static bool authentication_manager_dialog_is_visible (); public static void authentication_manager_init (); - public static weak Gtk.Widget error_dialog (string error); - public static weak Gtk.Widget error_dialog_parented (string error, Gtk.Window parent); public static weak Gdk.Pixbuf gdk_pixbuf_new_from_uri (string uri); public static weak Gnome.GdkPixbufAsyncHandle gdk_pixbuf_new_from_uri_async (string uri, Gnome.GdkPixbufLoadCallback load_callback, Gnome.GdkPixbufDoneCallback done_callback, pointer callback_data); public static weak Gdk.Pixbuf gdk_pixbuf_new_from_uri_at_scale (string uri, int width, int height, bool preserve_aspect_ratio); public static void gdk_pixbuf_new_from_uri_cancel (Gnome.GdkPixbufAsyncHandle handle); public static weak Gnome.ModuleInfo gtk_module_info_get (); - public static void gtk_widget_add_popup_items (Gtk.Widget widget, Gnome.UIInfo uiinfo, pointer user_data); public static bool help_display_desktop_on_screen (Gnome.Program program, string doc_id, string file_name, string link_id, Gdk.Screen screen) throws GLib.Error; public static bool help_display_on_screen (string file_name, string link_id, Gdk.Screen screen) throws GLib.Error; public static bool help_display_uri_on_screen (string help_uri, Gdk.Screen screen) throws GLib.Error; @@ -1105,41 +577,10 @@ namespace Gnome { [CCode (cname = "libgnomeui_module_info_get")] public static weak Gnome.ModuleInfo libgnomeui_module_info_get (); public static weak Gnome.Client master_client (); - public static weak Gtk.Widget ok_cancel_dialog (string message, Gnome.ReplyCallback callback, pointer data); - public static weak Gtk.Widget ok_cancel_dialog_modal (string message, Gnome.ReplyCallback callback, pointer data); - public static weak Gtk.Widget ok_cancel_dialog_modal_parented (string message, Gnome.ReplyCallback callback, pointer data, Gtk.Window parent); - public static weak Gtk.Widget ok_cancel_dialog_parented (string message, Gnome.ReplyCallback callback, pointer data, Gtk.Window parent); - public static weak Gtk.Widget ok_dialog (string message); - public static weak Gtk.Widget ok_dialog_parented (string message, Gtk.Window parent); - public static void popup_menu_append (Gtk.Widget popup, Gnome.UIInfo uiinfo); - public static void popup_menu_attach (Gtk.Widget popup, Gtk.Widget widget, pointer user_data); - public static void popup_menu_do_popup (Gtk.Widget popup, Gtk.MenuPositionFunc pos_func, pointer pos_data, Gdk.EventButton event, pointer user_data, Gtk.Widget for_widget); - public static int popup_menu_do_popup_modal (Gtk.Widget popup, Gtk.MenuPositionFunc pos_func, pointer pos_data, Gdk.EventButton event, pointer user_data, Gtk.Widget for_widget); - public static weak Gtk.AccelGroup popup_menu_get_accel_group (Gtk.Menu menu); - public static weak Gtk.Widget popup_menu_new (Gnome.UIInfo uiinfo); - public static weak Gtk.Widget popup_menu_new_with_accelgroup (Gnome.UIInfo uiinfo, Gtk.AccelGroup accelgroup); - public static weak Gtk.Widget question_dialog (string question, Gnome.ReplyCallback callback, pointer data); - public static weak Gtk.Widget question_dialog_modal (string question, Gnome.ReplyCallback callback, pointer data); - public static weak Gtk.Widget question_dialog_modal_parented (string question, Gnome.ReplyCallback callback, pointer data, Gtk.Window parent); - public static weak Gtk.Widget question_dialog_parented (string question, Gnome.ReplyCallback callback, pointer data, Gtk.Window parent); - public static weak Gtk.Widget request_dialog (bool password, string prompt, string default_text, ushort max_length, Gnome.StringCallback callback, pointer data, Gtk.Window parent); - public static weak Gtk.Widget request_password_dialog (string prompt, Gnome.StringCallback callback, pointer data); - public static weak Gtk.Widget request_password_dialog_parented (string prompt, Gnome.StringCallback callback, pointer data, Gtk.Window parent); - public static weak Gtk.Widget request_string_dialog (string prompt, Gnome.StringCallback callback, pointer data); - public static weak Gtk.Widget request_string_dialog_parented (string prompt, Gnome.StringCallback callback, pointer data, Gtk.Window parent); public static bool thumbnail_has_uri (Gdk.Pixbuf pixbuf, string uri); public static bool thumbnail_is_valid (Gdk.Pixbuf pixbuf, string uri, ulong mtime); public static weak string thumbnail_md5 (string uri); public static weak string thumbnail_path_for_uri (string uri, Gnome.ThumbnailSize size); public static weak Gdk.Pixbuf thumbnail_scale_down_pixbuf (Gdk.Pixbuf pixbuf, int dest_width, int dest_height); public static bool url_show_on_screen (string url, Gdk.Screen screen) throws GLib.Error; - public static weak Gtk.Widget warning_dialog (string warning); - public static weak Gtk.Widget warning_dialog_parented (string warning, Gtk.Window parent); - public static void window_icon_init (); - public static void window_icon_set_default_from_file (string filename); - public static void window_icon_set_default_from_file_list (out string filenames); - public static void window_icon_set_from_default (Gtk.Window w); - public static void window_icon_set_from_file (Gtk.Window w, string filename); - public static void window_icon_set_from_file_list (Gtk.Window w, out string filenames); - public static void window_toplevel_set_title (Gtk.Window window, string doc_name, string app_name, string extension); } diff --git a/vapi/libnotify.vapi b/vapi/libnotify.vapi index 94455f0..7934d77 100644 --- a/vapi/libnotify.vapi +++ b/vapi/libnotify.vapi @@ -48,7 +48,7 @@ namespace Notify { public const int EXPIRES_NEVER; public static weak string get_app_name (); public static weak GLib.List get_server_caps (); - public static bool get_server_info (out string ret_name, out string ret_vendor, out string ret_version, out string ret_spec_version); + public static bool get_server_info (out weak string ret_name, out weak string ret_vendor, out weak string ret_version, out weak string ret_spec_version); public static bool init (string app_name); public static bool is_initted (); public static void uninit (); diff --git a/vapi/libsoup-2.2.vapi b/vapi/libsoup-2.2.vapi index 58e2eb3..e0a9cd5 100644 --- a/vapi/libsoup-2.2.vapi +++ b/vapi/libsoup-2.2.vapi @@ -171,12 +171,6 @@ namespace Soup { ARRAY, } [CCode (cheader_filename = "libsoup/soup.h")] - public class ServerAuth { - public ServerAuth (Soup.ServerAuthContext auth_ctx, GLib.SList auth_hdrs, Soup.Message msg); - public weak string get_user (); - public bool check_passwd (string passwd); - } - [CCode (cheader_filename = "libsoup/soup.h")] public class DataBuffer { public Soup.Ownership owner; public weak string body; @@ -283,19 +277,19 @@ namespace Soup { } [CCode (cheader_filename = "libsoup/soup.h")] public class XmlrpcValue { - public bool array_get_iterator (out Soup.XmlrpcValueArrayIterator iter); + public bool array_get_iterator (out weak Soup.XmlrpcValueArrayIterator iter); public void dump (); - public bool get_base64 (out GLib.ByteArray data); + public bool get_base64 (out weak GLib.ByteArray data); public bool get_boolean (bool b); public bool get_datetime (ulong timeval); public bool get_double (double b); public bool get_int (long i); - public bool get_string (out string str); + public bool get_string (out weak string str); public bool get_struct (GLib.HashTable table); } [CCode (cheader_filename = "libsoup/soup.h")] public class XmlrpcValueArrayIterator { - public bool get_value (out Soup.XmlrpcValue value); + public bool get_value (out weak Soup.XmlrpcValue value); public weak Soup.XmlrpcValueArrayIterator next (); public weak Soup.XmlrpcValueArrayIterator prev (); } @@ -410,6 +404,7 @@ namespace Soup { [CCode (cheader_filename = "libsoup/soup.h")] public class Server : GLib.Object { public void add_handler (string path, Soup.ServerAuthContext auth_ctx, Soup.ServerCallbackFn callback, Soup.ServerUnregisterFn unreg, pointer data); + public weak GLib.MainContext get_async_context (); public weak Soup.ServerHandler get_handler (string path); public weak Soup.Socket get_listener (); public uint get_port (); @@ -448,6 +443,7 @@ namespace Soup { public void abort (); public void add_filter (Soup.MessageFilter filter); public virtual void cancel_message (Soup.Message msg); + public weak GLib.MainContext get_async_context (); public weak Soup.Connection get_connection (Soup.Message msg, bool try_pruning, bool is_new); public virtual void queue_message (Soup.Message msg, Soup.MessageCallbackFn callback, pointer user_data); public void remove_filter (Soup.MessageFilter filter); @@ -521,6 +517,15 @@ namespace Soup { public signal void writable (); } [CCode (cheader_filename = "libsoup/soup.h")] + public class ServerAuth { + public Soup.AuthType type; + public weak Soup.ServerAuthBasic basic; + public weak Soup.ServerAuthDigest digest; + public bool check_passwd (string passwd); + public weak string get_user (); + public ServerAuth (Soup.ServerAuthContext auth_ctx, GLib.SList auth_hdrs, Soup.Message msg); + } + [CCode (cheader_filename = "libsoup/soup.h")] public interface MessageFilter { public abstract void setup_message (Soup.Message msg); } @@ -610,12 +615,12 @@ namespace Soup { public static ulong date_parse (string timestamp); public static void gmtime (ulong when, pointer tm); public static weak string header_param_copy_token (GLib.HashTable tokens, string t); - public static weak string header_param_decode_token (out string @in); + public static weak string header_param_decode_token (out weak string @in); public static void header_param_destroy_hash (GLib.HashTable table); public static weak GLib.HashTable header_param_parse_list (string header); - public static bool headers_parse_request (string str, int len, GLib.HashTable dest, out string req_method, out string req_path, Soup.HttpVersion ver); - public static bool headers_parse_response (string str, int len, GLib.HashTable dest, Soup.HttpVersion ver, uint status_code, out string reason_phrase); - public static bool headers_parse_status_line (string status_line, Soup.HttpVersion ver, uint status_code, out string reason_phrase); + public static bool headers_parse_request (string str, int len, GLib.HashTable dest, out weak string req_method, out weak string req_path, Soup.HttpVersion ver); + public static bool headers_parse_response (string str, int len, GLib.HashTable dest, Soup.HttpVersion ver, uint status_code, out weak string reason_phrase); + public static bool headers_parse_status_line (string status_line, Soup.HttpVersion ver, uint status_code, out weak string reason_phrase); public static Soup.MethodId method_get_id (string method); public static uint signal_connect_once (pointer instance, string detailed_signal, GLib.Callback c_handler, pointer data); public static weak string status_get_phrase (uint status_code); diff --git a/vapi/packages/libgnome-2.0/libgnome-2.0.defines b/vapi/packages/libgnome-2.0/libgnome-2.0.defines new file mode 100644 index 0000000..56dabc3 --- /dev/null +++ b/vapi/packages/libgnome-2.0/libgnome-2.0.defines @@ -0,0 +1 @@ +-DGNOME_DISABLE_DEPRECATED diff --git a/vapi/packages/libgnome-2.0/libgnome-2.0.gi b/vapi/packages/libgnome-2.0/libgnome-2.0.gi index 10c2729..8f4db36 100644 --- a/vapi/packages/libgnome-2.0/libgnome-2.0.gi +++ b/vapi/packages/libgnome-2.0/libgnome-2.0.gi @@ -7,213 +7,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -369,18 +162,6 @@ - - - - - - - - - - - - @@ -391,30 +172,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -560,7 +317,7 @@ - + @@ -696,28 +453,6 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.defines b/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.defines new file mode 100644 index 0000000..56dabc3 --- /dev/null +++ b/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.defines @@ -0,0 +1 @@ +-DGNOME_DISABLE_DEPRECATED diff --git a/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi b/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi index 828ec72..c44f5fe 100644 --- a/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi +++ b/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi @@ -10,19 +10,6 @@ - - - - - - - - - - - - - @@ -56,14 +43,6 @@ - - - - - - - - @@ -130,18 +109,6 @@ - - - - - - - - - - - - @@ -155,189 +122,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -382,75 +166,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -476,42 +191,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -534,24 +213,6 @@ - - - - - - - - - - - - - - - - - - @@ -562,229 +223,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + @@ -848,11 +309,6 @@ - - - - - @@ -930,47 +386,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1094,13 +509,6 @@ - - - - - - - @@ -1167,13 +575,6 @@ - - - - - - - @@ -1251,13 +652,6 @@ - - - - - - - @@ -1265,68 +659,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1344,24 +676,6 @@ - - - - - - - - - - - - - - - - - - @@ -1376,13 +690,6 @@ - - - - - - - @@ -1418,13 +725,6 @@ - - - - - - - @@ -1557,9 +857,6 @@ - - - @@ -1842,131 +1139,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1980,12 +1152,6 @@ - - - - - - @@ -2059,2028 +1225,182 @@ - + - + - - + + + - - + + - - - + - - + + - - + - - + + - - - + - - + + - - + - - + + - - - - + + - - - + + + - - - - + - + - + + - - + + - - + + - + - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + - + + + + + + - - + - - + + - - + - - - - - - + - - - - - - - - + + + + + + - - - + - + - - - - - + + - + - - - + + - - + + - - - - - + - - + + - - - + - - + + - - - - - + + - + + + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + - - - - - - - - - + + - - - + - + @@ -4265,322 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vapi/packages/libsoup-2.2/libsoup-2.2-custom.vala b/vapi/packages/libsoup-2.2/libsoup-2.2-custom.vala deleted file mode 100644 index df47d35..0000000 --- a/vapi/packages/libsoup-2.2/libsoup-2.2-custom.vala +++ /dev/null @@ -1,33 +0,0 @@ -/* libsoup-2.2-custom.vala - * - * Copyright (C) 2007 Jürg Billeter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Author: - * Jürg Billeter - */ - -[CCode (cheader_filename = "libsoup/soup.h")] -namespace Soup { - public class ServerAuth { - [Import] - public ServerAuth (ServerAuthContext auth_ctx, GLib.SList auth_hdrs, Message msg); - [Import] - public weak string get_user (); - [Import] - public bool check_passwd (string passwd); - } -} diff --git a/vapi/packages/libsoup-2.2/libsoup-2.2.gi b/vapi/packages/libsoup-2.2/libsoup-2.2.gi index 812247a..bd1c74d 100644 --- a/vapi/packages/libsoup-2.2/libsoup-2.2.gi +++ b/vapi/packages/libsoup-2.2/libsoup-2.2.gi @@ -1365,6 +1365,12 @@ + + + + + + @@ -1508,6 +1514,12 @@ + + + + + + diff --git a/vapi/poppler-glib.vapi b/vapi/poppler-glib.vapi index 000a9f3..29695ad 100644 --- a/vapi/poppler-glib.vapi +++ b/vapi/poppler-glib.vapi @@ -344,7 +344,7 @@ namespace Poppler { public class FontInfo : GLib.Object { public void free (); public FontInfo (Poppler.Document document); - public bool scan (int n_pages, out Poppler.FontsIter iter); + public bool scan (int n_pages, out weak Poppler.FontsIter iter); } [CCode (cheader_filename = "poppler.h")] public class FormField : GLib.Object { diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala index c83eb38..9245398 100644 --- a/vapigen/valagidlparser.vala +++ b/vapigen/valagidlparser.vala @@ -228,6 +228,8 @@ public class Vala.GIdlParser : CodeVisitor { current_source_file.add_node (cb); } else if (node.type == IdlNodeTypeId.STRUCT) { parse_struct ((IdlNodeStruct) node, ns, module); + } else if (node.type == IdlNodeTypeId.UNION) { + parse_union ((IdlNodeUnion) node, ns, module); } else if (node.type == IdlNodeTypeId.BOXED) { parse_boxed ((IdlNodeBoxed) node, ns, module); } else if (node.type == IdlNodeTypeId.ENUM) { @@ -430,6 +432,128 @@ public class Vala.GIdlParser : CodeVisitor { current_data_type = null; } } + + private void parse_union (IdlNodeUnion! un_node, Namespace! ns, IdlModule! module) { + weak IdlNode node = (IdlNode) un_node; + + if (un_node.deprecated) { + return; + } + + string name = fix_type_name (node.name, ns); + + if (!is_reference_type (node.name)) { + var st = ns.scope.lookup (name) as Struct; + if (st == null) { + st = new Struct (name, current_source_reference); + st.access = SymbolAccessibility.PUBLIC; + + var st_attributes = get_attributes (node.name); + if (st_attributes != null) { + foreach (string attr in st_attributes) { + var nv = attr.split ("=", 2); + if (nv[0] == "cheader_filename") { + st.add_cheader_filename (eval (nv[1])); + } else if (nv[0] == "hidden") { + if (eval (nv[1]) == "1") { + return; + } + } + } + } + + ns.add_struct (st); + current_source_file.add_node (st); + } + + current_data_type = st; + + foreach (weak IdlNode member in un_node.members) { + if (member.type == IdlNodeTypeId.FUNCTION) { + var m = parse_function ((IdlNodeFunction) member); + if (m != null) { + st.add_method (m); + } + } else if (member.type == IdlNodeTypeId.FIELD) { + var f = parse_field ((IdlNodeField) member); + if (f != null) { + st.add_field (f); + } + } + } + + current_data_type = null; + } else { + var cl = ns.scope.lookup (name) as Class; + if (cl == null) { + cl = new Class (name, current_source_reference); + cl.access = SymbolAccessibility.PUBLIC; + + var cl_attributes = get_attributes (node.name); + if (cl_attributes != null) { + foreach (string attr in cl_attributes) { + var nv = attr.split ("=", 2); + if (nv[0] == "cheader_filename") { + cl.add_cheader_filename (eval (nv[1])); + } else if (nv[0] == "hidden") { + if (eval (nv[1]) == "1") { + return; + } + } + } + } + + ns.add_class (cl); + current_source_file.add_node (cl); + } + + current_data_type = cl; + + string ref_function = null; + string unref_function = null; + string copy_function = null; + string free_function = null; + + foreach (weak IdlNode member in un_node.members) { + if (member.type == IdlNodeTypeId.FUNCTION) { + if (member.name == "ref") { + ref_function = ((IdlNodeFunction) member).symbol; + } else if (member.name == "unref") { + unref_function = ((IdlNodeFunction) member).symbol; + } else if (member.name == "free" || member.name == "destroy") { + free_function = ((IdlNodeFunction) member).symbol; + } else { + if (member.name == "copy") { + copy_function = ((IdlNodeFunction) member).symbol; + } + var m = parse_function ((IdlNodeFunction) member); + if (m != null) { + cl.add_method (m); + } + } + } else if (member.type == IdlNodeTypeId.FIELD) { + var f = parse_field ((IdlNodeField) member); + if (f != null) { + cl.add_field (f); + } + } + } + + if (ref_function != null) { + cl.set_ref_function (ref_function); + } + if (copy_function != null) { + cl.set_dup_function (copy_function); + } + if (unref_function != null) { + cl.set_unref_function (unref_function); + } else if (free_function != null) { + cl.set_free_function (free_function); + } + + current_data_type = null; + } + } private void parse_boxed (IdlNodeBoxed! boxed_node, Namespace! ns, IdlModule! module) { weak IdlNode node = (IdlNode) boxed_node; -- 2.7.4