glibmm r687 - in trunk: . gio/src glib/src

[murrayc svn gnome org]

Author: murrayc
Date: Tue Jul 15 10:58:19 2008
New Revision: 687
URL: http://svn.gnome.org/viewvc/glibmm?rev=687&view=rev

Log:
2008-07-15  Murray Cumming  <murrayc murrayc com>

* gio/src/gio_methods.defs:
* glib/src/glib_functions.defs: Regenerated with h2def.py
* glib/src/checksum.hg: Added reset().

Modified:
   trunk/ChangeLog
   trunk/gio/src/gio_methods.defs
   trunk/glib/src/checksum.hg
   trunk/glib/src/glib_functions.defs

Modified: trunk/gio/src/gio_methods.defs
==============================================================================
--- trunk/gio/src/gio_methods.defs	(original)
+++ trunk/gio/src/gio_methods.defs	Tue Jul 15 10:58:19 2008
@@ -1043,6 +1043,14 @@
   )
 )
 
+(define-function g_content_type_from_mime_type
+  (c-name "g_content_type_from_mime_type")
+  (return-type "char*")
+  (parameters
+    '("const-char*" "mime_type")
+  )
+)
+
 (define-function g_content_type_guess
   (c-name "g_content_type_guess")
   (return-type "char*")
@@ -1342,6 +1350,14 @@
   )
 )
 
+(define-function g_desktop_app_info_new_from_keyfile
+  (c-name "g_desktop_app_info_new_from_keyfile")
+  (return-type "GDesktopAppInfo*")
+  (parameters
+    '("GKeyFile*" "key_file")
+  )
+)
+
 (define-function g_desktop_app_info_new
   (c-name "g_desktop_app_info_new")
   (is-constructor-of "GDesktopAppInfo")
@@ -1651,6 +1667,12 @@
   )
 )
 
+(define-method get_container
+  (of-object "GFileEnumerator")
+  (c-name "g_file_enumerator_get_container")
+  (return-type "GFile*")
+)
+
 
 
 ;; From gfile.h
@@ -1959,6 +1981,16 @@
   )
 )
 
+(define-method query_file_type
+  (of-object "GFile")
+  (c-name "g_file_query_file_type")
+  (return-type "GFileType")
+  (parameters
+    '("GFileQueryInfoFlags" "flags")
+    '("GCancellable*" "cancellable")
+  )
+)
+
 (define-method query_info
   (of-object "GFile")
   (c-name "g_file_query_info")
@@ -2215,6 +2247,16 @@
   )
 )
 
+(define-method make_directory_with_parents
+  (of-object "GFile")
+  (c-name "g_file_make_directory_with_parents")
+  (return-type "gboolean")
+  (parameters
+    '("GCancellable*" "cancellable")
+    '("GError**" "error")
+  )
+)
+
 (define-method make_symbolic_link
   (of-object "GFile")
   (c-name "g_file_make_symbolic_link")
@@ -2499,6 +2541,17 @@
   )
 )
 
+(define-method monitor
+  (of-object "GFile")
+  (c-name "g_file_monitor")
+  (return-type "GFileMonitor*")
+  (parameters
+    '("GFileMonitorFlags" "flags")
+    '("GCancellable*" "cancellable")
+    '("GError**" "error")
+  )
+)
+
 (define-method query_default_handler
   (of-object "GFile")
   (c-name "g_file_query_default_handler")
@@ -3552,6 +3605,10 @@
 
 
 
+;; From gioenums.h
+
+
+
 ;; From gioenumtypes.h
 
 (define-function g_app_info_create_flags_get_type
@@ -3569,6 +3626,21 @@
   (return-type "GType")
 )
 
+(define-function g_file_attribute_type_get_type
+  (c-name "g_file_attribute_type_get_type")
+  (return-type "GType")
+)
+
+(define-function g_file_attribute_info_flags_get_type
+  (c-name "g_file_attribute_info_flags_get_type")
+  (return-type "GType")
+)
+
+(define-function g_file_attribute_status_get_type
+  (c-name "g_file_attribute_status_get_type")
+  (return-type "GType")
+)
+
 (define-function g_file_query_info_flags_get_type
   (c-name "g_file_query_info_flags_get_type")
   (return-type "GType")
@@ -3599,21 +3671,6 @@
   (return-type "GType")
 )
 
-(define-function g_file_attribute_type_get_type
-  (c-name "g_file_attribute_type_get_type")
-  (return-type "GType")
-)
-
-(define-function g_file_attribute_info_flags_get_type
-  (c-name "g_file_attribute_info_flags_get_type")
-  (return-type "GType")
-)
-
-(define-function g_file_attribute_status_get_type
-  (c-name "g_file_attribute_status_get_type")
-  (return-type "GType")
-)
-
 (define-function g_file_type_get_type
   (c-name "g_file_type_get_type")
   (return-type "GType")
@@ -3847,6 +3904,10 @@
 
 
 
+;; From giotypes.h
+
+
+
 ;; From gloadableicon.h
 
 (define-function g_loadable_icon_get_type
@@ -4000,6 +4061,12 @@
   (return-type "gsize")
 )
 
+(define-method get_data_size
+  (of-object "GMemoryOutputStream")
+  (c-name "g_memory_output_stream_get_data_size")
+  (return-type "gsize")
+)
+
 
 
 ;; From gmount.h
@@ -4124,6 +4191,28 @@
   )
 )
 
