Fix soup_uri_decode and soup_uri_encode bindings

2008-09-25  Jürg Billeter  <j@bitron.ch>

	* vapi/packages/libsoup-2.2:
	* vapi/packages/libsoup-2.4:

	Fix soup_uri_decode and soup_uri_encode bindings

	* vapi/libsoup-2.2.vapi:
	* vapi/libsoup-2.4.vapi:

	Regenerated

svn path=/trunk/; revision=1780

diff --git a/ChangeLog b/ChangeLog
index 3459fce..2f64669 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2008-09-25  Jürg Billeter  <j@bitron.ch>
 
+       * vapi/packages/libsoup-2.2:
+       * vapi/packages/libsoup-2.4:
+
+       Fix soup_uri_decode and soup_uri_encode bindings
+
+       * vapi/libsoup-2.2.vapi:
+       * vapi/libsoup-2.4.vapi:
+
+       Regenerated
+
+2008-09-25  Jürg Billeter  <j@bitron.ch>
+
        * vala/valacreationmethod.vala:
 
        Fix parameter position defaults

diff --git a/vapi/libsoup-2.2.vapi b/vapi/libsoup-2.2.vapi
index e627c29..8368053 100644 (file)
--- a/vapi/libsoup-2.2.vapi
+++ b/vapi/libsoup-2.2.vapi
@@ -272,7 +272,7 @@ namespace Soup {
                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 static 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);
@@ -474,12 +474,16 @@ namespace Soup {
        }
        [CCode (cheader_filename = "libsoup/soup.h")]
        public class SessionAsync : Soup.Session, Soup.MessageFilter {
+               [CCode (type = "SoupSession*")]
                public SessionAsync ();
+               [CCode (type = "SoupSession*")]
                public SessionAsync.with_options (string optname1);
        }
        [CCode (cheader_filename = "libsoup/soup.h")]
        public class SessionSync : Soup.Session, Soup.MessageFilter {
+               [CCode (type = "SoupSession*")]
                public SessionSync ();
+               [CCode (type = "SoupSession*")]
                public SessionSync.with_options (string optname1);
        }
        [CCode (cheader_filename = "libsoup/soup.h")]

diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi
index 6cf0c85..b40e235 100644 (file)
--- a/vapi/libsoup-2.4.vapi
+++ b/vapi/libsoup-2.4.vapi
@@ -167,7 +167,7 @@ namespace Soup {
        }
        [Compact]
        [CCode (copy_function = "soup_buffer_copy", cheader_filename = "libsoup/soup.h")]
