Updated with h2defs.py.

2005-03-31  Murray Cumming <murrayc@murrayc.com>

        * glib/src/glib_functions.defs: Updated with
        h2defs.py.

2 files changed, 778 insertions, 130 deletions

diff --git a/ChangeLog b/ChangeLog
index 9602c8ff..824a9a10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-31  Murray Cumming <murrayc@murrayc.com>
+
+	* glib/src/glib_functions.defs: Updated with 
+	h2defs.py.
+
 2005-03-13  Yair Hershkovitz <yairhr@gmail.com>
 
 	* glib/glibmm/main.h,
diff --git a/glib/src/glib_functions.defs b/glib/src/glib_functions.defs
index b02af1ef..8a1f02c0 100644
--- a/glib/src/glib_functions.defs
+++ b/glib/src/glib_functions.defs
@@ -2,8 +2,18 @@
 ; object definitions ...
 ;; Enumerations and flags ...
 
-(define-enum ConvertError
-  (in-module "G")
+(define-flags ArrayFlags
+  (in-module "GBSearch")
+  (c-name "GBSearchArrayFlags")
+  (gtype-id "G_TYPE_B_SEARCH_ARRAY_FLAGS")
+  (values
+    '("lign-power2" "G_BSEARCH_ARRAY_ALIGN_POWER2")
+    '("uto-shrink" "G_BSEARCH_ARRAY_AUTO_SHRINK")
+  )
+)
+
+(define-enum Error
+  (in-module "GConvert")
   (c-name "GConvertError")
   (gtype-id "G_TYPE_CONVERT_ERROR")
   (values
@@ -16,8 +26,8 @@
   )
 )
 
-(define-enum DateDMY
-  (in-module "G")
+(define-enum DMY
+  (in-module "GDate")
   (c-name "GDateDMY")
   (gtype-id "G_TYPE_DATE_DMY")
   (values
@@ -27,8 +37,8 @@
   )
 )
 
-(define-enum DateWeekday
-  (in-module "G")
+(define-enum Weekday
+  (in-module "GDate")
   (c-name "GDateWeekday")
   (gtype-id "G_TYPE_DATE_WEEKDAY")
   (values
@@ -43,8 +53,8 @@
   )
 )
 
-(define-enum DateMonth
-  (in-module "G")
+(define-enum Month
+  (in-module "GDate")
   (c-name "GDateMonth")
   (gtype-id "G_TYPE_DATE_MONTH")
   (values
@@ -64,8 +74,17 @@
   )
 )
 
-(define-enum FileError
-  (in-module "G")
+(define-flags Flag
+  (in-module "GDebug")
+  (c-name "GDebugFlag")
+  (gtype-id "G_TYPE_DEBUG_FLAG")
+  (values
+    '("s" "G_DEBUG_FATAL_WARNINGS")
+  )
+)
+
+(define-enum Error
+  (in-module "GFile")
   (c-name "GFileError")
   (gtype-id "G_TYPE_FILE_ERROR")
   (values
@@ -97,8 +116,8 @@
   )
 )
 
-(define-flags FileTest
-  (in-module "G")
+(define-flags Test
+  (in-module "GFile")
   (c-name "GFileTest")
   (gtype-id "G_TYPE_FILE_TEST")
   (values
@@ -110,8 +129,8 @@
   )
 )
 
-(define-flags HookFlagMask
-  (in-module "G")
+(define-flags FlagMask
+  (in-module "GHook")
   (c-name "GHookFlagMask")
   (gtype-id "G_TYPE_HOOK_FLAG_MASK")
   (values
@@ -121,8 +140,8 @@
   )
 )
 
-(define-enum IOError
-  (in-module "G")
+(define-enum r
+  (in-module "GIOErro")
   (c-name "GIOError")
   (gtype-id "G_TYPE_IO_ERROR")
   (values
@@ -133,8 +152,8 @@
   )
 )
 
-(define-enum IOChannelError
-  (in-module "G")
+(define-enum Error
+  (in-module "GIOChannel")
   (c-name "GIOChannelError")
   (gtype-id "G_TYPE_IO_CHANNEL_ERROR")
   (values
@@ -150,8 +169,8 @@
   )
 )
 
-(define-enum IOStatus
-  (in-module "G")
+(define-enum s
+  (in-module "GIOStatu")
   (c-name "GIOStatus")
   (gtype-id "G_TYPE_IO_STATUS")
   (values
@@ -162,8 +181,8 @@
   )
 )
 
-(define-enum SeekType
-  (in-module "G")
+(define-enum Type
+  (in-module "GSeek")
   (c-name "GSeekType")
   (gtype-id "G_TYPE_SEEK_TYPE")
   (values
@@ -173,8 +192,8 @@
   )
 )
 
-(define-enum IOCondition
-  (in-module "G")
+(define-enum n
+  (in-module "GIOConditio")
   (c-name "GIOCondition")
   (gtype-id "G_TYPE_IO_CONDITION")
   (values
@@ -187,8 +206,8 @@
   )
 )
 
-(define-flags IOFlags
-  (in-module "G")
+(define-flags s
+  (in-module "GIOFlag")
   (c-name "GIOFlags")
   (gtype-id "G_TYPE_IO_FLAGS")
   (values
@@ -203,8 +222,33 @@
   )
 )
 
-(define-enum MarkupError
-  (in-module "G")
+(define-enum FileError
+  (in-module "GKey")
+  (c-name "GKeyFileError")
+  (gtype-id "G_TYPE_KEY_FILE_ERROR")
+  (values
+    '("unknown-encoding" "G_KEY_FILE_ERROR_UNKNOWN_ENCODING")
+    '("parse" "G_KEY_FILE_ERROR_PARSE")
+    '("not-found" "G_KEY_FILE_ERROR_NOT_FOUND")
+    '("key-not-found" "G_KEY_FILE_ERROR_KEY_NOT_FOUND")
+    '("group-not-found" "G_KEY_FILE_ERROR_GROUP_NOT_FOUND")
+    '("invalid-value" "G_KEY_FILE_ERROR_INVALID_VALUE")
+  )
+)
+
+(define-flags FileFlags
+  (in-module "GKey")
+  (c-name "GKeyFileFlags")
+  (gtype-id "G_TYPE_KEY_FILE_FLAGS")
+  (values
+    '("none" "G_KEY_FILE_NONE")
+    '("keep-comments" "G_KEY_FILE_KEEP_COMMENTS")
+    '("keep-translations" "G_KEY_FILE_KEEP_TRANSLATIONS")
+  )
+)
+
+(define-enum Error
+  (in-module "GMarkup")
   (c-name "GMarkupError")
   (gtype-id "G_TYPE_MARKUP_ERROR")
   (values
@@ -217,8 +261,8 @@
   )
 )
 
-(define-flags MarkupParseFlags
-  (in-module "G")
+(define-flags ParseFlags
+  (in-module "GMarkup")
   (c-name "GMarkupParseFlags")
   (gtype-id "G_TYPE_MARKUP_PARSE_FLAGS")
   (values
@@ -226,8 +270,8 @@
   )
 )
 
-(define-flags LogLevelFlags
-  (in-module "G")
+(define-flags LevelFlags
+  (in-module "GLog")
   (c-name "GLogLevelFlags")
   (gtype-id "G_TYPE_LOG_LEVEL_FLAGS")
   (values
@@ -243,20 +287,22 @@
   )
 )
 
-(define-flags TraverseFlags
-  (in-module "G")
+(define-flags Flags
+  (in-module "GTraverse")
   (c-name "GTraverseFlags")
   (gtype-id "G_TYPE_TRAVERSE_FLAGS")
   (values
-    '("leafs" "G_TRAVERSE_LEAFS")
-    '("non-leafs" "G_TRAVERSE_NON_LEAFS")
+    '("leaves" "G_TRAVERSE_LEAVES")
+    '("non-leaves" "G_TRAVERSE_NON_LEAVES")
     '("all" "G_TRAVERSE_ALL")
     '("mask" "G_TRAVERSE_MASK")
+    '("leafs" "G_TRAVERSE_LEAFS")
+    '("non-leafs" "G_TRAVERSE_NON_LEAFS")
   )
 )
 
-(define-enum TraverseType
-  (in-module "G")
+(define-enum Type
+  (in-module "GTraverse")
   (c-name "GTraverseType")
   (gtype-id "G_TYPE_TRAVERSE_TYPE")
   (values
@@ -267,18 +313,19 @@
   )
 )
 
-(define-flags OptionFlags
-  (in-module "G")
+(define-flags Flags
+  (in-module "GOption")
   (c-name "GOptionFlags")
   (gtype-id "G_TYPE_OPTION_FLAGS")
   (values
     '("hidden" "G_OPTION_FLAG_HIDDEN")
     '("in-main" "G_OPTION_FLAG_IN_MAIN")
+    '("reverse" "G_OPTION_FLAG_REVERSE")
   )
 )
 
-(define-enum OptionArg
-  (in-module "G")
+(define-enum Arg
+  (in-module "GOption")
   (c-name "GOptionArg")
   (gtype-id "G_TYPE_OPTION_ARG")
   (values
@@ -292,8 +339,8 @@
   )
 )
 
-(define-enum OptionError
-  (in-module "G")
+(define-enum Error
+  (in-module "GOption")
   (c-name "GOptionError")
   (gtype-id "G_TYPE_OPTION_ERROR")
   (values
@@ -303,8 +350,8 @@
   )
 )
 
-(define-enum ErrorType
-  (in-module "G")
+(define-enum Type
+  (in-module "GError")
   (c-name "GErrorType")
   (gtype-id "G_TYPE_ERROR_TYPE")
   (values
@@ -319,8 +366,8 @@
   )
 )
 
-(define-enum ShellError
-  (in-module "G")
+(define-enum Error
+  (in-module "GShell")
   (c-name "GShellError")
   (gtype-id "G_TYPE_SHELL_ERROR")
   (values
@@ -330,8 +377,8 @@
   )
 )
 
-(define-enum SpawnError
-  (in-module "G")
+(define-enum Error
+  (in-module "GSpawn")
   (c-name "GSpawnError")
   (gtype-id "G_TYPE_SPAWN_ERROR")
   (values
@@ -358,8 +405,8 @@
   )
 )
 
-(define-flags SpawnFlags
-  (in-module "G")
+(define-flags Flags
+  (in-module "GSpawn")
   (c-name "GSpawnFlags")
   (gtype-id "G_TYPE_SPAWN_FLAGS")
   (values
@@ -373,8 +420,8 @@
   )
 )
 
-(define-flags AsciiType
-  (in-module "G")
+(define-flags Type
+  (in-module "GAscii")
   (c-name "GAsciiType")
   (gtype-id "G_TYPE_ASCII_TYPE")
   (values
@@ -392,8 +439,8 @@
   )
 )
 
-(define-enum ThreadError
-  (in-module "G")
+(define-enum Error
+  (in-module "GThread")
   (c-name "GThreadError")
   (gtype-id "G_TYPE_THREAD_ERROR")
   (values
@@ -401,8 +448,8 @@
   )
 )
 
-(define-enum ThreadPriority
-  (in-module "G")
+(define-enum Priority
+  (in-module "GThread")
   (c-name "GThreadPriority")
   (gtype-id "G_TYPE_THREAD_PRIORITY")
   (values
@@ -413,8 +460,8 @@
   )
 )
 
-(define-enum OnceStatus
-  (in-module "G")
+(define-enum Status
+  (in-module "GOnce")
   (c-name "GOnceStatus")
   (gtype-id "G_TYPE_ONCE_STATUS")
   (values
@@ -424,8 +471,8 @@
   )
 )
 
-(define-enum UnicodeType
-  (in-module "G")
+(define-enum Type
+  (in-module "GUnicode")
   (c-name "GUnicodeType")
   (gtype-id "G_TYPE_UNICODE_TYPE")
   (values
@@ -462,8 +509,8 @@
   )
 )
 
-(define-enum UnicodeBreakType
-  (in-module "G")
+(define-enum BreakType
+  (in-module "GUnicode")
   (c-name "GUnicodeBreakType")
   (gtype-id "G_TYPE_UNICODE_BREAK_TYPE")
   (values
@@ -501,8 +548,8 @@
   )
 )
 
-(define-enum NormalizeMode
-  (in-module "G")
+(define-enum Mode
+  (in-module "GNormalize")
   (c-name "GNormalizeMode")
   (gtype-id "G_TYPE_NORMALIZE_MODE")
   (values
@@ -518,7 +565,11 @@
 )
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/galloca.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/galias.h
+
+
+
+;; From /home/murrayc/cvs/gnome210/glib/glib/galloca.h
 
 (define-function alloca
   (c-name "alloca")
@@ -529,7 +580,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/garray.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/garray.h
 
 (define-function g_array_new
   (c-name "g_array_new")
@@ -869,7 +920,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gasyncqueue.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gasyncqueue.h
 
 (define-function g_async_queue_new
   (c-name "g_async_queue_new")
@@ -892,7 +943,7 @@
 (define-method ref
   (of-object "GAsyncQueue")
   (c-name "g_async_queue_ref")
-  (return-type "none")
+  (return-type "GAsyncQueue*")
 )
 
 (define-method unref
@@ -987,7 +1038,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gatomic.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gatomic.h
 
 (define-function g_atomic_int_exchange_and_add
   (c-name "g_atomic_int_exchange_and_add")
@@ -1045,7 +1096,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gbacktrace.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gbacktrace.h
 
 (define-function g_on_error_query
   (c-name "g_on_error_query")
@@ -1065,7 +1116,27 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gcache.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gbsearcharray.h
+
+(define-function if
+  (c-name "if")
+  (return-type "else")
+  (parameters
+    '("cmp-<" "0")
+  )
+)
+
+(define-function MIN
+  (c-name "MIN")
+  (return-type "return")
+  (parameters
+    '("barray->n_nodes-+" "1")
+  )
+)
+
+
+
+;; From /home/murrayc/cvs/gnome210/glib/glib/gcache.h
 
 (define-function g_cache_new
   (c-name "g_cache_new")
@@ -1128,7 +1199,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gcompletion.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gcompletion.h
 
 (define-function g_completion_new
   (c-name "g_completion_new")
@@ -1200,7 +1271,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gconvert.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gconvert.h
 
 (define-function g_convert_error_quark
   (c-name "g_convert_error_quark")
@@ -1344,9 +1415,41 @@
   )
 )
 
+(define-function g_filename_display_name
+  (c-name "g_filename_display_name")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "filename")
+  )
+)
+
+(define-function g_get_filename_charsets
+  (c-name "g_get_filename_charsets")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar***" "charsets")
+  )
+)
+
+(define-function g_filename_display_basename
+  (c-name "g_filename_display_basename")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "filename")
+  )
+)
+
+(define-function g_uri_list_extract_uris
+  (c-name "g_uri_list_extract_uris")
+  (return-type "gchar**")
+  (parameters
+    '("const-gchar*" "uri_list")
+  )
+)
+
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gdataset.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gdataset.h
 
 (define-function g_datalist_init
   (c-name "g_datalist_init")
@@ -1452,7 +1555,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gdate.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gdate.h
 
 (define-function g_date_new
   (c-name "g_date_new")
@@ -1826,7 +1929,11 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gdir.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gdebug.h
+
+
+
+;; From /home/murrayc/cvs/gnome210/glib/glib/gdir.h
 
 (define-function g_dir_open
   (c-name "g_dir_open")
@@ -1858,7 +1965,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gerror.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gerror.h
 
 (define-function g_error_new
   (c-name "g_error_new")
@@ -1935,7 +2042,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gfileutils.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gfileutils.h
 
 (define-function g_file_error_quark
   (c-name "g_file_error_quark")
@@ -2018,7 +2125,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/ghash.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/ghash.h
 
 (define-function g_hash_table_new
   (c-name "g_hash_table_new")
@@ -2204,7 +2311,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/ghook.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/ghook.h
 
 (define-method init
   (of-object "GHookList")
@@ -2240,7 +2347,7 @@
 
 (define-function g_hook_ref
   (c-name "g_hook_ref")
-  (return-type "none")
+  (return-type "GHook*")
   (parameters
     '("GHookList*" "hook_list")
     '("GHook*" "hook")
@@ -2424,15 +2531,15 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gi18n.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gi18n.h
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gi18n-lib.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gi18n-lib.h
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/giochannel.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/giochannel.h
 
 (define-method init
   (of-object "GIOChannel")
@@ -2443,7 +2550,7 @@
 (define-method ref
   (of-object "GIOChannel")
   (c-name "g_io_channel_ref")
-  (return-type "none")
+  (return-type "GIOChannel*")
 )
 
 (define-method unref
@@ -2823,7 +2930,405 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/glist.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gkeyfile.h
+
+(define-function g_key_file_error_quark
+  (c-name "g_key_file_error_quark")
+  (return-type "GQuark")
+)
+
+(define-function g_key_file_new
+  (c-name "g_key_file_new")
+  (is-constructor-of "GKeyFile")
+  (return-type "GKeyFile*")
+)
+
+(define-method free
+  (of-object "GKeyFile")
+  (c-name "g_key_file_free")
+  (return-type "none")
+)
+
+(define-method set_list_separator
+  (of-object "GKeyFile")
+  (c-name "g_key_file_set_list_separator")
+  (return-type "none")
+  (parameters
+    '("gchar" "separator")
+  )
+)
+
+(define-method load_from_file
+  (of-object "GKeyFile")
+  (c-name "g_key_file_load_from_file")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "file")
+    '("GKeyFileFlags" "flags")
+    '("GError**" "error")
+  )
+)
+
+(define-method load_from_data
+  (of-object "GKeyFile")
+  (c-name "g_key_file_load_from_data")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "data")
+    '("gsize" "length")
+    '("GKeyFileFlags" "flags")
+    '("GError**" "error")
+  )
+)
+
+(define-method load_from_data_dirs
+  (of-object "GKeyFile")
+  (c-name "g_key_file_load_from_data_dirs")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "file")
+    '("gchar**" "full_path")
+    '("GKeyFileFlags" "flags")
+    '("GError**" "error")
+  )
+)
+
+(define-method to_data
+  (of-object "GKeyFile")
+  (c-name "g_key_file_to_data")
+  (return-type "gchar*")
+  (parameters
+    '("gsize*" "length")
+    '("GError**" "error")
+  )
+)
+
+(define-method get_start_group
+  (of-object "GKeyFile")
+  (c-name "g_key_file_get_start_group")
+  (return-type "gchar*")
+)
+
+(define-method get_groups
+  (of-object "GKeyFile")
+  (c-name "g_key_file_get_groups")
+  (return-type "gchar**")
+  (parameters
+    '("gsize*" "length")
+  )
+)
+
+(define-method get_keys
+  (of-object "GKeyFile")
+  (c-name "g_key_file_get_keys")
+  (return-type "gchar**")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("gsize*" "length")
+    '("GError**" "error")
+  )
+)
+
+(define-method has_group
+  (of-object "GKeyFile")
+  (c-name "g_key_file_has_group")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "group_name")
+  )
+)
+
+(define-method has_key
+  (of-object "GKeyFile")
+  (c-name "g_key_file_has_key")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("GError**" "error")
+  )
+)
+
+(define-method get_value
+  (of-object "GKeyFile")
+  (c-name "g_key_file_get_value")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("GError**" "error")
+  )
+)
+
+(define-method set_value
+  (of-object "GKeyFile")
+  (c-name "g_key_file_set_value")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("const-gchar*" "value")
+  )
+)
+
+(define-method get_string
+  (of-object "GKeyFile")
+  (c-name "g_key_file_get_string")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("GError**" "error")
+  )
+)
+
+(define-method set_string
+  (of-object "GKeyFile")
+  (c-name "g_key_file_set_string")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("const-gchar*" "string")
+  )
+)
+
+(define-method get_locale_string
+  (of-object "GKeyFile")
+  (c-name "g_key_file_get_locale_string")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("const-gchar*" "locale")
+    '("GError**" "error")
+  )
+)
+
+(define-method set_locale_string
+  (of-object "GKeyFile")
+  (c-name "g_key_file_set_locale_string")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("const-gchar*" "locale")
+    '("const-gchar*" "string")
+  )
+)
+
+(define-method get_boolean
+  (of-object "GKeyFile")
+  (c-name "g_key_file_get_boolean")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("GError**" "error")
+  )
+)
+
+(define-method set_boolean
+  (of-object "GKeyFile")
+  (c-name "g_key_file_set_boolean")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("gboolean" "value")
+  )
+)
+
+(define-method get_integer
+  (of-object "GKeyFile")
+  (c-name "g_key_file_get_integer")
+  (return-type "gint")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("GError**" "error")
+  )
+)
+
+(define-method set_integer
+  (of-object "GKeyFile")
+  (c-name "g_key_file_set_integer")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("gint" "value")
+  )
+)
+
+(define-method get_string_list
+  (of-object "GKeyFile")
+  (c-name "g_key_file_get_string_list")
+  (return-type "gchar**")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("gsize*" "length")
+    '("GError**" "error")
+  )
+)
+
+(define-method set_string_list
+  (of-object "GKeyFile")
+  (c-name "g_key_file_set_string_list")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("const-gchar*-const[]" "list")
+    '("gsize" "length")
+  )
+)
+
+(define-method get_locale_string_list
+  (of-object "GKeyFile")
+  (c-name "g_key_file_get_locale_string_list")
+  (return-type "gchar**")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("const-gchar*" "locale")
+    '("gsize*" "length")
+    '("GError**" "error")
+  )
+)
+
+(define-method set_locale_string_list
+  (of-object "GKeyFile")
+  (c-name "g_key_file_set_locale_string_list")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("const-gchar*" "locale")
+    '("const-gchar*-const[]" "list")
+    '("gsize" "length")
+  )
+)
+
+(define-method get_boolean_list
+  (of-object "GKeyFile")
+  (c-name "g_key_file_get_boolean_list")
+  (return-type "gboolean*")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("gsize*" "length")
+    '("GError**" "error")
+  )
+)
+
+(define-method set_boolean_list
+  (of-object "GKeyFile")
+  (c-name "g_key_file_set_boolean_list")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("gboolean[]" "list")
+    '("gsize" "length")
+  )
+)
+
+(define-method get_integer_list
+  (of-object "GKeyFile")
+  (c-name "g_key_file_get_integer_list")
+  (return-type "gint*")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("gsize*" "length")
+    '("GError**" "error")
+  )
+)
+
+(define-method set_integer_list
+  (of-object "GKeyFile")
+  (c-name "g_key_file_set_integer_list")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("gint[]" "list")
+    '("gsize" "length")
+  )
+)
+
+(define-method set_comment
+  (of-object "GKeyFile")
+  (c-name "g_key_file_set_comment")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("const-gchar*" "comment")
+    '("GError**" "error")
+  )
+)
+
+(define-method get_comment
+  (of-object "GKeyFile")
+  (c-name "g_key_file_get_comment")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("GError**" "error")
+  )
+)
+
+(define-method remove_comment
+  (of-object "GKeyFile")
+  (c-name "g_key_file_remove_comment")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("GError**" "error")
+  )
+)
+
+(define-method remove_key
+  (of-object "GKeyFile")
+  (c-name "g_key_file_remove_key")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("const-gchar*" "key")
+    '("GError**" "error")
+  )
+)
+
+(define-method remove_group
+  (of-object "GKeyFile")
+  (c-name "g_key_file_remove_group")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "group_name")
+    '("GError**" "error")
+  )
+)
+
+
+
+;; From /home/murrayc/cvs/gnome210/glib/glib/glib.h
+
+
+
+;; From /home/murrayc/cvs/gnome210/glib/glib/glibintl.h
+
+
+
+;; From /home/murrayc/cvs/gnome210/glib/glib/glib-object.h
+
+
+
+;; From /home/murrayc/cvs/gnome210/glib/glib/glist.h
 
 (define-function g_list_push_allocator
   (c-name "g_list_push_allocator")
@@ -3073,11 +3578,11 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gmacros.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gmacros.h
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gmain.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gmain.h
 
 (define-function g_main_context_new
   (c-name "g_main_context_new")
@@ -3088,7 +3593,7 @@
 (define-method ref
   (of-object "GMainContext")
   (c-name "g_main_context_ref")
-  (return-type "none")
+  (return-type "GMainContext*")
 )
 
 (define-method unref
@@ -3554,7 +4059,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gmarkup.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gmarkup.h
 
 (define-function g_markup_error_quark
   (c-name "g_markup_error_quark")
@@ -3644,7 +4149,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gmem.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gmem.h
 
 (define-function g_malloc
   (c-name "g_malloc")
@@ -3799,7 +4304,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gmessages.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gmessages.h
 
 (define-function g_printf_string_upper_bound
   (c-name "g_printf_string_upper_bound")
@@ -3889,6 +4394,28 @@
   )
 )
 
+(define-function g_return_if_fail_warning
+  (c-name "g_return_if_fail_warning")
+  (return-type "none")
+  (parameters
+    '("const-char*" "log_domain")
+    '("const-char*" "pretty_function")
+    '("const-char*" "expression")
+  )
+)
+
+(define-function g_assert_warning
+  (c-name "g_assert_warning")
+  (return-type "none")
+  (parameters
+    '("const-char*" "log_domain")
+    '("const-char*" "file")
+    '("const-int" "line")
+    '("const-char*" "pretty_function")
+    '("const-char*" "expression")
+  )
+)
+
 (define-function g_set_print_handler
   (c-name "g_set_print_handler")
   (return-type "GPrintFunc")
@@ -3914,19 +4441,9 @@
   )
 )
 
-(define-function g_return_if_fail_warning
-  (c-name "g_return_if_fail_warning")
-  (return-type "none")
-  (parameters
-    '("const-char*" "log_domain")
-    '("const-char*" "pretty_function")
-    '("const-char*" "expression")
-  )
-)
 
 
-
-;; From /opt/gnome210/include/glib-2.0/glib/gnode.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gnode.h
 
 (define-function g_node_push_allocator
   (c-name "g_node_push_allocator")
@@ -4157,10 +4674,10 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/goption.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/goption.h
 
-(define-function g_option_context_error_quark
-  (c-name "g_option_context_error_quark")
+(define-function g_option_error_quark
+  (c-name "g_option_error_quark")
   (return-type "GQuark")
 )
 
@@ -4323,7 +4840,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gpattern.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gpattern.h
 
 (define-function g_pattern_spec_new
   (c-name "g_pattern_spec_new")
@@ -4380,7 +4897,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gprimes.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gprimes.h
 
 (define-function g_spaced_primes_closest
   (c-name "g_spaced_primes_closest")
@@ -4392,7 +4909,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gprintf.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gprintf.h
 
 (define-function g_printf
   (c-name "g_printf")
@@ -4486,7 +5003,11 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gqsort.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gprintfint.h
+
+
+
+;; From /home/murrayc/cvs/gnome210/glib/glib/gqsort.h
 
 (define-function g_qsort_with_data
   (c-name "g_qsort_with_data")
@@ -4502,7 +5023,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gquark.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gquark.h
 
 (define-function g_quark_try_string
   (c-name "g_quark_try_string")
@@ -4536,7 +5057,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gqueue.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gqueue.h
 
 (define-function g_queue_new
   (c-name "g_queue_new")
@@ -4840,7 +5361,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/grand.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/grand.h
 
 (define-function g_rand_new_with_seed
   (c-name "g_rand_new_with_seed")
@@ -4966,7 +5487,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/grel.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/grel.h
 
 (define-function g_relation_new
   (c-name "g_relation_new")
@@ -5066,7 +5587,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gscanner.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gscanner.h
 
 (define-function g_scanner_new
   (c-name "g_scanner_new")
@@ -5246,7 +5767,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gshell.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gshell.h
 
 (define-function g_shell_error_quark
   (c-name "g_shell_error_quark")
@@ -5283,7 +5804,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gslist.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gslist.h
 
 (define-function g_slist_push_allocator
   (c-name "g_slist_push_allocator")
@@ -5518,7 +6039,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gspawn.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gspawn.h
 
 (define-function g_spawn_error_quark
   (c-name "g_spawn_error_quark")
@@ -5606,7 +6127,100 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gstrfuncs.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gstdio.h
+
+(define-function g_open
+  (c-name "g_open")
+  (return-type "int")
+  (parameters
+    '("const-gchar*" "filename")
+    '("int" "flags")
+    '("int" "mode")
+  )
+)
+
+(define-function g_rename
+  (c-name "g_rename")
+  (return-type "int")
+  (parameters
+    '("const-gchar*" "oldfilename")
+    '("const-gchar*" "newfilename")
+  )
+)
+
+(define-function g_mkdir
+  (c-name "g_mkdir")
+  (return-type "int")
+  (parameters
+    '("const-gchar*" "filename")
+    '("int" "mode")
+  )
+)
+
+(define-function g_stat
+  (c-name "g_stat")
+  (return-type "int")
+  (parameters
+    '("const-gchar*" "filename")
+    '("struct-stat*" "buf")
+  )
+)
+
+(define-function g_lstat
+  (c-name "g_lstat")
+  (return-type "int")
+  (parameters
+    '("const-gchar*" "filename")
+    '("struct-stat*" "buf")
+  )
+)
+
+(define-function g_unlink
+  (c-name "g_unlink")
+  (return-type "int")
+  (parameters
+    '("const-gchar*" "filename")
+  )
+)
+
+(define-function g_remove
+  (c-name "g_remove")
+  (return-type "int")
+  (parameters
+    '("const-gchar*" "filename")
+  )
+)
+
+(define-function g_rmdir
+  (c-name "g_rmdir")
+  (return-type "int")
+  (parameters
+    '("const-gchar*" "filename")
+  )
+)
+
+(define-function g_fopen
+  (c-name "g_fopen")
+  (return-type "FILE*")
+  (parameters
+    '("const-gchar*" "filename")
+    '("const-gchar*" "mode")
+  )
+)
+
+(define-function g_freopen
+  (c-name "g_freopen")
+  (return-type "FILE*")
+  (parameters
+    '("const-gchar*" "filename")
+    '("const-gchar*" "mode")
+    '("FILE*" "stream")
+  )
+)
+
+
+
+;; From /home/murrayc/cvs/gnome210/glib/glib/gstrfuncs.h
 
 (define-function g_ascii_tolower
   (c-name "g_ascii_tolower")
@@ -6049,7 +6663,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gstring.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gstring.h
 
 (define-function g_string_chunk_new
   (c-name "g_string_chunk_new")
@@ -6328,7 +6942,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gthread.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gthread.h
 
 (define-function g_thread_init
   (c-name "g_thread_init")
@@ -6541,7 +7155,16 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gthreadpool.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gthreadinit.h
+
+(define-function g_thread_init_glib
+  (c-name "g_thread_init_glib")
+  (return-type "none")
+)
+
+
+
+;; From /home/murrayc/cvs/gnome210/glib/glib/gthreadpool.h
 
 (define-function g_thread_pool_new
   (c-name "g_thread_pool_new")
@@ -6629,7 +7252,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gtimer.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gtimer.h
 
 (define-function g_timer_new
   (c-name "g_timer_new")
@@ -6695,7 +7318,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gtree.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gtree.h
 
 (define-function g_tree_new
   (c-name "g_tree_new")
@@ -6835,11 +7458,19 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gtypes.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gtypes.h
+
+
+
+;; From /home/murrayc/cvs/gnome210/glib/glib/gunibreak.h
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gunicode.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gunichartables.h
+
+
+
+;; From /home/murrayc/cvs/gnome210/glib/glib/gunicode.h
 
 (define-function g_get_charset
   (c-name "g_get_charset")
@@ -7275,7 +7906,19 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gutils.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gunicodeprivate.h
+
+
+
+;; From /home/murrayc/cvs/gnome210/glib/glib/gunicomp.h
+
+
+
+;; From /home/murrayc/cvs/gnome210/glib/glib/gunidecomp.h
+
+
+
+;; From /home/murrayc/cvs/gnome210/glib/glib/gutils.h
 
 (define-function g_get_user_name
   (c-name "g_get_user_name")
@@ -7477,7 +8120,7 @@
 
 
 
-;; From /opt/gnome210/include/glib-2.0/glib/gwin32.h
+;; From /home/murrayc/cvs/gnome210/glib/glib/gwin32.h
 
 (define-function g_win32_ftruncate
   (c-name "g_win32_ftruncate")