+(define-method guess_content_type
+  (of-object "GMount")
+  (c-name "g_mount_guess_content_type")
+  (return-type "none")
+  (parameters
+    '("gboolean" "force_rescan")
+    '("GCancellable*" "cancellable")
+    '("GAsyncReadyCallback" "callback")
+    '("gpointer" "user_data")
+  )
+)
+
+(define-method guess_content_type_finish
+  (of-object "GMount")
+  (c-name "g_mount_guess_content_type_finish")
+  (return-type "gchar**")
+  (parameters
+    '("GAsyncResult*" "result")
+    '("GError**" "error")
+  )
+)
+
 
 
 ;; From gmountoperation.h
@@ -4722,6 +4811,15 @@
   )
 )
 
+(define-method prepend_name
+  (of-object "GThemedIcon")
+  (c-name "g_themed_icon_prepend_name")
+  (return-type "none")
+  (parameters
+    '("const-char*" "iconname")
+  )
+)
+
 (define-method append_name
   (of-object "GThemedIcon")
   (c-name "g_themed_icon_append_name")
@@ -4972,6 +5070,15 @@
   (return-type "GUnixMountMonitor*")
 )
 
+(define-method set_rate_limit
+  (of-object "GUnixMountMonitor")
+  (c-name "g_unix_mount_monitor_set_rate_limit")
+  (return-type "none")
+  (parameters
+    '("int" "limit_msec")
+  )
+)
+
 (define-function g_unix_is_mount_path_system_internal
   (c-name "g_unix_is_mount_path_system_internal")
   (return-type "gboolean")
@@ -5176,6 +5283,12 @@
   (return-type "char**")
 )
 
+(define-method get_activation_root
+  (of-object "GVolume")
+  (c-name "g_volume_get_activation_root")
+  (return-type "GFile*")
+)
+
 
 
 ;; From gvolumemonitor.h
@@ -5244,3 +5357,11 @@
 )
 
 
+
+;; From gwin32mount.h
+
+
+
+;; From gwin32volumemonitor.h
+
+

Modified: trunk/glib/src/checksum.hg
==============================================================================
--- trunk/glib/src/checksum.hg	(original)
+++ trunk/glib/src/checksum.hg	Tue Jul 15 10:58:19 2008
@@ -74,6 +74,8 @@
    * This will return false, for instance, if an unsupported checksum type was provided to the constructor.
    */
   operator bool() const;
+
+  _WRAP_METHOD(void reset(), g_checksum_reset)
   
   _WRAP_METHOD(void update(const guchar* data, gsize length), g_checksum_update)
 

Modified: trunk/glib/src/glib_functions.defs
==============================================================================
--- trunk/glib/src/glib_functions.defs	(original)
+++ trunk/glib/src/glib_functions.defs	Tue Jul 15 10:58:19 2008
@@ -28,6 +28,17 @@
   )
 )
 
+(define-enum Type
+  (in-module "GChecksum")
+  (c-name "GChecksumType")
+  (gtype-id "G_TYPE_CHECKSUM_TYPE")
+  (values
+    '("md5" "G_CHECKSUM_MD5")
+    '("sha1" "G_CHECKSUM_SHA1")
+    '("sha256" "G_CHECKSUM_SHA256")
+  )
+)
+
 (define-enum Error
   (in-module "GConvert")
   (c-name "GConvertError")
@@ -275,6 +286,7 @@
     '("unknown-element" "G_MARKUP_ERROR_UNKNOWN_ELEMENT")
     '("unknown-attribute" "G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE")
     '("invalid-content" "G_MARKUP_ERROR_INVALID_CONTENT")
+    '("missing-attribute" "G_MARKUP_ERROR_MISSING_ATTRIBUTE")
   )
 )
 
@@ -285,6 +297,21 @@
   (values
     '("do-not-use-this-unsupported-flag" "G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG")
     '("treat-cdata-as-text" "G_MARKUP_TREAT_CDATA_AS_TEXT")
+    '("prefix-error-position" "G_MARKUP_PREFIX_ERROR_POSITION")
+  )
+)
+
+(define-flags CollectType
+  (in-module "GMarkup")
+  (c-name "GMarkupCollectType")
+  (gtype-id "G_TYPE_MARKUP_COLLECT_TYPE")
+  (values
+    '("invalid" "G_MARKUP_COLLECT_INVALID")
+    '("string" "G_MARKUP_COLLECT_STRING")
+    '("strdup" "G_MARKUP_COLLECT_STRDUP")
+    '("boolean" "G_MARKUP_COLLECT_BOOLEAN")
+    '("tristate" "G_MARKUP_COLLECT_TRISTATE")
+    '("optional" "G_MARKUP_COLLECT_OPTIONAL")
   )
 )
 
