From 02a49e7b22d1f83e59c00e0c4fcec2d84670e410 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrg=20Billeter?= Date: Mon, 30 Jun 2008 21:02:02 +0000 Subject: [PATCH] Fix g_pattern_match and g_content_type_guess bindings, patch by Phil MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-06-30 Jürg Billeter * vapi/glib-2.0.vapi: * vapi/packages/gio-2.0/: Fix g_pattern_match and g_content_type_guess bindings, patch by Phil Housley * vapi/gio-2.0.vapi: regenerated svn path=/trunk/; revision=1666 --- ChangeLog | 10 ++++++++++ vapi/gio-2.0.vapi | 4 ++-- vapi/glib-2.0.vapi | 3 +-- vapi/packages/gio-2.0/gio-2.0.metadata | 2 ++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59f3480..0e74f76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2008-06-30 Jürg Billeter + * vapi/glib-2.0.vapi: + * vapi/packages/gio-2.0/: + + Fix g_pattern_match and g_content_type_guess bindings, + patch by Phil Housley + + * vapi/gio-2.0.vapi: regenerated + +2008-06-30 Jürg Billeter + * gobject/valaccodetypesymbolbinding.vala: Add support for uchar GObject properties, patch by Ali Sabil diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index c8c76f5..09b937b 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -1,4 +1,4 @@ -/* gio-2.0.vapi generated by vapigen, do not modify. */ +/* gio-2.0.vapi generated by lt-vapigen, do not modify. */ [CCode (cprefix = "G", lower_case_cprefix = "g_")] namespace GLib { @@ -1010,7 +1010,7 @@ namespace GLib { [CCode (cname = "g_content_type_get_mime_type", cheader_filename = "gio/gio.h")] public static weak string g_content_type_get_mime_type (string type); [CCode (cname = "g_content_type_guess", cheader_filename = "gio/gio.h")] - public static weak string g_content_type_guess (string filename, uchar[] data, ulong data_size, bool result_uncertain); + public static weak string g_content_type_guess (string filename, uchar[] data, out bool result_uncertain); [CCode (cname = "g_content_type_is_a", cheader_filename = "gio/gio.h")] public static bool g_content_type_is_a (string type, string supertype); [CCode (cname = "g_content_type_is_unknown", cheader_filename = "gio/gio.h")] diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi index 19d446b..b78ba5a 100644 --- a/vapi/glib-2.0.vapi +++ b/vapi/glib-2.0.vapi @@ -3248,10 +3248,9 @@ namespace GLib { [Compact] public class PatternSpec { public PatternSpec (string pattern); - public void free (); public bool equal (PatternSpec pspec); [CCode (cname = "g_pattern_match")] - public bool match (uint string_length, string str, string str_reversed); + public bool match (uint string_length, string str, string? str_reversed); [CCode (cname = "g_pattern_match_string")] public bool match_string (string str); [CCode (cname = "g_pattern_match_simple")] diff --git a/vapi/packages/gio-2.0/gio-2.0.metadata b/vapi/packages/gio-2.0/gio-2.0.metadata index 276bec5..a5e432b 100644 --- a/vapi/packages/gio-2.0/gio-2.0.metadata +++ b/vapi/packages/gio-2.0/gio-2.0.metadata @@ -2,6 +2,8 @@ GLib cprefix="G" lower_case_cprefix="g_" cheader_filename="gio/gio.h" g_app_info_launch.envp is_array="1" g_app_info_launch_default_for_uri.launch_context nullable="1" g_app_info_launch_uris.envp is_array="1" +g_content_type_guess.data_size hidden="1" +g_content_type_guess.result_uncertain is_out="1" g_data_input_stream_read_line.length is_out="1" g_data_input_stream_read_until.length is_out="1" g_file_append_to transfer_ownership="1" -- 2.7.4