-       public class Buffer : GLib.Boxed {
+       public class Buffer {
                public weak string data;
                public ulong length;
                public weak Soup.Buffer copy ();
@@ -178,11 +178,11 @@ namespace Soup {
        }
        [Compact]
        [CCode (cheader_filename = "libsoup/soup.h")]
-       public class ByteArray : GLib.Boxed {
+       public class ByteArray {
        }
        [Compact]
        [CCode (cheader_filename = "libsoup/soup.h")]
-       public class ClientContext : GLib.Boxed {
+       public class ClientContext {
                public weak Soup.Address get_address ();
                public weak Soup.AuthDomain get_auth_domain ();
                public weak string get_auth_user ();
@@ -191,7 +191,7 @@ namespace Soup {
        }
        [Compact]
        [CCode (copy_function = "soup_date_copy", cheader_filename = "libsoup/soup.h")]
-       public class Date : GLib.Boxed {
+       public class Date {
                public int year;
                public int month;
                public int day;
@@ -210,7 +210,7 @@ namespace Soup {
        }
        [Compact]
        [CCode (cheader_filename = "libsoup/soup.h")]
-       public class MessageBody : GLib.Boxed {
+       public class MessageBody {
                public weak string data;
                public int64 length;
                public void append (Soup.MemoryUse use, void* data, ulong length);
@@ -223,7 +223,7 @@ namespace Soup {
        }
        [Compact]
        [CCode (cheader_filename = "libsoup/soup.h")]
-       public class MessageHeaders : GLib.Boxed {
+       public class MessageHeaders {
                public void append (string name, string value);
                public void clear ();
                public void @foreach (Soup.MessageHeadersForeachFunc func);
@@ -240,7 +240,7 @@ namespace Soup {
        }
        [Compact]
        [CCode (copy_function = "soup_uri_copy", cheader_filename = "libsoup/soup.h")]
-       public class URI : GLib.Boxed {
+       public class URI {
                public weak string scheme;
                public weak string user;
                public weak string password;
@@ -250,8 +250,8 @@ namespace Soup {
                public weak string query;
                public weak string fragment;
                public weak Soup.URI copy ();
-               public static weak string decode (string part);
-               public static weak string encode (string part, string escape_extra);
+               public static string decode (string part);
+               public static 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);
@@ -339,6 +339,7 @@ namespace Soup {
        }
        [CCode (cheader_filename = "libsoup/soup.h")]
        public class AuthDomainBasic : Soup.AuthDomain {
+               [CCode (type = "SoupAuthDomain*")]
                public AuthDomainBasic (string optname1);
                public static void set_auth_callback (Soup.AuthDomain domain, Soup.AuthDomainBasicAuthCallback callback, GLib.DestroyNotify dnotify);
                [NoAccessorMethod]
@@ -349,6 +350,7 @@ namespace Soup {
        [CCode (cheader_filename = "libsoup/soup.h")]
        public class AuthDomainDigest : Soup.AuthDomain {
                public static weak string encode_password (string username, string realm, string password);
+               [CCode (type = "SoupAuthDomain*")]
                public AuthDomainDigest (string optname1);
                public static void set_auth_callback (Soup.AuthDomain domain, Soup.AuthDomainDigestAuthCallback callback, GLib.DestroyNotify dnotify);
                [NoAccessorMethod]
@@ -483,12 +485,16 @@ namespace Soup {
        }
        [CCode (cheader_filename = "libsoup/soup.h")]
        public class SessionAsync : Soup.Session {
+               [CCode (type = "SoupSession*")]
                public SessionAsync ();
+               [CCode (type = "SoupSession*")]
                public SessionAsync.with_options (string optname1);
        }
        [CCode (cheader_filename = "libsoup/soup.h")]
        public class SessionSync : Soup.Session {
+               [CCode (type = "SoupSession*")]
                public SessionSync ();
+               [CCode (type = "SoupSession*")]
                public SessionSync.with_options (string optname1);
        }
        [CCode (cheader_filename = "libsoup/soup.h")]

diff --git a/vapi/packages/libsoup-2.2/libsoup-2.2.metadata b/vapi/packages/libsoup-2.2/libsoup-2.2.metadata
index 436229a..7b80989 100644 (file)
--- a/vapi/packages/libsoup-2.2/libsoup-2.2.metadata
+++ b/vapi/packages/libsoup-2.2/libsoup-2.2.metadata
@@ -29,6 +29,7 @@ soup_session_queue_message.msg transfer_ownership="1"
 SoupSoap hidden="1"
 SoupSoapMessage hidden="1"
 SoupSoapResponse hidden="1"
+soup_uri_encode transfer_ownership="1"
 soup_xml_real_node hidden="1"
 SoupXmlrpc hidden="1"
 SoupXmlrpcMessage hidden="1"

diff --git a/vapi/packages/libsoup-2.4/libsoup-2.4.metadata b/vapi/packages/libsoup-2.4/libsoup-2.4.metadata
index 40f711a..f753cb1 100644 (file)
--- a/vapi/packages/libsoup-2.4/libsoup-2.4.metadata
+++ b/vapi/packages/libsoup-2.4/libsoup-2.4.metadata
@@ -16,6 +16,8 @@ SoupMessage::wrote_headers has_emitter="1"
 SoupMessage::wrote_informational has_emitter="1"
 soup_server_new ellipsis="1"
 soup_session_queue_message.msg transfer_ownership="1"
+soup_uri_decode transfer_ownership="1"
+soup_uri_encode transfer_ownership="1"
 
 # unsupported
 GData name="pointer"