@@ -383,6 +410,44 @@
     '("optimize" "G_REGEX_ERROR_OPTIMIZE")
     '("replace" "G_REGEX_ERROR_REPLACE")
     '("match" "G_REGEX_ERROR_MATCH")
+    '("internal" "G_REGEX_ERROR_INTERNAL")
+    '("stray-backslash" "G_REGEX_ERROR_STRAY_BACKSLASH")
+    '("missing-control-char" "G_REGEX_ERROR_MISSING_CONTROL_CHAR")
+    '("unrecognized-escape" "G_REGEX_ERROR_UNRECOGNIZED_ESCAPE")
+    '("quantifiers-out-of-order" "G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER")
+    '("quantifier-too-big" "G_REGEX_ERROR_QUANTIFIER_TOO_BIG")
+    '("unterminated-character-class" "G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS")
+    '("invalid-escape-in-character-class" "G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS")
+    '("range-out-of-order" "G_REGEX_ERROR_RANGE_OUT_OF_ORDER")
+    '("nothing-to-repeat" "G_REGEX_ERROR_NOTHING_TO_REPEAT")
+    '("unrecognized-character" "G_REGEX_ERROR_UNRECOGNIZED_CHARACTER")
+    '("posix-named-class-outside-class" "G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS")
+    '("unmatched-parenthesis" "G_REGEX_ERROR_UNMATCHED_PARENTHESIS")
+    '("inexistent-subpattern-reference" "G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE")
+    '("unterminated-comment" "G_REGEX_ERROR_UNTERMINATED_COMMENT")
+    '("expression-too-large" "G_REGEX_ERROR_EXPRESSION_TOO_LARGE")
+    '("memory-error" "G_REGEX_ERROR_MEMORY_ERROR")
+    '("variable-length-lookbehind" "G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND")
+    '("malformed-condition" "G_REGEX_ERROR_MALFORMED_CONDITION")
+    '("too-many-conditional-branches" "G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES")
+    '("assertion-expected" "G_REGEX_ERROR_ASSERTION_EXPECTED")
+    '("unknown-posix-class-name" "G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME")
+    '("posix-collating-elements-not-supported" "G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED")
+    '("hex-code-too-large" "G_REGEX_ERROR_HEX_CODE_TOO_LARGE")
+    '("invalid-condition" "G_REGEX_ERROR_INVALID_CONDITION")
+    '("single-byte-match-in-lookbehind" "G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND")
+    '("infinite-loop" "G_REGEX_ERROR_INFINITE_LOOP")
+    '("missing-subpattern-name-terminator" "G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR")
+    '("duplicate-subpattern-name" "G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME")
+    '("malformed-property" "G_REGEX_ERROR_MALFORMED_PROPERTY")
+    '("unknown-property" "G_REGEX_ERROR_UNKNOWN_PROPERTY")
+    '("subpattern-name-too-long" "G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG")
+    '("too-many-subpatterns" "G_REGEX_ERROR_TOO_MANY_SUBPATTERNS")
+    '("invalid-octal-value" "G_REGEX_ERROR_INVALID_OCTAL_VALUE")
+    '("too-many-branches-in-define" "G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE")
+    '("define-repetion" "G_REGEX_ERROR_DEFINE_REPETION")
+    '("inconsistent-newline-options" "G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS")
+    '("missing-back-reference" "G_REGEX_ERROR_MISSING_BACK_REFERENCE")
   )
 )
 
@@ -528,6 +593,35 @@
   )
 )
 
+(define-flags TrapFlags
+  (in-module "GTest")
+  (c-name "GTestTrapFlags")
+  (gtype-id "G_TYPE_TEST_TRAP_FLAGS")
+  (values
+    '("silence-stdout" "G_TEST_TRAP_SILENCE_STDOUT")
+    '("silence-stderr" "G_TEST_TRAP_SILENCE_STDERR")
+    '("inherit-stdin" "G_TEST_TRAP_INHERIT_STDIN")
+  )
+)
+
+(define-enum LogType
+  (in-module "GTest")
+  (c-name "GTestLogType")
+  (gtype-id "G_TYPE_TEST_LOG_TYPE")
+  (values
+    '("none" "G_TEST_LOG_NONE")
+    '("error" "G_TEST_LOG_ERROR")
+    '("start-binary" "G_TEST_LOG_START_BINARY")
+    '("list-case" "G_TEST_LOG_LIST_CASE")
+    '("skip-case" "G_TEST_LOG_SKIP_CASE")
+    '("start-case" "G_TEST_LOG_START_CASE")
+    '("stop-case" "G_TEST_LOG_STOP_CASE")
+    '("min-result" "G_TEST_LOG_MIN_RESULT")
+    '("max-result" "G_TEST_LOG_MAX_RESULT")
+    '("message" "G_TEST_LOG_MESSAGE")
+  )
+)
+
 (define-enum Error
   (in-module "GThread")
   (c-name "GThreadError")
@@ -715,6 +809,17 @@
     '("phoenician" "G_UNICODE_SCRIPT_PHOENICIAN")
     '("phags-pa" "G_UNICODE_SCRIPT_PHAGS_PA")
     '("nko" "G_UNICODE_SCRIPT_NKO")
+    '("kayah-li" "G_UNICODE_SCRIPT_KAYAH_LI")
+    '("lepcha" "G_UNICODE_SCRIPT_LEPCHA")
+    '("rejang" "G_UNICODE_SCRIPT_REJANG")
+    '("sundanese" "G_UNICODE_SCRIPT_SUNDANESE")
+    '("saurashtra" "G_UNICODE_SCRIPT_SAURASHTRA")
+    '("cham" "G_UNICODE_SCRIPT_CHAM")
+    '("ol-chiki" "G_UNICODE_SCRIPT_OL_CHIKI")
+    '("vai" "G_UNICODE_SCRIPT_VAI")
+    '("carian" "G_UNICODE_SCRIPT_CARIAN")
+    '("lycian" "G_UNICODE_SCRIPT_LYCIAN")
+    '("lydian" "G_UNICODE_SCRIPT_LYDIAN")
   )
 )
 
