Add fileno, ferror, and clearerr bindings and fix a few other bindings,

2008-12-15  Jürg Billeter  <j@bitron.ch>

	* vapi/glib-2.0.vapi:

	Add fileno, ferror, and clearerr bindings and fix a few other
	bindings, patch by Evan Nemerson, fixes bug 547921 and bug 558206

svn path=/trunk/; revision=2160

diff --git a/ChangeLog b/ChangeLog
index 007439a2e25d2bd7ec6e3651c58ace98d5851032..6a6680c33c25ebe0031e26b7bfef61d25264f81a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-15  Jürg Billeter  <j@bitron.ch>
+
+       * vapi/glib-2.0.vapi:
+
+       Add fileno, ferror, and clearerr bindings and fix a few other
+       bindings, patch by Evan Nemerson, fixes bug 547921 and bug 558206
+
 2008-12-15  Jürg Billeter  <j@bitron.ch>
 
        * vapi/packages/gtk+-2.0/:

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index 9d5754151282a09168f1687a950a9b13835353d1..b0315888e083287cc086634df11c7ffb130f56be 100644 (file)
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -1715,7 +1715,7 @@ namespace GLib {
 
                [CCode (cname = "strftime", instance_pos = -1)]
                public size_t strftime (char[] s, string format);
-               [CCode (instance_pos = -1)]
+               [CCode (cname = "strptime", instance_pos = -1)]
                public weak string? strptime (string buf, string format);
        }
 
@@ -2196,6 +2196,12 @@ namespace GLib {
                public long tell ();
                [CCode (cname = "rewind")]
                public void rewind ();
+               [CCode (cname = "fileno")]
+               public int fileno ();
+               [CCode (cname = "ferror")]
+               public int error ();
+               [CCode (cname = "clearerr")]
+               public void clearerr ();
        }
 
        [CCode (lower_case_cprefix = "g_file_", cheader_filename = "glib/gstdio.h")]
@@ -2269,10 +2275,10 @@ namespace GLib {
                public const string RESERVED_CHARS_GENERIC_DELIMITERS;
                public const string RESERVED_CHARS_SUBCOMPONENT_DELIMITERS;
 
+               public static string parse_scheme (string uri);
                public static string escape_string (string unescaped, string reserved_chars_allowed, bool allow_utf8);
-               public static string get_scheme (string uri);
-               public static string unescape_segment (string escaped_string, string escaped_string_end, string illegal_characters);
                public static string unescape_string (string escaped_string, string illegal_characters);
+               public static string unescape_segment (string escaped_string, string escaped_string_end, string illegal_characters);
        }
 
        /* Shell-related Utilities */