From 550962a14c5ca404072e5e2b71eefe0715c2df2b Mon Sep 17 00:00:00 2001 From: Juerg Billeter Date: Fri, 23 Nov 2007 21:37:01 +0000 Subject: [PATCH] call g_thread_init to support libraries using threading functionality in 2007-11-23 Juerg Billeter * configure.ac, gobject-introspection/Makefile.am, gobject-introspection/gen-introspect.c: call g_thread_init to support libraries using threading functionality in class_init functions, avoid NULL parameter names for signals and vfuncs * vapi/packages/libsoup-2.2/: update to use vala-gen-introspect * vapi/packages/hildon-1/hildon-1.gi, vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi, vapi/hildon-1.vapi, vapi/libgnomeui-2.0.vapi, vapi/libsoup-2.2.vapi: regenerated svn path=/trunk/; revision=713 --- ChangeLog | 13 + configure.ac | 5 + gobject-introspection/Makefile.am | 1 + gobject-introspection/gen-introspect.c | 18 +- vapi/hildon-1.vapi | 2 +- vapi/libgnomeui-2.0.vapi | 14 +- vapi/libsoup-2.2.vapi | 483 ++--- vapi/packages/hildon-1/hildon-1.gi | 5 +- vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi | 28 +- vapi/packages/libsoup-2.2/libsoup-2.2.files | 3 +- vapi/packages/libsoup-2.2/libsoup-2.2.gi | 2398 +++++++++++++++++++++++ vapi/packages/libsoup-2.2/libsoup-2.2.gidl | 2448 ------------------------ vapi/packages/libsoup-2.2/libsoup-2.2.metadata | 2 + 13 files changed, 2711 insertions(+), 2709 deletions(-) create mode 100644 vapi/packages/libsoup-2.2/libsoup-2.2.gi delete mode 100644 vapi/packages/libsoup-2.2/libsoup-2.2.gidl diff --git a/ChangeLog b/ChangeLog index 802a138..b79f92f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2007-11-23 Jürg Billeter + * configure.ac, gobject-introspection/Makefile.am, + gobject-introspection/gen-introspect.c: call g_thread_init to support + libraries using threading functionality in class_init functions, + avoid NULL parameter names for signals and vfuncs + + * vapi/packages/libsoup-2.2/: update to use vala-gen-introspect + + * vapi/packages/hildon-1/hildon-1.gi, + vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi, vapi/hildon-1.vapi, + vapi/libgnomeui-2.0.vapi, vapi/libsoup-2.2.vapi: regenerated + +2007-11-23 Jürg Billeter + * vapi/packages/hildon-1/: update to use vala-gen-introspect * vapi/hildon-1.vapi: regenerated diff --git a/configure.ac b/configure.ac index e135de7..c23ae0c 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,11 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) AC_SUBST(GMODULE_CFLAGS) AC_SUBST(GMODULE_LIBS) +PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= $GLIB_REQUIRED) + +AC_SUBST(GTHREAD_CFLAGS) +AC_SUBST(GTHREAD_LIBS) + AC_PATH_PROG([XSLTPROC], [xsltproc], :) AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :) diff --git a/gobject-introspection/Makefile.am b/gobject-introspection/Makefile.am index 2b98228..4b97a25 100644 --- a/gobject-introspection/Makefile.am +++ b/gobject-introspection/Makefile.am @@ -38,6 +38,7 @@ gen_introspect_SOURCES = \ gen_introspect_LDADD = \ $(GLIB_LIBS) \ $(GMODULE_LIBS) \ + $(GTHREAD_LIBS) \ libgidl.la \ $(NULL) diff --git a/gobject-introspection/gen-introspect.c b/gobject-introspection/gen-introspect.c index 22b12a2..865de37 100644 --- a/gobject-introspection/gen-introspect.c +++ b/gobject-introspection/gen-introspect.c @@ -819,8 +819,10 @@ static void g_igenerator_process_struct_typedef (GIGenerator *igenerator, CSymbo for (vfunc_param_l = member->base_type->base_type->child_list, sig_param_l = sig->parameters; vfunc_param_l != NULL && sig_param_l != NULL; vfunc_param_l = vfunc_param_l->next, sig_param_l = sig_param_l->next) { CSymbol *vfunc_param = vfunc_param_l->data; GIdlNodeParam *sig_param = sig_param_l->data; - g_free (sig_param->node.name); - sig_param->node.name = g_strdup (vfunc_param->ident); + if (vfunc_param->ident != NULL) { + g_free (sig_param->node.name); + sig_param->node.name = g_strdup (vfunc_param->ident); + } } break; } @@ -835,10 +837,15 @@ static void g_igenerator_process_struct_typedef (GIGenerator *igenerator, CSymbo givfunc->result = (GIdlNodeParam *) g_idl_node_new (G_IDL_NODE_PARAM); givfunc->result->type = get_type_from_ctype (member->base_type->base_type->base_type); GList *param_l; - for (param_l = member->base_type->base_type->child_list; param_l != NULL; param_l = param_l->next) { + int i; + for (param_l = member->base_type->base_type->child_list, i = 1; param_l != NULL; param_l = param_l->next, i++) { CSymbol *param_sym = param_l->data; GIdlNodeParam *param = (GIdlNodeParam *) g_idl_node_new (G_IDL_NODE_PARAM); - param->node.name = param_sym->ident; + if (param_sym->ident == NULL) { + param->node.name = g_strdup_printf ("p%d", i); + } else { + param->node.name = param_sym->ident; + } param->type = get_type_from_ctype (param_sym->base_type); givfunc->parameters = g_list_append (givfunc->parameters, param); } @@ -1070,6 +1077,9 @@ int main (int argc, char **argv) { g_type_init (); + /* initialize threading as this may be required by libraries that we'll use */ + g_thread_init (NULL); + GIGenerator *igenerator = g_igenerator_new (); int cpp_argc = 0; diff --git a/vapi/hildon-1.vapi b/vapi/hildon-1.vapi index 21c38b9..91451c0 100644 --- a/vapi/hildon-1.vapi +++ b/vapi/hildon-1.vapi @@ -592,7 +592,7 @@ namespace Hildon { public weak Gtk.Notebook wizard_notebook { get; set; } } [CCode (cheader_filename = "hildon/hildon.h")] - public interface BreadCrumb : GLib.InitiallyUnowned, Gtk.Widget { + public interface BreadCrumb : GLib.InitiallyUnowned, Gtk.Object, Gtk.Widget { public void activated (); public abstract void get_natural_size (int width, int height); public signal void crumb_activated (); diff --git a/vapi/libgnomeui-2.0.vapi b/vapi/libgnomeui-2.0.vapi index a898679..2357809 100644 --- a/vapi/libgnomeui-2.0.vapi +++ b/vapi/libgnomeui-2.0.vapi @@ -815,16 +815,16 @@ namespace Gnome { public void unregister (Gtk.Object object); public void update_child (Gnome.MDIChild child); [HasEmitter] - public signal bool add_child (Gnome.MDIChild (null)); + public signal bool add_child (Gnome.MDIChild p0); [HasEmitter] - public signal bool add_view (Gtk.Widget (null)); - public signal void app_created (Gnome.App (null)); - public signal void child_changed (Gnome.MDIChild (null)); + 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 (null)); + public signal bool remove_child (Gnome.MDIChild p0); [HasEmitter] - public signal bool remove_view (Gtk.Widget (null)); - public signal void view_changed (Gtk.Widget (null)); + 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 { diff --git a/vapi/libsoup-2.2.vapi b/vapi/libsoup-2.2.vapi index 6517575..58e2eb3 100644 --- a/vapi/libsoup-2.2.vapi +++ b/vapi/libsoup-2.2.vapi @@ -133,17 +133,6 @@ namespace Soup { USER_OWNED, STATIC, } - [CCode (cprefix = "SOUP_SSL_TYPE_", cheader_filename = "libsoup/soup.h")] - public enum SSLType { - CLIENT, - SERVER, - } - [CCode (cprefix = "SOUP_SSL_ERROR_", cheader_filename = "libsoup/soup.h")] - public enum SocketError { - HANDSHAKE_NEEDS_READ, - HANDSHAKE_NEEDS_WRITE, - CERTIFICATE, - } [CCode (cprefix = "SOUP_SOCKET_", cheader_filename = "libsoup/soup.h")] public enum SocketIOStatus { OK, @@ -188,67 +177,170 @@ namespace Soup { public bool check_passwd (string passwd); } [CCode (cheader_filename = "libsoup/soup.h")] + public class DataBuffer { + public Soup.Ownership owner; + public weak string body; + public uint length; + } + [CCode (free_function = "soup_message_queue_destroy", cheader_filename = "libsoup/soup.h")] + public class MessageQueue { + public void append (Soup.Message msg); + public weak Soup.Message first (Soup.MessageQueueIter iter); + public void free_iter (Soup.MessageQueueIter iter); + public MessageQueue (); + public weak Soup.Message next (Soup.MessageQueueIter iter); + public weak Soup.Message remove (Soup.MessageQueueIter iter); + public void remove_message (Soup.Message msg); + } + [CCode (cheader_filename = "libsoup/soup.h")] + public class MessageQueueIter { + public weak GLib.List cur; + public weak GLib.List next; + } + [CCode (cheader_filename = "libsoup/soup.h")] + public class Protocol { + } + [CCode (cheader_filename = "libsoup/soup.h")] + public class ServerAuthBasic { + public Soup.AuthType type; + public weak string user; + public weak string passwd; + } + [CCode (cheader_filename = "libsoup/soup.h")] + public class ServerAuthContext { + public uint types; + public Soup.ServerAuthCallbackFn callback; + public pointer user_data; + public pointer basic_info; + public pointer digest_info; + public void challenge (Soup.Message msg, string header_name); + } + [CCode (cheader_filename = "libsoup/soup.h")] + public class ServerAuthDigest { + public Soup.AuthType type; + public Soup.DigestAlgorithm algorithm; + public bool integrity; + public weak string realm; + public weak string user; + public weak string nonce; + public int nonce_count; + public weak string cnonce; + public weak string digest_uri; + public weak string digest_response; + public weak string request_method; + } + [CCode (cheader_filename = "libsoup/soup.h")] + public class ServerContext { + public weak Soup.Message msg; + public weak string path; + public Soup.MethodId method_id; + public weak Soup.ServerAuth auth; + public weak Soup.Server server; + public weak Soup.ServerHandler handler; + public weak Soup.Socket sock; + public weak Soup.Address get_client_address (); + public weak string get_client_host (); + } + [CCode (cheader_filename = "libsoup/soup.h")] + public class ServerHandler { + public weak string path; + public weak Soup.ServerAuthContext auth_ctx; + public Soup.ServerCallbackFn callback; + public Soup.ServerUnregisterFn unregister; + public pointer user_data; + } + [CCode (cheader_filename = "libsoup/soup.h")] + public class SoapParameter { + public weak Soup.SoapParameter get_first_child (); + public weak Soup.SoapParameter get_first_child_by_name (string name); + public int get_int_value (); + public weak string get_name (); + public weak Soup.SoapParameter get_next_child (); + public weak Soup.SoapParameter get_next_child_by_name (string name); + public weak string get_property (string prop_name); + public weak string get_string_value (); + } + [CCode (copy_function = "soup_uri_copy", cheader_filename = "libsoup/soup.h")] + public class Uri { + public GLib.Quark protocol; + public weak string user; + public weak string passwd; + public weak string host; + public uint port; + public weak string path; + public weak string query; + public weak string fragment; + public bool broken_encoding; + public weak Soup.Uri copy (); + public weak Soup.Uri copy_root (); + public static void decode (string part); + public static weak string encode (string part, string escape_extra); + public bool equal (Soup.Uri uri2); + public Uri (string uri_string); + public Uri.with_base (Soup.Uri @base, string uri_string); + public weak string to_string (bool just_path); + public bool uses_default_port (); + } + [CCode (cheader_filename = "libsoup/soup.h")] + public class XmlrpcValue { + public bool array_get_iterator (out Soup.XmlrpcValueArrayIterator iter); + public void dump (); + public bool get_base64 (out 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_struct (GLib.HashTable table); + } + [CCode (cheader_filename = "libsoup/soup.h")] + public class XmlrpcValueArrayIterator { + public bool get_value (out Soup.XmlrpcValue value); + public weak Soup.XmlrpcValueArrayIterator next (); + public weak Soup.XmlrpcValueArrayIterator prev (); + } + [CCode (cheader_filename = "libsoup/soup.h")] public class Address : GLib.Object { public weak string get_name (); public weak string get_physical (); public uint get_port (); - public static GLib.Type get_type (); + public pointer get_sockaddr (int len); public Address (string name, uint port); public Address.any (Soup.AddressFamily family, uint port); public void resolve_async (Soup.AddressCallback callback, pointer user_data); public void resolve_async_full (GLib.MainContext async_context, Soup.AddressCallback callback, pointer user_data); public uint resolve_sync (); - public signal void dns_result (uint status); - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class Auth : GLib.Object { - public void authenticate (string username, string password); - public static GLib.Type basic_get_type (); - public void free_protection_space (GLib.SList space); - public weak string get_authorization (Soup.Message msg); - public weak GLib.SList get_protection_space (Soup.Uri source_uri); - public weak string get_realm (); - public weak string get_scheme_name (); - public static GLib.Type get_type (); - public virtual bool is_authenticated (); - public Auth.from_header_list (GLib.SList vals); - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class AuthDigest : Soup.Auth { - public static GLib.Type get_type (); + public signal void dns_result (int status); } [CCode (cheader_filename = "libsoup/soup.h")] public class Connection : GLib.Object { - public void authenticate (Soup.Message msg, string auth_type, string auth_realm, out string username, out string password); public void connect_async (Soup.ConnectionCallback callback, pointer user_data); public uint connect_sync (); public void disconnect (); - public static GLib.Type get_type (); public bool is_in_use (); public ulong last_used (); public Connection (string propname1); - public void reauthenticate (Soup.Message msg, string auth_type, string auth_realm, out string username, out string password); public void release (); public void reserve (); public virtual void send_request (Soup.Message req); [NoAccessorMethod] + public weak pointer async_context { get; construct; } + [NoAccessorMethod] + public weak pointer message_filter { get; set; } + [NoAccessorMethod] public weak pointer origin_uri { get; construct; } [NoAccessorMethod] public weak pointer proxy_uri { get; construct; } [NoAccessorMethod] public weak pointer ssl_creds { get; construct; } [NoAccessorMethod] - public weak pointer message_filter { get; set; } - [NoAccessorMethod] - public weak pointer async_context { get; construct; } - [NoAccessorMethod] public weak uint timeout { get; set; } - public signal void connect_result (uint arg2); + [HasEmitter] + public signal void authenticate (Soup.Message p0, string auth_type, string auth_realm, pointer username, pointer password); + public signal void connect_result (int p0); public signal void disconnected (); - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class ConnectionNTLM : Soup.Connection { - public static GLib.Type get_type (); + [HasEmitter] + public signal void reauthenticate (Soup.Message p0, string auth_type, string auth_realm, pointer username, pointer password); } [CCode (cheader_filename = "libsoup/soup.h")] public class Message : GLib.Object { @@ -274,7 +366,6 @@ namespace Soup { public Soup.HttpVersion get_http_version (); public Soup.TransferEncoding get_request_encoding (uint content_length); public Soup.TransferEncoding get_response_encoding (uint content_length); - public static GLib.Type get_type (); public weak Soup.Uri get_uri (); public bool io_in_progress (); public void io_pause (); @@ -296,38 +387,33 @@ namespace Soup { public void set_status_full (uint status_code, string reason_phrase); public void set_uri (Soup.Uri uri); [HasEmitter] - public signal void wrote_informational (); + public signal void finished (); [HasEmitter] - public signal void wrote_headers (); + public signal void got_body (); [HasEmitter] - public signal void wrote_chunk (); + public signal void got_chunk (); [HasEmitter] - public signal void wrote_body (); + public signal void got_headers (); [HasEmitter] public signal void got_informational (); [HasEmitter] - public signal void got_headers (); + public signal void restarted (); [HasEmitter] - public signal void got_chunk (); + public signal void wrote_body (); [HasEmitter] - public signal void got_body (); + public signal void wrote_chunk (); [HasEmitter] - public signal void restarted (); + public signal void wrote_headers (); [HasEmitter] - public signal void finished (); + public signal void wrote_informational (); } [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 static bool auth_check_passwd (Soup.ServerAuth auth, string passwd); - public static void auth_free (Soup.ServerAuth auth); - public static weak string auth_get_user (Soup.ServerAuth auth); - public static weak Soup.ServerAuth auth_new (Soup.ServerAuthContext auth_ctx, GLib.SList auth_hdrs, Soup.Message msg); public weak Soup.ServerHandler get_handler (string path); public weak Soup.Socket get_listener (); public uint get_port (); public GLib.Quark get_protocol (); - public static GLib.Type get_type (); public weak GLib.SList list_handlers (); public Server (string optname1, ...); public void quit (); @@ -335,22 +421,21 @@ namespace Soup { public void run (); public void run_async (); [NoAccessorMethod] - public weak uint port { get; construct; } + public weak pointer async_context { get; construct; } [NoAccessorMethod] public weak Soup.Address @interface { get; construct; } [NoAccessorMethod] + public weak uint port { get; construct; } + [NoAccessorMethod] public weak string ssl_cert_file { get; construct; } [NoAccessorMethod] public weak string ssl_key_file { get; construct; } - [NoAccessorMethod] - public weak pointer async_context { get; construct; } } [CCode (cheader_filename = "libsoup/soup.h")] public class ServerMessage : Soup.Message { public void finish (); public Soup.TransferEncoding get_encoding (); public weak Soup.Server get_server (); - public static GLib.Type get_type (); public bool is_finished (); public bool is_started (); public ServerMessage (Soup.Server server); @@ -358,41 +443,41 @@ namespace Soup { public void start (); } [CCode (cheader_filename = "libsoup/soup.h")] - public class Session : GLib.Object { + public class Session : GLib.Object, Soup.MessageFilter { + public weak Soup.MessageQueue queue; public void abort (); public void add_filter (Soup.MessageFilter filter); public virtual void cancel_message (Soup.Message msg); public weak Soup.Connection get_connection (Soup.Message msg, bool try_pruning, bool is_new); - public static GLib.Type get_type (); - public void queue_message (Soup.Message msg, Soup.MessageCallbackFn callback, pointer user_data); + public virtual void queue_message (Soup.Message msg, Soup.MessageCallbackFn callback, pointer user_data); public void remove_filter (Soup.MessageFilter filter); public virtual void requeue_message (Soup.Message msg); public virtual uint send_message (Soup.Message msg); public bool try_prune_connection (); [NoAccessorMethod] - public weak pointer proxy_uri { get; set; } + public weak pointer async_context { get; construct; } [NoAccessorMethod] public weak int max_conns { get; set; } [NoAccessorMethod] public weak int max_conns_per_host { get; set; } [NoAccessorMethod] - public weak bool use_ntlm { get; set; } + public weak pointer proxy_uri { get; set; } [NoAccessorMethod] public weak string ssl_ca_file { get; set; } [NoAccessorMethod] - public weak pointer async_context { get; construct; } - [NoAccessorMethod] public weak uint timeout { get; set; } + [NoAccessorMethod] + public weak bool use_ntlm { get; set; } + public signal void authenticate (Soup.Message p0, string auth_type, string auth_realm, pointer username, pointer password); + public signal void reauthenticate (Soup.Message p0, string auth_type, string auth_realm, pointer username, pointer password); } [CCode (cheader_filename = "libsoup/soup.h")] - public class SessionAsync : Soup.Session { - public static GLib.Type get_type (); + public class SessionAsync : Soup.Session, Soup.MessageFilter { public SessionAsync (); public SessionAsync.with_options (string optname1); } [CCode (cheader_filename = "libsoup/soup.h")] - public class SessionSync : Soup.Session { - public static GLib.Type get_type (); + public class SessionSync : Soup.Session, Soup.MessageFilter { public SessionSync (); public SessionSync.with_options (string optname1); } @@ -404,7 +489,6 @@ namespace Soup { public void disconnect (); public weak Soup.Address get_local_address (); public weak Soup.Address get_remote_address (); - public static GLib.Type get_type (); public bool is_connected (); public bool listen (Soup.Address local_addr); public Socket (string optname1); @@ -415,191 +499,126 @@ namespace Soup { public bool start_ssl (); public Soup.SocketIOStatus write (pointer buffer, ulong len, ulong nwrote); [NoAccessorMethod] - public weak bool non_blocking { get; set; } - [NoAccessorMethod] - public weak bool nodelay { get; set; } - [NoAccessorMethod] - public weak bool reuseaddr { get; set; } + public weak pointer async_context { get; construct; } [NoAccessorMethod] public weak bool cloexec { get; set; } [NoAccessorMethod] public weak bool is_server { get; } [NoAccessorMethod] - public weak pointer ssl_creds { get; set; } + public weak bool nodelay { get; set; } [NoAccessorMethod] - public weak pointer async_context { get; construct; } + public weak bool non_blocking { get; set; } + [NoAccessorMethod] + public weak bool reuseaddr { get; set; } + [NoAccessorMethod] + public weak pointer ssl_creds { get; set; } [NoAccessorMethod] public weak uint timeout { get; set; } - public signal void connect_result (uint arg2); + public signal void connect_result (int p0); + public signal void disconnected (); + public signal void new_connection (Soup.Socket p0); public signal void readable (); public signal void writable (); - public signal void disconnected (); - public signal void new_connection (Soup.Socket arg2); - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class AuthBasicClass { - public pointer parent_class; - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class DNSLookup { - public void cancel (); - public weak string get_hostname (); - public static weak Soup.DNSLookup name (string name); - public bool resolve (); - public void resolve_async (GLib.MainContext async_context, Soup.DNSCallback callback, pointer user_data); - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class DataBuffer { - public Soup.Ownership owner; - public weak string body; - public uint length; - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class MD5Context { - public uint buf; - public uint bits; - public uchar @in; - public bool doByteReverse; - } - [CCode (free_function = "soup_message_queue_destroy", cheader_filename = "libsoup/soup.h")] - public class MessageQueue { - public void append (Soup.Message msg); - public weak Soup.Message first (Soup.MessageQueueIter iter); - public void free_iter (Soup.MessageQueueIter iter); - public MessageQueue (); - public weak Soup.Message next (Soup.MessageQueueIter iter); - public weak Soup.Message remove (Soup.MessageQueueIter iter); - public void remove_message (Soup.Message msg); - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class MessageQueueIter { - public weak GLib.List cur; - public weak GLib.List next; - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class ServerAuthBasic { - public Soup.AuthType type; - public weak string user; - public weak string passwd; - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class ServerAuthContext { - public uint types; - public Soup.ServerAuthCallbackFn callback; - public pointer user_data; - public uint allow_algorithms; - public bool force_integrity; - public void challenge (Soup.Message msg, string header_name); - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class ServerAuthDigest { - public Soup.AuthType type; - public Soup.DigestAlgorithm algorithm; - public bool integrity; - public weak string realm; - public weak string user; - public weak string nonce; - public int nonce_count; - public weak string cnonce; - public weak string digest_uri; - public weak string digest_response; - public weak string request_method; - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class ServerContext { - public weak Soup.Message msg; - public weak string path; - public Soup.MethodId method_id; - public weak Soup.ServerAuth auth; - public weak Soup.Server server; - public weak Soup.ServerHandler handler; - public weak Soup.Socket sock; - public weak Soup.Address get_client_address (); - public weak string get_client_host (); - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class ServerHandler { - public weak string path; - public weak Soup.ServerAuthContext auth_ctx; - public Soup.ServerCallbackFn callback; - public Soup.ServerUnregisterFn unregister; - public pointer user_data; - } - [CCode (copy_function = "soup_uri_copy", cheader_filename = "libsoup/soup.h")] - public class Uri { - public GLib.Quark protocol; - public weak string user; - public weak string passwd; - public weak string host; - public uint port; - public weak string path; - public weak string query; - public weak string fragment; - public bool broken_encoding; - public weak Soup.Uri copy (); - public weak Soup.Uri copy_root (); - public static void decode (string part); - public static weak string encode (string part, string escape_extra); - public bool equal (Soup.Uri uri2); - public Uri (string uri_string); - public Uri.with_base (Soup.Uri @base, string uri_string); - public weak string to_string (bool just_path); - public bool uses_default_port (); - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class Date { - public static weak string generate (ulong when); - public static ulong iso8601_parse (string timestamp); - public static ulong parse (string timestamp); - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class Dns { - public static void init (); - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class Header { - public static weak string param_copy_token (GLib.HashTable tokens, string t); - public static weak string param_decode_token (out string @in); - public static void param_destroy_hash (GLib.HashTable table); - public static weak GLib.HashTable param_parse_list (string header); - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class Headers { - public static bool parse_request (string str, int len, GLib.HashTable dest, out string req_method, out string req_path, Soup.HttpVersion ver); - public static bool parse_response (string str, int len, GLib.HashTable dest, Soup.HttpVersion ver, uint status_code, out string reason_phrase); - public static bool parse_status_line (string status_line, Soup.HttpVersion ver, uint status_code, out string reason_phrase); - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class Ssl { - public static GLib.Quark error_quark (); - public static void free_client_credentials (pointer creds); - public static void free_server_credentials (pointer creds); - public static pointer get_client_credentials (string ca_file); - public static pointer get_server_credentials (string cert_file, string key_file); - public static weak GLib.IOChannel wrap_iochannel (GLib.IOChannel sock, Soup.SSLType type, string remote_host, pointer credentials); - } - [CCode (cheader_filename = "libsoup/soup.h")] - public class Str { - public static bool case_equal (pointer v1, pointer v2); - public static uint case_hash (pointer key); } [CCode (cheader_filename = "libsoup/soup.h")] public interface MessageFilter { - public static GLib.Type get_type (); public abstract void setup_message (Soup.Message msg); } public static delegate void AddressCallback (Soup.Address addr, uint status, pointer data); public static delegate void ConnectionCallback (Soup.Connection conn, uint status, pointer data); - public static delegate void DNSCallback (Soup.DNSLookup lookup, bool success, pointer user_data); public static delegate void MessageCallbackFn (Soup.Message req, pointer user_data); public static delegate bool ServerAuthCallbackFn (Soup.ServerAuthContext auth_ctx, Soup.ServerAuth auth, Soup.Message msg, pointer data); public static delegate void ServerCallbackFn (Soup.ServerContext context, Soup.Message msg, pointer user_data); public static delegate void ServerUnregisterFn (Soup.Server server, Soup.ServerHandler handler, pointer user_data); public static delegate void SocketCallback (Soup.Socket sock, uint status, pointer user_data); public static delegate void SocketListenerCallback (Soup.Socket listener, Soup.Socket sock, pointer user_data); + public const int ADDRESS_ANY_PORT; + public const string CONNECTION_ASYNC_CONTEXT; + public const int CONNECTION_H; + public const string CONNECTION_MESSAGE_FILTER; + public const string CONNECTION_ORIGIN_URI; + public const string CONNECTION_PROXY_URI; + public const string CONNECTION_SSL_CREDENTIALS; + public const string CONNECTION_TIMEOUT; + public const int DATE_H; + public const int H; + public const int HEADERS_H; + public const int MESSAGE_FILTER_H; + public const int MESSAGE_H; + public const int MESSAGE_QUEUE_H; + public const string METHOD_CONNECT; + public const string METHOD_COPY; + public const string METHOD_DELETE; + public const string METHOD_GET; + public const int METHOD_H; + public const string METHOD_HEAD; + public const string METHOD_LOCK; + public const string METHOD_MKCOL; + public const string METHOD_MOVE; + public const string METHOD_OPTIONS; + public const string METHOD_PATCH; + public const string METHOD_POST; + public const string METHOD_PROPFIND; + public const string METHOD_PROPPATCH; + public const string METHOD_PUT; + public const string METHOD_TRACE; + public const string METHOD_UNLOCK; + public const int MISC_H; + public const string SERVER_ASYNC_CONTEXT; + public const int SERVER_AUTH_H; + public const int SERVER_H; + public const string SERVER_INTERFACE; + public const int SERVER_MESSAGE_H; + public const string SERVER_PORT; + public const string SERVER_SSL_CERT_FILE; + public const string SERVER_SSL_KEY_FILE; + public const string SESSION_ASYNC_CONTEXT; + public const int SESSION_ASYNC_H; + public const int SESSION_H; + public const string SESSION_MAX_CONNS; + public const string SESSION_MAX_CONNS_PER_HOST; + public const string SESSION_PROXY_URI; + public const string SESSION_SSL_CA_FILE; + public const int SESSION_SYNC_H; + public const string SESSION_TIMEOUT; + public const string SESSION_USE_NTLM; + public const int SOAP_MESSAGE_H; + public const string SOCKET_ASYNC_CONTEXT; + public const string SOCKET_FLAG_CLOEXEC; + public const string SOCKET_FLAG_NODELAY; + public const string SOCKET_FLAG_NONBLOCKING; + public const string SOCKET_FLAG_REUSEADDR; + public const int SOCKET_H; + public const string SOCKET_IS_SERVER; + public const string SOCKET_SSL_CREDENTIALS; + public const string SOCKET_TIMEOUT; + public const int STATUS_H; + public const int TYPES_H; + public const int URI_H; public static weak GLib.Source add_idle (GLib.MainContext async_context, GLib.SourceFunc function, pointer data); public static weak GLib.Source add_timeout (GLib.MainContext async_context, uint interval, GLib.SourceFunc function, pointer data); + public static weak string base64_decode (string text, int out_len); + [NoArrayLength] + public static int base64_decode_step (uchar[] @in, int len, uchar[] @out, int state, uint save); + public static weak string base64_encode (string text, int len); + [NoArrayLength] + public static int base64_encode_close (uchar[] @in, int inlen, bool break_lines, uchar[] @out, int state, int save); + [NoArrayLength] + public static int base64_encode_step (uchar[] @in, int len, bool break_lines, uchar[] @out, int state, int save); + public static weak string date_generate (ulong when); + public static ulong date_iso8601_parse (string timestamp); + 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 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 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); + public static bool str_case_equal (pointer v1, pointer v2); + public static uint str_case_hash (pointer key); } diff --git a/vapi/packages/hildon-1/hildon-1.gi b/vapi/packages/hildon-1/hildon-1.gi index fc33c74..e879e91 100644 --- a/vapi/packages/hildon-1/hildon-1.gi +++ b/vapi/packages/hildon-1/hildon-1.gi @@ -733,8 +733,8 @@ - - + + @@ -1986,6 +1986,7 @@ + diff --git a/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi b/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi index 7b9da96..828ec72 100644 --- a/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi +++ b/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi @@ -3857,50 +3857,50 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/vapi/packages/libsoup-2.2/libsoup-2.2.files b/vapi/packages/libsoup-2.2/libsoup-2.2.files index 3743cd6..3c3719d 100644 --- a/vapi/packages/libsoup-2.2/libsoup-2.2.files +++ b/vapi/packages/libsoup-2.2/libsoup-2.2.files @@ -1 +1,2 @@ -libsoup +include/libsoup-2.2/libsoup +lib/libsoup-2.2.so diff --git a/vapi/packages/libsoup-2.2/libsoup-2.2.gi b/vapi/packages/libsoup-2.2/libsoup-2.2.gi new file mode 100644 index 0000000..812247a --- /dev/null +++ b/vapi/packages/libsoup-2.2/libsoup-2.2.gi @@ -0,0 +1,2398 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vapi/packages/libsoup-2.2/libsoup-2.2.gidl b/vapi/packages/libsoup-2.2/libsoup-2.2.gidl deleted file mode 100644 index f7a58d5..0000000 --- a/vapi/packages/libsoup-2.2/libsoup-2.2.gidl +++ /dev/null @@ -1,2448 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vapi/packages/libsoup-2.2/libsoup-2.2.metadata b/vapi/packages/libsoup-2.2/libsoup-2.2.metadata index cd6920b..a7e6fa7 100644 --- a/vapi/packages/libsoup-2.2/libsoup-2.2.metadata +++ b/vapi/packages/libsoup-2.2/libsoup-2.2.metadata @@ -1,6 +1,8 @@ Soup cheader_filename="libsoup/soup.h" soup_add_io_watch hidden="1" soup_address_new_from_sockaddr hidden="1" +SoupConnection::authenticate has_emitter="1" +SoupConnection::reauthenticate has_emitter="1" soup_dns_lookup_address hidden="1" soup_dns_ntop hidden="1" SoupMessage::finished has_emitter="1" -- 2.7.4