@@ -752,18 +857,6 @@
 )
 
 
-(define-enum Type
-  (in-module "GChecksum")
-  (c-name "GChecksumType")
-  (gtype-id "G_TYPE_CHECKSUM_TYPE")
-  (values
-    '("md5" "G_CHECKSUM_MD5")
-    '("sha1" "G_CHECKSUM_SHA1")
-    '("sha256" "G_CHECKSUM_SHA256")
-  )
-)
-
-
 ;; From galias.h
 
 
@@ -1127,6 +1220,14 @@
   (return-type "GAsyncQueue*")
 )
 
+(define-function g_async_queue_new_full
+  (c-name "g_async_queue_new_full")
+  (return-type "GAsyncQueue*")
+  (parameters
+    '("GDestroyNotify" "item_free_func")
+  )
+)
+
 (define-method lock
   (of-object "GAsyncQueue")
   (c-name "g_async_queue_lock")
@@ -1940,6 +2041,12 @@
   )
 )
 
+(define-method reset
+  (of-object "GChecksum")
+  (c-name "g_checksum_reset")
+  (return-type "none")
+)
+
 (define-method copy
   (of-object "GChecksum")
   (c-name "g_checksum_copy")
@@ -1994,11 +2101,12 @@
   (parameters
     '("GChecksumType" "checksum_type")
     '("const-gchar*" "str")
-    '("gsize" "length")
+    '("gssize" "length")
   )
 )
 
 
+
 ;; From gcompletion.h
 
 (define-function g_completion_new
@@ -2085,7 +2193,7 @@
     '("const-gchar*" "to_codeset")
     '("const-gchar*" "from_codeset")
   )
-)
+)	
 
 (define-method close
   (of-object "GIConv")
@@ -2859,6 +2967,17 @@
   (varargs #t)
 )
 
+(define-function g_set_error_literal
+  (c-name "g_set_error_literal")
+  (return-type "none")
+  (parameters
+    '("GError**" "err")
+    '("GQuark" "domain")
+    '("gint" "code")
+    '("const-gchar*" "message")
+  )
+)
+
 (define-function g_propagate_error
   (c-name "g_propagate_error")
   (return-type "none")
@@ -2876,6 +2995,27 @@
   )
 )
 
+(define-function g_prefix_error
+  (c-name "g_prefix_error")
+  (return-type "none")
+  (parameters
+    '("GError**" "err")
+    '("const-gchar*" "format")
+  )
+  (varargs #t)
+)
+
+(define-function g_propagate_prefixed_error
+  (c-name "g_propagate_prefixed_error")
+  (return-type "none")
+  (parameters
+    '("GError**" "dest")
+    '("GError*" "src")
+    '("const-gchar*" "format")
+  )
+  (varargs #t)
+)
+
 
 
 ;; From gfileutils.h
@@ -2919,7 +3059,7 @@
   (parameters
     '("const-gchar*" "filename")
     '("const-gchar*" "contents")
-    '("gssize" "length")
+    '("gsize" "length")
     '("GError**" "error")
   )
 )
@@ -2951,6 +3091,14 @@
   )
 )
 
+(define-function g_format_size_for_display
+  (c-name "g_format_size_for_display")
+  (return-type "char*")
+  (parameters
+    '("goffset" "size")
+  )
+)
+
 (define-function g_build_path
   (c-name "g_build_path")
   (return-type "gchar*")
@@ -3155,6 +3303,43 @@
   (return-type "GList*")
 )
 
+(define-method init
+  (of-object "GHashTableIter")
+  (c-name "g_hash_table_iter_init")
+  (return-type "none")
+  (parameters
+    '("GHashTable*" "hash_table")
+  )
+)
+
+(define-method next
+  (of-object "GHashTableIter")
+  (c-name "g_hash_table_iter_next")
+  (return-type "gboolean")
+  (parameters
+    '("gpointer*" "key")
+    '("gpointer*" "value")
+  )
+)
+
+(define-method get_hash_table
+  (of-object "GHashTableIter")
+  (c-name "g_hash_table_iter_get_hash_table")
+  (return-type "GHashTable*")
+)
+
+(define-method remove
+  (of-object "GHashTableIter")
+  (c-name "g_hash_table_iter_remove")
+  (return-type "none")
+)
+
+(define-method steal
+  (of-object "GHashTableIter")
+  (c-name "g_hash_table_iter_steal")
+  (return-type "none")
+)
+
 (define-method ref
   (of-object "GHashTable")
   (c-name "g_hash_table_ref")
@@ -4230,7 +4415,7 @@
 (define-method set_comment
   (of-object "GKeyFile")
   (c-name "g_key_file_set_comment")
-  (return-type "none")
+  (return-type "gboolean")
   (parameters
     '("const-gchar*" "group_name")
     '("const-gchar*" "key")
@@ -4253,7 +4438,7 @@
 (define-method remove_comment
   (of-object "GKeyFile")
   (c-name "g_key_file_remove_comment")
-  (return-type "none")
+  (return-type "gboolean")
   (parameters
     '("const-gchar*" "group_name")
     '("const-gchar*" "key")
@@ -4264,7 +4449,7 @@
 (define-method remove_key
   (of-object "GKeyFile")
   (c-name "g_key_file_remove_key")
-  (return-type "none")
+  (return-type "gboolean")
   (parameters
     '("const-gchar*" "group_name")
     '("const-gchar*" "key")
@@ -4275,7 +4460,7 @@
 (define-method remove_group
   (of-object "GKeyFile")
   (c-name "g_key_file_remove_group")
-  (return-type "none")
+  (return-type "gboolean")
   (parameters
     '("const-gchar*" "group_name")
     '("GError**" "error")
@@ -4290,6 +4475,14 @@
 
 ;; From glibintl.h
 
+(define-function glib_gettext
+  (c-name "glib_gettext")
+  (return-type "const-gchar*")
+  (parameters
+    '("const-gchar*" "str")
+  )
+)
+
 
 
 ;; From glib-object.h
@@ -5020,6 +5213,18 @@
   )
 )
 
+(define-function g_timeout_add_seconds_full
+  (c-name "g_timeout_add_seconds_full")
+  (return-type "guint")
+  (parameters
+    '("gint" "priority")
+    '("guint" "interval")
+    '("GSourceFunc" "function")
+    '("gpointer" "data")
+    '("GDestroyNotify" "notify")
+  )
+)
+
 (define-function g_timeout_add_seconds
   (c-name "g_timeout_add_seconds")
   (return-type "guint")
@@ -5151,6 +5356,22 @@
   )
 )
 
+(define-method push
+  (of-object "GMarkupParseContext")
+  (c-name "g_markup_parse_context_push")
+  (return-type "none")
+  (parameters
+    '("GMarkupParser*" "parser")
+    '("gpointer" "user_data")
+  )
+)
+
+(define-method pop
+  (of-object "GMarkupParseContext")
+  (c-name "g_markup_parse_context_pop")
+  (return-type "gpointer")
+)
+
 (define-method end_parse
   (of-object "GMarkupParseContext")
   (c-name "g_markup_parse_context_end_parse")
@@ -5166,6 +5387,12 @@
   (return-type "const-gchar*")
 )
 
+(define-method get_element_stack
+  (of-object "GMarkupParseContext")
+  (c-name "g_markup_parse_context_get_element_stack")
+  (return-type "const-GSList*")
+)
+
 (define-method get_position
   (of-object "GMarkupParseContext")
   (c-name "g_markup_parse_context_get_position")
@@ -5203,6 +5430,20 @@
   )
 )
 
+(define-function g_markup_collect_attributes
+  (c-name "g_markup_collect_attributes")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "element_name")
+    '("const-gchar**" "attribute_names")
+    '("const-gchar**" "attribute_values")
+    '("GError**" "error")
+    '("GMarkupCollectType" "first_type")
+    '("const-gchar*" "first_attr")
+  )
+  (varargs #t)
+)
+
 
 
 ;; From gmem.h
@@ -5211,7 +5452,7 @@
   (c-name "g_malloc")
   (return-type "gpointer")
   (parameters
-    '("gulong" "n_bytes")
+    '("gsize" "n_bytes")
   )
 )
 
@@ -5219,7 +5460,7 @@
   (c-name "g_malloc0")
   (return-type "gpointer")
   (parameters
-    '("gulong" "n_bytes")
+    '("gsize" "n_bytes")
   )
 )
 
@@ -5228,7 +5469,7 @@
   (return-type "gpointer")
   (parameters
     '("gpointer" "mem")
-    '("gulong" "n_bytes")
+    '("gsize" "n_bytes")
   )
 )
 
@@ -5244,7 +5485,7 @@
   (c-name "g_try_malloc")
   (return-type "gpointer")
   (parameters
-    '("gulong" "n_bytes")
+    '("gsize" "n_bytes")
   )
 )
 
@@ -5252,7 +5493,7 @@
   (c-name "g_try_malloc0")
   (return-type "gpointer")
   (parameters
-    '("gulong" "n_bytes")
+    '("gsize" "n_bytes")
   )
 )
 
@@ -5261,7 +5502,7 @@
   (return-type "gpointer")
   (parameters
     '("gpointer" "mem")
-    '("gulong" "n_bytes")
+    '("gsize" "n_bytes")
   )
 )
 
@@ -5290,7 +5531,7 @@
   (parameters
     '("const-gchar*" "name")
     '("gint" "atom_size")
-    '("gulong" "area_size")
+    '("gsize" "area_size")
     '("gint" "type")
   )
 )
@@ -5468,6 +5709,18 @@
   )
 )
 
+(define-function g_warn_message
+  (c-name "g_warn_message")
+  (return-type "none")
+  (parameters
+    '("const-char*" "domain")
+    '("const-char*" "file")
+    '("int" "line")
+    '("const-char*" "func")
+    '("const-char*" "warnexpr")
+  )
+)
+
 (define-function g_assert_warning
   (c-name "g_assert_warning")
   (return-type "none")
@@ -7582,6 +7835,15 @@
   )
 )
 
+(define-function g_slice_copy
+  (c-name "g_slice_copy")
+  (return-type "gpointer")
+  (parameters
+    '("gsize" "block_size")
+    '("gconstpointer" "mem_block")
+  )
+)
+
 (define-function g_slice_free1
   (c-name "g_slice_free1")
   (return-type "none")
@@ -8123,6 +8385,15 @@
   )
 )
 
+(define-function g_utime
+  (c-name "g_utime")
+  (return-type "int")
+  (parameters
+    '("const-gchar*" "filename")
+    '("struct-utimbuf*" "utb")
+  )
+)
+
 
 
 ;; From gstrfuncs.h
@@ -8576,6 +8847,36 @@
   )
 )
 
+(define-function g_dgettext
+  (c-name "g_dgettext")
+  (return-type "const-gchar*")
+  (parameters
+    '("const-gchar*" "domain")
+    '("const-gchar*" "msgid")
+  )
+)
+
+(define-function g_dngettext
+  (c-name "g_dngettext")
+  (return-type "const-gchar*")
+  (parameters
+    '("const-gchar*" "domain")
+    '("const-gchar*" "msgid")
+    '("const-gchar*" "msgid_plural")
+    '("gulong" "n")
+  )
+)
+
+(define-function g_dpgettext
+  (c-name "g_dpgettext")
+  (return-type "const-gchar*")
+  (parameters
+    '("const-gchar*" "domain")
+    '("const-gchar*" "msgctxtid")
+    '("gsize" "msgidoffset")
+  )
+)
+
 
 
 ;; From gstring.h
@@ -8813,6 +9114,27 @@
   )
 )
 
+(define-method overwrite
+  (of-object "GString")
+  (c-name "g_string_overwrite")
+  (return-type "GString*")
+  (parameters
+    '("gsize" "pos")
+    '("const-gchar*" "val")
+  )
+)
+
+(define-method overwrite_len
+  (of-object "GString")
+  (c-name "g_string_overwrite_len")
+  (return-type "GString*")
+  (parameters
+    '("gsize" "pos")
+    '("const-gchar*" "val")
+    '("gssize" "len")
+  )
+)
+
 (define-method erase
   (of-object "GString")
   (c-name "g_string_erase")
@@ -8835,6 +9157,16 @@
   (return-type "GString*")
 )
 
+(define-method vprintf
+  (of-object "GString")
+  (c-name "g_string_vprintf")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "format")
+    '("va_list" "args")
+  )
+)
+
 (define-method printf
   (of-object "GString")
   (c-name "g_string_printf")
@@ -8845,6 +9177,16 @@
   (varargs #t)
 )
 
+(define-method append_vprintf
+  (of-object "GString")
+  (c-name "g_string_append_vprintf")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "format")
+    '("va_list" "args")
+  )
+)
+
 (define-method append_printf
   (of-object "GString")
   (c-name "g_string_append_printf")
@@ -8855,6 +9197,17 @@
   (varargs #t)
 )
 
+(define-method append_uri_escaped
+  (of-object "GString")
+  (c-name "g_string_append_uri_escaped")
+  (return-type "GString*")
+  (parameters
+    '("const-char*" "unescaped")
+    '("const-char*" "reserved_chars_allowed")
+    '("gboolean" "allow_utf8")
+  )
+)
+
 (define-method up
   (of-object "GString")
   (c-name "g_string_up")
@@ -8863,6 +9216,306 @@
 
 
 
+;; From gtestutils.h
+
+(define-function g_strcmp0
+  (c-name "g_strcmp0")
+  (return-type "int")
+  (parameters
+    '("const-char*" "str1")
+    '("const-char*" "str2")
+  )
+)
+
+(define-function g_test_minimized_result
+  (c-name "g_test_minimized_result")
+  (return-type "none")
+  (parameters
+    '("double" "minimized_quantity")
+    '("const-char*" "format")
+  )
+  (varargs #t)
+)
+
+(define-function g_test_maximized_result
+  (c-name "g_test_maximized_result")
+  (return-type "none")
+  (parameters
+    '("double" "maximized_quantity")
+    '("const-char*" "format")
+  )
+  (varargs #t)
+)
+
+(define-function g_test_init
+  (c-name "g_test_init")
+  (return-type "none")
+  (parameters
+    '("int*" "argc")
+    '("char***" "argv")
+  )
+  (varargs #t)
+)
+
+(define-function g_test_run
+  (c-name "g_test_run")
+  (return-type "int")
+)
+
+
+(define-function g_test_message
+  (c-name "g_test_message")
+  (return-type "none")
+  (parameters
+    '("const-char*" "format")
+  )
+  (varargs #t)
+)
+
+(define-function g_test_bug_base
+  (c-name "g_test_bug_base")
+  (return-type "none")
+  (parameters
+    '("const-char*" "uri_pattern")
+  )
+)
+
+(define-function g_test_bug
+  (c-name "g_test_bug")
+  (return-type "none")
+  (parameters
+    '("const-char*" "bug_uri_snippet")
+  )
+)
+
+(define-function g_test_timer_start
+  (c-name "g_test_timer_start")
+  (return-type "none")
+)
+
+(define-function g_test_timer_elapsed
+  (c-name "g_test_timer_elapsed")
+  (return-type "double")
+)
+
+(define-function g_test_timer_last
+  (c-name "g_test_timer_last")
+  (return-type "double")
+)
+
+(define-function g_test_queue_free
+  (c-name "g_test_queue_free")
+  (return-type "none")
+  (parameters
+    '("gpointer" "gfree_pointer")
+  )
+)
+
+(define-function g_test_queue_destroy
+  (c-name "g_test_queue_destroy")
+  (return-type "none")
+  (parameters
+    '("GDestroyNotify" "destroy_func")
+    '("gpointer" "destroy_data")
+  )
+)
+
+(define-function g_test_trap_fork
+  (c-name "g_test_trap_fork")
+  (return-type "gboolean")
+  (parameters
+    '("guint64" "usec_timeout")
+    '("GTestTrapFlags" "test_trap_flags")
+  )
+)
+
+(define-function g_test_trap_has_passed
+  (c-name "g_test_trap_has_passed")
+  (return-type "gboolean")
+)
+
+(define-function g_test_trap_reached_timeout
+  (c-name "g_test_trap_reached_timeout")
+  (return-type "gboolean")
+)
+
+(define-function g_test_rand_int
+  (c-name "g_test_rand_int")
+  (return-type "gint32")
+)
+
+(define-function g_test_rand_int_range
+  (c-name "g_test_rand_int_range")
+  (return-type "gint32")
+  (parameters
+    '("gint32" "begin")
+    '("gint32" "end")
+  )
+)
+
+(define-function g_test_rand_double
+  (c-name "g_test_rand_double")
+  (return-type "double")
+)
+
+(define-function g_test_rand_double_range
+  (c-name "g_test_rand_double_range")
+  (return-type "double")
+  (parameters
+    '("double" "range_start")
+    '("double" "range_end")
+  )
+)
+
+(define-function g_test_create_suite
+  (c-name "g_test_create_suite")
+  (return-type "GTestSuite*")
+  (parameters
+    '("const-char*" "suite_name")
+  )
+)
+
+(define-function g_test_get_root
+  (c-name "g_test_get_root")
+  (return-type "GTestSuite*")
+)
+
+(define-method add
+  (of-object "GTestSuite")
+  (c-name "g_test_suite_add")
+  (return-type "none")
+  (parameters
+    '("GTestCase*" "test_case")
+  )
+)
+
+(define-method add_suite
+  (of-object "GTestSuite")
+  (c-name "g_test_suite_add_suite")
+  (return-type "none")
+  (parameters
+    '("GTestSuite*" "nestedsuite")
+  )
+)
+
+(define-function g_test_run_suite
+  (c-name "g_test_run_suite")
+  (return-type "int")
+  (parameters
+    '("GTestSuite*" "suite")
+  )
+)
+
+(define-function g_test_trap_assertions
+  (c-name "g_test_trap_assertions")
+  (return-type "none")
+  (parameters
+    '("const-char*" "domain")
+    '("const-char*" "file")
+    '("int" "line")
+    '("const-char*" "func")
+    '("guint64" "assertion_flags")
+    '("const-char*" "pattern")
+  )
+)
+
+(define-function g_assertion_message
+  (c-name "g_assertion_message")
+  (return-type "none")
+  (parameters
+    '("const-char*" "domain")
+    '("const-char*" "file")
+    '("int" "line")
+    '("const-char*" "func")
+    '("const-char*" "message")
+  )
+)
+
+(define-function g_assertion_message_expr
+  (c-name "g_assertion_message_expr")
+  (return-type "none")
+  (parameters
+    '("const-char*" "domain")
+    '("const-char*" "file")
+    '("int" "line")
+    '("const-char*" "func")
+    '("const-char*" "expr")
+  )
+)
+
+(define-function g_assertion_message_cmpstr
+  (c-name "g_assertion_message_cmpstr")
+  (return-type "none")
+  (parameters
+    '("const-char*" "domain")
+    '("const-char*" "file")
+    '("int" "line")
+    '("const-char*" "func")
+    '("const-char*" "expr")
+    '("const-char*" "arg1")
+    '("const-char*" "cmp")
+    '("const-char*" "arg2")
+  )
+)
+
+(define-function g_assertion_message_cmpnum
+  (c-name "g_assertion_message_cmpnum")
+  (return-type "none")
+  (parameters
+    '("const-char*" "domain")
+    '("const-char*" "file")
+    '("int" "line")
+    '("const-char*" "func")
+    '("const-char*" "expr")
+    '("long-double" "arg1")
+    '("const-char*" "cmp")
+    '("long-double" "arg2")
+    '("char" "numtype")
+  )
+)
+
+(define-method name
+  (of-object "GTestLogType")
+  (c-name "g_test_log_type_name")
+  (return-type "const-char*")
+)
+
+(define-function g_test_log_buffer_new
+  (c-name "g_test_log_buffer_new")
+  (is-constructor-of "GTestLogBuffer")
+  (return-type "GTestLogBuffer*")
+)
+
+(define-method free
+  (of-object "GTestLogBuffer")
+  (c-name "g_test_log_buffer_free")
+  (return-type "none")
+)
+
+(define-method push
+  (of-object "GTestLogBuffer")
+  (c-name "g_test_log_buffer_push")
+  (return-type "none")
+  (parameters
+    '("guint" "n_bytes")
+    '("const-guint8*" "bytes")
+  )
+)
+
+(define-method pop
+  (of-object "GTestLogBuffer")
+  (c-name "g_test_log_buffer_pop")
+  (return-type "GTestLogMsg*")
+)
+
+(define-method free
+  (of-object "GTestLogMsg")
+  (c-name "g_test_log_msg_free")
+  (return-type "none")
+)
+
+
+
 ;; From gthread.h
 
 (define-function guint64
@@ -9091,6 +9744,23 @@
   )
 )
 
+(define-function g_once_init_enter_impl
+  (c-name "g_once_init_enter_impl")
+  (return-type "gboolean")
+  (parameters
+    '("volatile-gsize*" "value_location")
+  )
+)
+
+(define-function g_once_init_leave
+  (c-name "g_once_init_leave")
+  (return-type "none")
+  (parameters
+    '("volatile-gsize*" "value_location")
+    '("gsize" "initialization_value")
+  )
+)
+
 
 
 ;; From gthreadpool.h
@@ -9600,6 +10270,12 @@
   (return-type "GUnicodeBreakType")
 )
 
+(define-method combining_class
+  (of-object "gunichar")
+  (c-name "g_unichar_combining_class")
+  (return-type "gint")
+)
+
 (define-function g_unicode_canonical_ordering
   (c-name "g_unicode_canonical_ordering")
   (return-type "none")
@@ -9927,6 +10603,47 @@
 
 
 
+;; From gurifuncs.h
+
+(define-function g_uri_unescape_string
+  (c-name "g_uri_unescape_string")
+  (return-type "char*")
+  (parameters
+    '("const-char*" "escaped_string")
+    '("const-char*" "illegal_characters")
+  )
+)
+
+(define-function g_uri_unescape_segment
+  (c-name "g_uri_unescape_segment")
+  (return-type "char*")
+  (parameters
+    '("const-char*" "escaped_string")
+    '("const-char*" "escaped_string_end")
+    '("const-char*" "illegal_characters")
+  )
+)
+
+(define-function g_uri_parse_scheme
+  (c-name "g_uri_parse_scheme")
+  (return-type "char*")
+  (parameters
+    '("const-char*" "uri")
+  )
+)
+
+(define-function g_uri_escape_string
+  (c-name "g_uri_escape_string")
+  (return-type "char*")
+  (parameters
+    '("const-char*" "unescaped")
+    '("const-char*" "reserved_chars_allowed")
+    '("gboolean" "allow_utf8")
+  )
+)
+
+
+
 ;; From gutils.h
 
 (define-function g_get_user_name
@@ -10190,6 +10907,14 @@
   )
 )
 
+(define-function g_win32_get_package_installation_directory_of_module
+  (c-name "g_win32_get_package_installation_directory_of_module")
+  (return-type "gchar*")
+  (parameters
+    '("gpointer" "hmodule")
+  )
+)
+
 (define-function g_win32_get_windows_version
   (c-name "g_win32_get_windows_version")
   (return-type "guint")