From 1c6ae99228b596d8e89156e40728c3f28ecf3470 Mon Sep 17 00:00:00 2001
From: Johan Dahlin <johan@gnome.org>
Date: Sat, 16 Aug 2008 10:04:06 +0000
Subject: [PATCH] Regenerate

2008-08-16  Johan Dahlin  <johan@gnome.org>

    * gir/glib-2.0.gir:
    * gir/gobject-2.0.gir:
    Regenerate

    * tests/scanner/Makefile.am:
    parser -> scanner


svn path=/trunk/; revision=383
---
 ChangeLog                 |    9 +
 gir/glib-2.0.gir          | 1101 ++++++++++++++++++++++++++++++++++++++++++++-
 gir/gobject-2.0.gir       |  130 +-----
 tests/scanner/Makefile.am |    2 +-
 4 files changed, 1123 insertions(+), 119 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d541818..947adc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-16  Johan Dahlin  <johan@gnome.org>
+
+	* gir/glib-2.0.gir:
+	* gir/gobject-2.0.gir:
+	Regenerate
+
+	* tests/scanner/Makefile.am:
+	parser -> scanner
+
 2008-08-15  Colin Walters  <walters@verbum.org>
 
 	* giscanner/glibtransformer.py: Explicitly construct
diff --git a/gir/glib-2.0.gir b/gir/glib-2.0.gir
index 4d3ce9a..78ffc0f 100644
--- a/gir/glib-2.0.gir
+++ b/gir/glib-2.0.gir
@@ -982,7 +982,7 @@
         <type name="gchar" c:type="gchar**"/>
       </return-value>
     </function>
-    <enumeration name="" c:type="GUserDirectory">
+    <enumeration name="GUserDirectory" c:type="GUserDirectory">
       <member name="y_desktop"
               value="0"
               c:identifier="G_USER_DIRECTORY_DESKTOP"/>
@@ -1419,6 +1419,9 @@
         <type name="GQuark" c:type="GQuark"/>
       </return-value>
     </function>
+    <enumeration name="GThreadError" c:type="GThreadError">
+      <member name="r_again" value="0" c:identifier="G_THREAD_ERROR_AGAIN"/>
+    </enumeration>
     <callback name="GThreadFunc">
       <return-value>
         <type name="any" c:type="gpointer"/>
@@ -1429,6 +1432,16 @@
         </parameter>
       </parameters>
     </callback>
+    <enumeration name="GThreadPriority" c:type="GThreadPriority">
+      <member name="y_low" value="0" c:identifier="G_THREAD_PRIORITY_LOW"/>
+      <member name="y_normal"
+              value="1"
+              c:identifier="G_THREAD_PRIORITY_NORMAL"/>
+      <member name="y_high" value="2" c:identifier="G_THREAD_PRIORITY_HIGH"/>
+      <member name="y_urgent"
+              value="3"
+              c:identifier="G_THREAD_PRIORITY_URGENT"/>
+    </enumeration>
     <record name="Thread" c:type="GThread"/>
     <record name="GThread" c:type="_GThread">
       <field name="func">
@@ -2064,6 +2077,15 @@
         </parameter>
       </parameters>
     </function>
+    <enumeration name="GOnceStatus" c:type="GOnceStatus">
+      <member name="s_notcalled"
+              value="0"
+              c:identifier="G_ONCE_STATUS_NOTCALLED"/>
+      <member name="s_progress"
+              value="1"
+              c:identifier="G_ONCE_STATUS_PROGRESS"/>
+      <member name="s_ready" value="2" c:identifier="G_ONCE_STATUS_READY"/>
+    </enumeration>
     <record name="Once" c:type="GOnce"/>
     <record name="GOnce" c:type="_GOnce">
       <field name="status">
@@ -2522,6 +2544,32 @@
         </parameter>
       </parameters>
     </function>
+    <enumeration name="GBookmarkFileError" c:type="GBookmarkFileError">
+      <member name="r_invalid_uri"
+              value="0"
+              c:identifier="G_BOOKMARK_FILE_ERROR_INVALID_URI"/>
+      <member name="r_invalid_value"
+              value="1"
+              c:identifier="G_BOOKMARK_FILE_ERROR_INVALID_VALUE"/>
+      <member name="r_app_not_registered"
+              value="2"
+              c:identifier="G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED"/>
+      <member name="r_uri_not_found"
+              value="3"
+              c:identifier="G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND"/>
+      <member name="r_read"
+              value="4"
+              c:identifier="G_BOOKMARK_FILE_ERROR_READ"/>
+      <member name="r_unknown_encoding"
+              value="5"
+              c:identifier="G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING"/>
+      <member name="r_write"
+              value="6"
+              c:identifier="G_BOOKMARK_FILE_ERROR_WRITE"/>
+      <member name="r_file_not_found"
+              value="7"
+              c:identifier="G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND"/>
+    </enumeration>
     <function name="bookmark_file_error_quark"
               c:identifier="g_bookmark_file_error_quark">
       <return-value>
@@ -3290,6 +3338,26 @@
         </parameter>
       </parameters>
     </function>
+    <enumeration name="GSliceConfig" c:type="GSliceConfig">
+      <member name="g_always_malloc"
+              value="1"
+              c:identifier="G_SLICE_CONFIG_ALWAYS_MALLOC"/>
+      <member name="g_bypass_magazines"
+              value="2"
+              c:identifier="G_SLICE_CONFIG_BYPASS_MAGAZINES"/>
+      <member name="g_working_set_msecs"
+              value="3"
+              c:identifier="G_SLICE_CONFIG_WORKING_SET_MSECS"/>
+      <member name="g_color_increment"
+              value="4"
+              c:identifier="G_SLICE_CONFIG_COLOR_INCREMENT"/>
+      <member name="g_chunk_sizes"
+              value="5"
+              c:identifier="G_SLICE_CONFIG_CHUNK_SIZES"/>
+      <member name="g_contention_counter"
+              value="6"
+              c:identifier="G_SLICE_CONFIG_CONTENTION_COUNTER"/>
+    </enumeration>
     <function name="slice_set_config" c:identifier="g_slice_set_config">
       <return-value>
         <type name="none" c:type="void"/>
@@ -4153,6 +4221,11 @@
         </parameter>
       </parameters>
     </function>
+    <enumeration name="GChecksumType" c:type="GChecksumType">
+      <member name="md5" value="0" c:identifier="G_CHECKSUM_MD5"/>
+      <member name="sha1" value="1" c:identifier="G_CHECKSUM_SHA1"/>
+      <member name="sha256" value="2" c:identifier="G_CHECKSUM_SHA256"/>
+    </enumeration>
     <record name="Checksum" c:type="GChecksum"/>
     <function name="checksum_type_get_length"
               c:identifier="g_checksum_type_get_length">
@@ -4421,6 +4494,24 @@
         </parameter>
       </parameters>
     </function>
+    <enumeration name="GConvertError" c:type="GConvertError">
+      <member name="r_no_conversion"
+              value="0"
+              c:identifier="G_CONVERT_ERROR_NO_CONVERSION"/>
+      <member name="r_illegal_sequence"
+              value="1"
+              c:identifier="G_CONVERT_ERROR_ILLEGAL_SEQUENCE"/>
+      <member name="r_failed" value="2" c:identifier="G_CONVERT_ERROR_FAILED"/>
+      <member name="r_partial_input"
+              value="3"
+              c:identifier="G_CONVERT_ERROR_PARTIAL_INPUT"/>
+      <member name="r_bad_uri"
+              value="4"
+              c:identifier="G_CONVERT_ERROR_BAD_URI"/>
+      <member name="r_not_absolute_path"
+              value="5"
+              c:identifier="G_CONVERT_ERROR_NOT_ABSOLUTE_PATH"/>
+    </enumeration>
     <function name="convert_error_quark" c:identifier="g_convert_error_quark">
       <return-value>
         <type name="GQuark" c:type="GQuark"/>
@@ -4932,6 +5023,36 @@
       </parameters>
     </function>
     <record name="Date" c:type="GDate"/>
+    <enumeration name="GDateDMY" c:type="GDateDMY">
+      <member name="ay" value="0" c:identifier="G_DATE_DAY"/>
+      <member name="month" value="1" c:identifier="G_DATE_MONTH"/>
+      <member name="year" value="2" c:identifier="G_DATE_YEAR"/>
+    </enumeration>
+    <enumeration name="GDateWeekday" c:type="GDateWeekday">
+      <member name="bad_weekday" value="0" c:identifier="G_DATE_BAD_WEEKDAY"/>
+      <member name="monday" value="1" c:identifier="G_DATE_MONDAY"/>
+      <member name="tuesday" value="2" c:identifier="G_DATE_TUESDAY"/>
+      <member name="dnesday" value="3" c:identifier="G_DATE_WEDNESDAY"/>
+      <member name="thursday" value="4" c:identifier="G_DATE_THURSDAY"/>
+      <member name="friday" value="5" c:identifier="G_DATE_FRIDAY"/>
+      <member name="saturday" value="6" c:identifier="G_DATE_SATURDAY"/>
+      <member name="sunday" value="7" c:identifier="G_DATE_SUNDAY"/>
+    </enumeration>
+    <enumeration name="GDateMonth" c:type="GDateMonth">
+      <member name="bad_month" value="0" c:identifier="G_DATE_BAD_MONTH"/>
+      <member name="january" value="1" c:identifier="G_DATE_JANUARY"/>
+      <member name="february" value="2" c:identifier="G_DATE_FEBRUARY"/>
+      <member name="arch" value="3" c:identifier="G_DATE_MARCH"/>
+      <member name="april" value="4" c:identifier="G_DATE_APRIL"/>
+      <member name="ay" value="5" c:identifier="G_DATE_MAY"/>
+      <member name="june" value="6" c:identifier="G_DATE_JUNE"/>
+      <member name="july" value="7" c:identifier="G_DATE_JULY"/>
+      <member name="august" value="8" c:identifier="G_DATE_AUGUST"/>
+      <member name="september" value="9" c:identifier="G_DATE_SEPTEMBER"/>
+      <member name="october" value="10" c:identifier="G_DATE_OCTOBER"/>
+      <member name="november" value="11" c:identifier="G_DATE_NOVEMBER"/>
+      <member name="december" value="12" c:identifier="G_DATE_DECEMBER"/>
+    </enumeration>
     <record name="GDate" c:type="_GDate">
       <field name="julian_days">
         <type name="uint32" c:type="guint"/>
@@ -5580,6 +5701,48 @@
         </parameter>
       </parameters>
     </function>
+    <enumeration name="GFileError" c:type="GFileError">
+      <member name="r_exist" value="0" c:identifier="G_FILE_ERROR_EXIST"/>
+      <member name="r_isdir" value="1" c:identifier="G_FILE_ERROR_ISDIR"/>
+      <member name="r_acces" value="2" c:identifier="G_FILE_ERROR_ACCES"/>
+      <member name="r_nametoolong"
+              value="3"
+              c:identifier="G_FILE_ERROR_NAMETOOLONG"/>
+      <member name="r_noent" value="4" c:identifier="G_FILE_ERROR_NOENT"/>
+      <member name="r_notdir" value="5" c:identifier="G_FILE_ERROR_NOTDIR"/>
+      <member name="r_nxio" value="6" c:identifier="G_FILE_ERROR_NXIO"/>
+      <member name="r_nodev" value="7" c:identifier="G_FILE_ERROR_NODEV"/>
+      <member name="r_rofs" value="8" c:identifier="G_FILE_ERROR_ROFS"/>
+      <member name="r_txtbsy" value="9" c:identifier="G_FILE_ERROR_TXTBSY"/>
+      <member name="r_fault" value="10" c:identifier="G_FILE_ERROR_FAULT"/>
+      <member name="r_loop" value="11" c:identifier="G_FILE_ERROR_LOOP"/>
+      <member name="r_nospc" value="12" c:identifier="G_FILE_ERROR_NOSPC"/>
+      <member name="r_nomem" value="13" c:identifier="G_FILE_ERROR_NOMEM"/>
+      <member name="r_mfile" value="14" c:identifier="G_FILE_ERROR_MFILE"/>
+      <member name="r_nfile" value="15" c:identifier="G_FILE_ERROR_NFILE"/>
+      <member name="r_badf" value="16" c:identifier="G_FILE_ERROR_BADF"/>
+      <member name="r_inval" value="17" c:identifier="G_FILE_ERROR_INVAL"/>
+      <member name="r_pipe" value="18" c:identifier="G_FILE_ERROR_PIPE"/>
+      <member name="r_again" value="19" c:identifier="G_FILE_ERROR_AGAIN"/>
+      <member name="r_intr" value="20" c:identifier="G_FILE_ERROR_INTR"/>
+      <member name="r_io" value="21" c:identifier="G_FILE_ERROR_IO"/>
+      <member name="r_perm" value="22" c:identifier="G_FILE_ERROR_PERM"/>
+      <member name="r_nosys" value="23" c:identifier="G_FILE_ERROR_NOSYS"/>
+      <member name="r_failed" value="24" c:identifier="G_FILE_ERROR_FAILED"/>
+    </enumeration>
+    <enumeration name="GFileTest" c:type="GFileTest">
+      <member name="t_is_regular"
+              value="1"
+              c:identifier="G_FILE_TEST_IS_REGULAR"/>
+      <member name="t_is_symlink"
+              value="2"
+              c:identifier="G_FILE_TEST_IS_SYMLINK"/>
+      <member name="t_is_dir" value="4" c:identifier="G_FILE_TEST_IS_DIR"/>
+      <member name="t_is_executable"
+              value="8"
+              c:identifier="G_FILE_TEST_IS_EXECUTABLE"/>
+      <member name="t_exists" value="16" c:identifier="G_FILE_TEST_EXISTS"/>
+    </enumeration>
     <function name="file_error_quark" c:identifier="g_file_error_quark">
       <return-value>
         <type name="GQuark" c:type="GQuark"/>
@@ -6286,6 +6449,11 @@
         </parameter>
       </parameters>
     </callback>
+    <enumeration name="GHookFlagMask" c:type="GHookFlagMask">
+      <member name="active" value="1" c:identifier="G_HOOK_FLAG_ACTIVE"/>
+      <member name="in_call" value="2" c:identifier="G_HOOK_FLAG_IN_CALL"/>
+      <member name="k" value="15" c:identifier="G_HOOK_FLAG_MASK"/>
+    </enumeration>
     <record name="GHookList" c:type="_GHookList">
       <field name="seq_id">
         <type name="ulong" c:type="gulong"/>
@@ -6669,6 +6837,19 @@
         </parameter>
       </parameters>
     </function>
+    <enumeration name="GAsciiType" c:type="GAsciiType">
+      <member name="alnum" value="1" c:identifier="G_ASCII_ALNUM"/>
+      <member name="alpha" value="2" c:identifier="G_ASCII_ALPHA"/>
+      <member name="cntrl" value="4" c:identifier="G_ASCII_CNTRL"/>
+      <member name="digit" value="8" c:identifier="G_ASCII_DIGIT"/>
+      <member name="graph" value="16" c:identifier="G_ASCII_GRAPH"/>
+      <member name="lower" value="32" c:identifier="G_ASCII_LOWER"/>
+      <member name="print" value="64" c:identifier="G_ASCII_PRINT"/>
+      <member name="punct" value="128" c:identifier="G_ASCII_PUNCT"/>
+      <member name="space" value="256" c:identifier="G_ASCII_SPACE"/>
+      <member name="upper" value="512" c:identifier="G_ASCII_UPPER"/>
+      <member name="xdigit" value="1024" c:identifier="G_ASCII_XDIGIT"/>
+    </enumeration>
     <function name="ascii_tolower" c:identifier="g_ascii_tolower">
       <return-value>
         <type name="gchar" c:type="gchar"/>
@@ -8719,6 +8900,395 @@
         </parameter>
       </parameters>
     </function>
+    <enumeration name="GUnicodeType" c:type="GUnicodeType">
+      <member name="control" value="0" c:identifier="G_UNICODE_CONTROL"/>
+      <member name="format" value="1" c:identifier="G_UNICODE_FORMAT"/>
+      <member name="unassigned" value="2" c:identifier="G_UNICODE_UNASSIGNED"/>
+      <member name="private_use"
+              value="3"
+              c:identifier="G_UNICODE_PRIVATE_USE"/>
+      <member name="surrogate" value="4" c:identifier="G_UNICODE_SURROGATE"/>
+      <member name="lowercase_letter"
+              value="5"
+              c:identifier="G_UNICODE_LOWERCASE_LETTER"/>
+      <member name="modifier_letter"
+              value="6"
+              c:identifier="G_UNICODE_MODIFIER_LETTER"/>
+      <member name="other_letter"
+              value="7"
+              c:identifier="G_UNICODE_OTHER_LETTER"/>
+      <member name="itlecase_letter"
+              value="8"
+              c:identifier="G_UNICODE_TITLECASE_LETTER"/>
+      <member name="uppercase_letter"
+              value="9"
+              c:identifier="G_UNICODE_UPPERCASE_LETTER"/>
+      <member name="combining_mark"
+              value="10"
+              c:identifier="G_UNICODE_COMBINING_MARK"/>
+      <member name="enclosing_mark"
+              value="11"
+              c:identifier="G_UNICODE_ENCLOSING_MARK"/>
+      <member name="non_spacing_mark"
+              value="12"
+              c:identifier="G_UNICODE_NON_SPACING_MARK"/>
+      <member name="decimal_number"
+              value="13"
+              c:identifier="G_UNICODE_DECIMAL_NUMBER"/>
+      <member name="letter_number"
+              value="14"
+              c:identifier="G_UNICODE_LETTER_NUMBER"/>
+      <member name="other_number"
+              value="15"
+              c:identifier="G_UNICODE_OTHER_NUMBER"/>
+      <member name="connect_punctuation"
+              value="16"
+              c:identifier="G_UNICODE_CONNECT_PUNCTUATION"/>
+      <member name="dash_punctuation"
+              value="17"
+              c:identifier="G_UNICODE_DASH_PUNCTUATION"/>
+      <member name="close_punctuation"
+              value="18"
+              c:identifier="G_UNICODE_CLOSE_PUNCTUATION"/>
+      <member name="final_punctuation"
+              value="19"
+              c:identifier="G_UNICODE_FINAL_PUNCTUATION"/>
+      <member name="initial_punctuation"
+              value="20"
+              c:identifier="G_UNICODE_INITIAL_PUNCTUATION"/>
+      <member name="other_punctuation"
+              value="21"
+              c:identifier="G_UNICODE_OTHER_PUNCTUATION"/>
+      <member name="open_punctuation"
+              value="22"
+              c:identifier="G_UNICODE_OPEN_PUNCTUATION"/>
+      <member name="currency_symbol"
+              value="23"
+              c:identifier="G_UNICODE_CURRENCY_SYMBOL"/>
+      <member name="modifier_symbol"
+              value="24"
+              c:identifier="G_UNICODE_MODIFIER_SYMBOL"/>
+      <member name="math_symbol"
+              value="25"
+              c:identifier="G_UNICODE_MATH_SYMBOL"/>
+      <member name="other_symbol"
+              value="26"
+              c:identifier="G_UNICODE_OTHER_SYMBOL"/>
+      <member name="line_separator"
+              value="27"
+              c:identifier="G_UNICODE_LINE_SEPARATOR"/>
+      <member name="paragraph_separator"
+              value="28"
+              c:identifier="G_UNICODE_PARAGRAPH_SEPARATOR"/>
+      <member name="space_separator"
+              value="29"
+              c:identifier="G_UNICODE_SPACE_SEPARATOR"/>
+    </enumeration>
+    <enumeration name="GUnicodeBreakType" c:type="GUnicodeBreakType">
+      <member name="mandatory"
+              value="0"
+              c:identifier="G_UNICODE_BREAK_MANDATORY"/>
+      <member name="carriage_return"
+              value="1"
+              c:identifier="G_UNICODE_BREAK_CARRIAGE_RETURN"/>
+      <member name="line_feed"
+              value="2"
+              c:identifier="G_UNICODE_BREAK_LINE_FEED"/>
+      <member name="combining_mark"
+              value="3"
+              c:identifier="G_UNICODE_BREAK_COMBINING_MARK"/>
+      <member name="surrogate"
+              value="4"
+              c:identifier="G_UNICODE_BREAK_SURROGATE"/>
+      <member name="zero_width_space"
+              value="5"
+              c:identifier="G_UNICODE_BREAK_ZERO_WIDTH_SPACE"/>
+      <member name="inseparable"
+              value="6"
+              c:identifier="G_UNICODE_BREAK_INSEPARABLE"/>
+      <member name="non_breaking_glue"
+              value="7"
+              c:identifier="G_UNICODE_BREAK_NON_BREAKING_GLUE"/>
+      <member name="contingent"
+              value="8"
+              c:identifier="G_UNICODE_BREAK_CONTINGENT"/>
+      <member name="space" value="9" c:identifier="G_UNICODE_BREAK_SPACE"/>
+      <member name="after" value="10" c:identifier="G_UNICODE_BREAK_AFTER"/>
+      <member name="before" value="11" c:identifier="G_UNICODE_BREAK_BEFORE"/>
+      <member name="before_and_after"
+              value="12"
+              c:identifier="G_UNICODE_BREAK_BEFORE_AND_AFTER"/>
+      <member name="hyphen" value="13" c:identifier="G_UNICODE_BREAK_HYPHEN"/>
+      <member name="non_starter"
+              value="14"
+              c:identifier="G_UNICODE_BREAK_NON_STARTER"/>
+      <member name="open_punctuation"
+              value="15"
+              c:identifier="G_UNICODE_BREAK_OPEN_PUNCTUATION"/>
+      <member name="close_punctuation"
+              value="16"
+              c:identifier="G_UNICODE_BREAK_CLOSE_PUNCTUATION"/>
+      <member name="quotation"
+              value="17"
+              c:identifier="G_UNICODE_BREAK_QUOTATION"/>
+      <member name="exclamation"
+              value="18"
+              c:identifier="G_UNICODE_BREAK_EXCLAMATION"/>
+      <member name="ideographic"
+              value="19"
+              c:identifier="G_UNICODE_BREAK_IDEOGRAPHIC"/>
+      <member name="numeric"
+              value="20"
+              c:identifier="G_UNICODE_BREAK_NUMERIC"/>
+      <member name="infix_separator"
+              value="21"
+              c:identifier="G_UNICODE_BREAK_INFIX_SEPARATOR"/>
+      <member name="symbol" value="22" c:identifier="G_UNICODE_BREAK_SYMBOL"/>
+      <member name="alphabetic"
+              value="23"
+              c:identifier="G_UNICODE_BREAK_ALPHABETIC"/>
+      <member name="prefix" value="24" c:identifier="G_UNICODE_BREAK_PREFIX"/>
+      <member name="postfix"
+              value="25"
+              c:identifier="G_UNICODE_BREAK_POSTFIX"/>
+      <member name="complex_context"
+              value="26"
+              c:identifier="G_UNICODE_BREAK_COMPLEX_CONTEXT"/>
+      <member name="ambiguous"
+              value="27"
+              c:identifier="G_UNICODE_BREAK_AMBIGUOUS"/>
+      <member name="unknown"
+              value="28"
+              c:identifier="G_UNICODE_BREAK_UNKNOWN"/>
+      <member name="next_line"
+              value="29"
+              c:identifier="G_UNICODE_BREAK_NEXT_LINE"/>
+      <member name="word_joiner"
+              value="30"
+              c:identifier="G_UNICODE_BREAK_WORD_JOINER"/>
+      <member name="hangul_l_jamo"
+              value="31"
+              c:identifier="G_UNICODE_BREAK_HANGUL_L_JAMO"/>
+      <member name="hangul_v_jamo"
+              value="32"
+              c:identifier="G_UNICODE_BREAK_HANGUL_V_JAMO"/>
+      <member name="hangul_t_jamo"
+              value="33"
+              c:identifier="G_UNICODE_BREAK_HANGUL_T_JAMO"/>
+      <member name="hangul_lv_syllable"
+              value="34"
+              c:identifier="G_UNICODE_BREAK_HANGUL_LV_SYLLABLE"/>
+      <member name="hangul_lvt_syllable"
+              value="35"
+              c:identifier="G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE"/>
+    </enumeration>
+    <enumeration name="GUnicodeScript" c:type="GUnicodeScript">
+      <member name="t_invalid_code"
+              value="-1"
+              c:identifier="G_UNICODE_SCRIPT_INVALID_CODE"/>
+      <member name="t_common"
+              value="0"
+              c:identifier="G_UNICODE_SCRIPT_COMMON"/>
+      <member name="t_inherited"
+              value="1"
+              c:identifier="G_UNICODE_SCRIPT_INHERITED"/>
+      <member name="t_arabic"
+              value="2"
+              c:identifier="G_UNICODE_SCRIPT_ARABIC"/>
+      <member name="t_armenian"
+              value="3"
+              c:identifier="G_UNICODE_SCRIPT_ARMENIAN"/>
+      <member name="t_bengali"
+              value="4"
+              c:identifier="G_UNICODE_SCRIPT_BENGALI"/>
+      <member name="t_bopomofo"
+              value="5"
+              c:identifier="G_UNICODE_SCRIPT_BOPOMOFO"/>
+      <member name="t_cherokee"
+              value="6"
+              c:identifier="G_UNICODE_SCRIPT_CHEROKEE"/>
+      <member name="t_coptic"
+              value="7"
+              c:identifier="G_UNICODE_SCRIPT_COPTIC"/>
+      <member name="t_cyrillic"
+              value="8"
+              c:identifier="G_UNICODE_SCRIPT_CYRILLIC"/>
+      <member name="t_deseret"
+              value="9"
+              c:identifier="G_UNICODE_SCRIPT_DESERET"/>
+      <member name="t_devanagari"
+              value="10"
+              c:identifier="G_UNICODE_SCRIPT_DEVANAGARI"/>
+      <member name="t_ethiopic"
+              value="11"
+              c:identifier="G_UNICODE_SCRIPT_ETHIOPIC"/>
+      <member name="t_georgian"
+              value="12"
+              c:identifier="G_UNICODE_SCRIPT_GEORGIAN"/>
+      <member name="t_gothic"
+              value="13"
+              c:identifier="G_UNICODE_SCRIPT_GOTHIC"/>
+      <member name="t_greek" value="14" c:identifier="G_UNICODE_SCRIPT_GREEK"/>
+      <member name="t_gujarati"
+              value="15"
+              c:identifier="G_UNICODE_SCRIPT_GUJARATI"/>
+      <member name="t_gurmukhi"
+              value="16"
+              c:identifier="G_UNICODE_SCRIPT_GURMUKHI"/>
+      <member name="t_han" value="17" c:identifier="G_UNICODE_SCRIPT_HAN"/>
+      <member name="t_hangul"
+              value="18"
+              c:identifier="G_UNICODE_SCRIPT_HANGUL"/>
+      <member name="t_hebrew"
+              value="19"
+              c:identifier="G_UNICODE_SCRIPT_HEBREW"/>
+      <member name="t_hiragana"
+              value="20"
+              c:identifier="G_UNICODE_SCRIPT_HIRAGANA"/>
+      <member name="t_kannada"
+              value="21"
+              c:identifier="G_UNICODE_SCRIPT_KANNADA"/>
+      <member name="t_katakana"
+              value="22"
+              c:identifier="G_UNICODE_SCRIPT_KATAKANA"/>
+      <member name="t_khmer" value="23" c:identifier="G_UNICODE_SCRIPT_KHMER"/>
+      <member name="t_lao" value="24" c:identifier="G_UNICODE_SCRIPT_LAO"/>
+      <member name="t_latin" value="25" c:identifier="G_UNICODE_SCRIPT_LATIN"/>
+      <member name="t_malayalam"
+              value="26"
+              c:identifier="G_UNICODE_SCRIPT_MALAYALAM"/>
+      <member name="t_mongolian"
+              value="27"
+              c:identifier="G_UNICODE_SCRIPT_MONGOLIAN"/>
+      <member name="t_myanmar"
+              value="28"
+              c:identifier="G_UNICODE_SCRIPT_MYANMAR"/>
+      <member name="t_ogham" value="29" c:identifier="G_UNICODE_SCRIPT_OGHAM"/>
+      <member name="t_old_italic"
+              value="30"
+              c:identifier="G_UNICODE_SCRIPT_OLD_ITALIC"/>
+      <member name="t_oriya" value="31" c:identifier="G_UNICODE_SCRIPT_ORIYA"/>
+      <member name="t_runic" value="32" c:identifier="G_UNICODE_SCRIPT_RUNIC"/>
+      <member name="t_sinhala"
+              value="33"
+              c:identifier="G_UNICODE_SCRIPT_SINHALA"/>
+      <member name="t_syriac"
+              value="34"
+              c:identifier="G_UNICODE_SCRIPT_SYRIAC"/>
+      <member name="t_tamil" value="35" c:identifier="G_UNICODE_SCRIPT_TAMIL"/>
+      <member name="t_telugu"
+              value="36"
+              c:identifier="G_UNICODE_SCRIPT_TELUGU"/>
+      <member name="t_thaana"
+              value="37"
+              c:identifier="G_UNICODE_SCRIPT_THAANA"/>
+      <member name="t_thai" value="38" c:identifier="G_UNICODE_SCRIPT_THAI"/>
+      <member name="t_tibetan"
+              value="39"
+              c:identifier="G_UNICODE_SCRIPT_TIBETAN"/>
+      <member name="t_canadian_aboriginal"
+              value="40"
+              c:identifier="G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL"/>
+      <member name="t_yi" value="41" c:identifier="G_UNICODE_SCRIPT_YI"/>
+      <member name="t_tagalog"
+              value="42"
+              c:identifier="G_UNICODE_SCRIPT_TAGALOG"/>
+      <member name="t_hanunoo"
+              value="43"
+              c:identifier="G_UNICODE_SCRIPT_HANUNOO"/>
+      <member name="t_buhid" value="44" c:identifier="G_UNICODE_SCRIPT_BUHID"/>
+      <member name="t_tagbanwa"
+              value="45"
+              c:identifier="G_UNICODE_SCRIPT_TAGBANWA"/>
+      <member name="t_braille"
+              value="46"
+              c:identifier="G_UNICODE_SCRIPT_BRAILLE"/>
+      <member name="t_cypriot"
+              value="47"
+              c:identifier="G_UNICODE_SCRIPT_CYPRIOT"/>
+      <member name="t_limbu" value="48" c:identifier="G_UNICODE_SCRIPT_LIMBU"/>
+      <member name="t_osmanya"
+              value="49"
+              c:identifier="G_UNICODE_SCRIPT_OSMANYA"/>
+      <member name="t_shavian"
+              value="50"
+              c:identifier="G_UNICODE_SCRIPT_SHAVIAN"/>
+      <member name="t_linear_b"
+              value="51"
+              c:identifier="G_UNICODE_SCRIPT_LINEAR_B"/>
+      <member name="t_tai_le"
+              value="52"
+              c:identifier="G_UNICODE_SCRIPT_TAI_LE"/>
+      <member name="t_ugaritic"
+              value="53"
+              c:identifier="G_UNICODE_SCRIPT_UGARITIC"/>
+      <member name="t_new_tai_lue"
+              value="54"
+              c:identifier="G_UNICODE_SCRIPT_NEW_TAI_LUE"/>
+      <member name="t_buginese"
+              value="55"
+              c:identifier="G_UNICODE_SCRIPT_BUGINESE"/>
+      <member name="t_glagolitic"
+              value="56"
+              c:identifier="G_UNICODE_SCRIPT_GLAGOLITIC"/>
+      <member name="t_tifinagh"
+              value="57"
+              c:identifier="G_UNICODE_SCRIPT_TIFINAGH"/>
+      <member name="t_syloti_nagri"
+              value="58"
+              c:identifier="G_UNICODE_SCRIPT_SYLOTI_NAGRI"/>
+      <member name="t_old_persian"
+              value="59"
+              c:identifier="G_UNICODE_SCRIPT_OLD_PERSIAN"/>
+      <member name="t_kharoshthi"
+              value="60"
+              c:identifier="G_UNICODE_SCRIPT_KHAROSHTHI"/>
+      <member name="t_unknown"
+              value="61"
+              c:identifier="G_UNICODE_SCRIPT_UNKNOWN"/>
+      <member name="t_balinese"
+              value="62"
+              c:identifier="G_UNICODE_SCRIPT_BALINESE"/>
+      <member name="t_cuneiform"
+              value="63"
+              c:identifier="G_UNICODE_SCRIPT_CUNEIFORM"/>
+      <member name="t_phoenician"
+              value="64"
+              c:identifier="G_UNICODE_SCRIPT_PHOENICIAN"/>
+      <member name="t_phags_pa"
+              value="65"
+              c:identifier="G_UNICODE_SCRIPT_PHAGS_PA"/>
+      <member name="t_nko" value="66" c:identifier="G_UNICODE_SCRIPT_NKO"/>
+      <member name="t_kayah_li"
+              value="67"
+              c:identifier="G_UNICODE_SCRIPT_KAYAH_LI"/>
+      <member name="t_lepcha"
+              value="68"
+              c:identifier="G_UNICODE_SCRIPT_LEPCHA"/>
+      <member name="t_rejang"
+              value="69"
+              c:identifier="G_UNICODE_SCRIPT_REJANG"/>
+      <member name="t_sundanese"
+              value="70"
+              c:identifier="G_UNICODE_SCRIPT_SUNDANESE"/>
+      <member name="t_saurashtra"
+              value="71"
+              c:identifier="G_UNICODE_SCRIPT_SAURASHTRA"/>
+      <member name="t_cham" value="72" c:identifier="G_UNICODE_SCRIPT_CHAM"/>
+      <member name="t_ol_chiki"
+              value="73"
+              c:identifier="G_UNICODE_SCRIPT_OL_CHIKI"/>
+      <member name="t_vai" value="74" c:identifier="G_UNICODE_SCRIPT_VAI"/>
+      <member name="t_carian"
+              value="75"
+              c:identifier="G_UNICODE_SCRIPT_CARIAN"/>
+      <member name="t_lycian"
+              value="76"
+              c:identifier="G_UNICODE_SCRIPT_LYCIAN"/>
+      <member name="t_lydian"
+              value="77"
+              c:identifier="G_UNICODE_SCRIPT_LYDIAN"/>
+    </enumeration>
     <function name="get_charset" c:identifier="g_get_charset">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
@@ -9397,6 +9967,20 @@
         </parameter>
       </parameters>
     </function>
+    <enumeration name="GNormalizeMode" c:type="GNormalizeMode">
+      <member name="default" value="0" c:identifier="G_NORMALIZE_DEFAULT"/>
+      <member name="nfd" value="0" c:identifier="G_NORMALIZE_NFD"/>
+      <member name="default_compose"
+              value="1"
+              c:identifier="G_NORMALIZE_DEFAULT_COMPOSE"/>
+      <member name="nfc" value="1" c:identifier="G_NORMALIZE_NFC"/>
+      <member name="all" value="2" c:identifier="G_NORMALIZE_ALL"/>
+      <member name="nfkd" value="2" c:identifier="G_NORMALIZE_NFKD"/>
+      <member name="all_compose"
+              value="3"
+              c:identifier="G_NORMALIZE_ALL_COMPOSE"/>
+      <member name="nfkc" value="3" c:identifier="G_NORMALIZE_NFKC"/>
+    </enumeration>
     <function name="utf8_normalize" c:identifier="g_utf8_normalize">
       <return-value>
         <type name="string" c:type="gchar*"/>
@@ -10003,6 +10587,68 @@
     </function>
     <record name="IOChannel" c:type="GIOChannel"/>
     <record name="IOFuncs" c:type="GIOFuncs"/>
+    <enumeration name="GIOError" c:type="GIOError">
+      <member name="r_none" value="0" c:identifier="G_IO_ERROR_NONE"/>
+      <member name="r_again" value="1" c:identifier="G_IO_ERROR_AGAIN"/>
+      <member name="r_inval" value="2" c:identifier="G_IO_ERROR_INVAL"/>
+      <member name="r_unknown" value="3" c:identifier="G_IO_ERROR_UNKNOWN"/>
+    </enumeration>
+    <enumeration name="GIOChannelError" c:type="GIOChannelError">
+      <member name="r_fbig" value="0" c:identifier="G_IO_CHANNEL_ERROR_FBIG"/>
+      <member name="r_inval"
+              value="1"
+              c:identifier="G_IO_CHANNEL_ERROR_INVAL"/>
+      <member name="r_io" value="2" c:identifier="G_IO_CHANNEL_ERROR_IO"/>
+      <member name="r_isdir"
+              value="3"
+              c:identifier="G_IO_CHANNEL_ERROR_ISDIR"/>
+      <member name="r_nospc"
+              value="4"
+              c:identifier="G_IO_CHANNEL_ERROR_NOSPC"/>
+      <member name="r_nxio" value="5" c:identifier="G_IO_CHANNEL_ERROR_NXIO"/>
+      <member name="r_overflow"
+              value="6"
+              c:identifier="G_IO_CHANNEL_ERROR_OVERFLOW"/>
+      <member name="r_pipe" value="7" c:identifier="G_IO_CHANNEL_ERROR_PIPE"/>
+      <member name="r_failed"
+              value="8"
+              c:identifier="G_IO_CHANNEL_ERROR_FAILED"/>
+    </enumeration>
+    <enumeration name="GIOStatus" c:type="GIOStatus">
+      <member name="s_error" value="0" c:identifier="G_IO_STATUS_ERROR"/>
+      <member name="s_normal" value="1" c:identifier="G_IO_STATUS_NORMAL"/>
+      <member name="s_eof" value="2" c:identifier="G_IO_STATUS_EOF"/>
+      <member name="s_again" value="3" c:identifier="G_IO_STATUS_AGAIN"/>
+    </enumeration>
+    <enumeration name="GSeekType" c:type="GSeekType">
+      <member name="cur" value="0" c:identifier="G_SEEK_CUR"/>
+      <member name="set" value="1" c:identifier="G_SEEK_SET"/>
+      <member name="end" value="2" c:identifier="G_SEEK_END"/>
+    </enumeration>
+    <enumeration name="GIOCondition" c:type="GIOCondition">
+      <member name="in" value="1" c:identifier="G_IO_IN"/>
+      <member name="out" value="4" c:identifier="G_IO_OUT"/>
+      <member name="pri" value="2" c:identifier="G_IO_PRI"/>
+      <member name="err" value="8" c:identifier="G_IO_ERR"/>
+      <member name="hup" value="16" c:identifier="G_IO_HUP"/>
+      <member name="nval" value="32" c:identifier="G_IO_NVAL"/>
+    </enumeration>
+    <enumeration name="GIOFlags" c:type="GIOFlags">
+      <member name="_append" value="1" c:identifier="G_IO_FLAG_APPEND"/>
+      <member name="_nonblock" value="2" c:identifier="G_IO_FLAG_NONBLOCK"/>
+      <member name="_is_readable"
+              value="4"
+              c:identifier="G_IO_FLAG_IS_READABLE"/>
+      <member name="_is_writeable"
+              value="8"
+              c:identifier="G_IO_FLAG_IS_WRITEABLE"/>
+      <member name="_is_seekable"
+              value="16"
+              c:identifier="G_IO_FLAG_IS_SEEKABLE"/>
+      <member name="_mask" value="31" c:identifier="G_IO_FLAG_MASK"/>
+      <member name="_get_mask" value="31" c:identifier="G_IO_FLAG_GET_MASK"/>
+      <member name="_set_mask" value="3" c:identifier="G_IO_FLAG_SET_MASK"/>
+    </enumeration>
     <record name="GIOChannel" c:type="_GIOChannel">
       <field name="ref_count">
         <type name="int32" c:type="gint"/>
@@ -10778,6 +11424,24 @@
         </parameter>
       </parameters>
     </function>
+    <enumeration name="GKeyFileError" c:type="GKeyFileError">
+      <member name="r_unknown_encoding"
+              value="0"
+              c:identifier="G_KEY_FILE_ERROR_UNKNOWN_ENCODING"/>
+      <member name="r_parse" value="1" c:identifier="G_KEY_FILE_ERROR_PARSE"/>
+      <member name="r_not_found"
+              value="2"
+              c:identifier="G_KEY_FILE_ERROR_NOT_FOUND"/>
+      <member name="r_key_not_found"
+              value="3"
+              c:identifier="G_KEY_FILE_ERROR_KEY_NOT_FOUND"/>
+      <member name="r_group_not_found"
+              value="4"
+              c:identifier="G_KEY_FILE_ERROR_GROUP_NOT_FOUND"/>
+      <member name="r_invalid_value"
+              value="5"
+              c:identifier="G_KEY_FILE_ERROR_INVALID_VALUE"/>
+    </enumeration>
     <function name="key_file_error_quark"
               c:identifier="g_key_file_error_quark">
       <return-value>
@@ -10785,6 +11449,15 @@
       </return-value>
     </function>
     <record name="KeyFile" c:type="GKeyFile"/>
+    <enumeration name="GKeyFileFlags" c:type="GKeyFileFlags">
+      <member name="none" value="0" c:identifier="G_KEY_FILE_NONE"/>
+      <member name="keep_comments"
+              value="1"
+              c:identifier="G_KEY_FILE_KEEP_COMMENTS"/>
+      <member name="keep_translations"
+              value="2"
+              c:identifier="G_KEY_FILE_KEEP_TRANSLATIONS"/>
+    </enumeration>
     <function name="key_file_new" c:identifier="g_key_file_new">
       <return-value>
         <type name="GKeyFile" c:type="GKeyFile*"/>
@@ -11621,11 +12294,41 @@
         </parameter>
       </parameters>
     </function>
+    <enumeration name="GMarkupError" c:type="GMarkupError">
+      <member name="r_bad_utf8"
+              value="0"
+              c:identifier="G_MARKUP_ERROR_BAD_UTF8"/>
+      <member name="r_empty" value="1" c:identifier="G_MARKUP_ERROR_EMPTY"/>
+      <member name="r_parse" value="2" c:identifier="G_MARKUP_ERROR_PARSE"/>
+      <member name="r_unknown_element"
+              value="3"
+              c:identifier="G_MARKUP_ERROR_UNKNOWN_ELEMENT"/>
+      <member name="r_unknown_attribute"
+              value="4"
+              c:identifier="G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE"/>
+      <member name="r_invalid_content"
+              value="5"
+              c:identifier="G_MARKUP_ERROR_INVALID_CONTENT"/>
+      <member name="r_missing_attribute"
+              value="6"
+              c:identifier="G_MARKUP_ERROR_MISSING_ATTRIBUTE"/>
+    </enumeration>
     <function name="markup_error_quark" c:identifier="g_markup_error_quark">
       <return-value>
         <type name="GQuark" c:type="GQuark"/>
       </return-value>
     </function>
+    <enumeration name="GMarkupParseFlags" c:type="GMarkupParseFlags">
+      <member name="do_not_use_this_unsupported_flag"
+              value="1"
+              c:identifier="G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG"/>
+      <member name="treat_cdata_as_text"
+              value="2"
+              c:identifier="G_MARKUP_TREAT_CDATA_AS_TEXT"/>
+      <member name="refix_error_position"
+              value="4"
+              c:identifier="G_MARKUP_PREFIX_ERROR_POSITION"/>
+    </enumeration>
     <record name="MarkupParseContext" c:type="GMarkupParseContext"/>
     <record name="MarkupParser" c:type="GMarkupParser"/>
     <record name="GMarkupParser" c:type="_GMarkupParser">
@@ -11862,6 +12565,22 @@
         </parameter>
       </parameters>
     </function>
+    <enumeration name="GMarkupCollectType" c:type="GMarkupCollectType">
+      <member name="invalid"
+              value="0"
+              c:identifier="G_MARKUP_COLLECT_INVALID"/>
+      <member name="string" value="1" c:identifier="G_MARKUP_COLLECT_STRING"/>
+      <member name="strdup" value="2" c:identifier="G_MARKUP_COLLECT_STRDUP"/>
+      <member name="boolean"
+              value="3"
+              c:identifier="G_MARKUP_COLLECT_BOOLEAN"/>
+      <member name="ristate"
+              value="4"
+              c:identifier="G_MARKUP_COLLECT_TRISTATE"/>
+      <member name="optional"
+              value="65536"
+              c:identifier="G_MARKUP_COLLECT_OPTIONAL"/>
+    </enumeration>
     <function name="markup_collect_attributes"
               c:identifier="g_markup_collect_attributes">
       <return-value>
@@ -11888,6 +12607,19 @@
         </parameter>
       </parameters>
     </function>
+    <enumeration name="GLogLevelFlags" c:type="GLogLevelFlags">
+      <member name="flag_recursion"
+              value="1"
+              c:identifier="G_LOG_FLAG_RECURSION"/>
+      <member name="flag_fatal" value="2" c:identifier="G_LOG_FLAG_FATAL"/>
+      <member name="error" value="4" c:identifier="G_LOG_LEVEL_ERROR"/>
+      <member name="critical" value="8" c:identifier="G_LOG_LEVEL_CRITICAL"/>
+      <member name="warning" value="16" c:identifier="G_LOG_LEVEL_WARNING"/>
+      <member name="message" value="32" c:identifier="G_LOG_LEVEL_MESSAGE"/>
+      <member name="info" value="64" c:identifier="G_LOG_LEVEL_INFO"/>
+      <member name="debug" value="128" c:identifier="G_LOG_LEVEL_DEBUG"/>
+      <member name="mask" value="-4" c:identifier="G_LOG_LEVEL_MASK"/>
+    </enumeration>
     <callback name="GLogFunc">
       <return-value>
         <type name="none" c:type="void"/>
@@ -12145,6 +12877,22 @@
       </parameters>
     </function>
     <record name="Node" c:type="GNode"/>
+    <enumeration name="GTraverseFlags" c:type="GTraverseFlags">
+      <member name="leaves" value="1" c:identifier="G_TRAVERSE_LEAVES"/>
+      <member name="non_leaves"
+              value="2"
+              c:identifier="G_TRAVERSE_NON_LEAVES"/>
+      <member name="all" value="3" c:identifier="G_TRAVERSE_ALL"/>
+      <member name="mask" value="3" c:identifier="G_TRAVERSE_MASK"/>
+      <member name="leafs" value="1" c:identifier="G_TRAVERSE_LEAFS"/>
+      <member name="non_leafs" value="2" c:identifier="G_TRAVERSE_NON_LEAFS"/>
+    </enumeration>
+    <enumeration name="GTraverseType" c:type="GTraverseType">
+      <member name="in_order" value="0" c:identifier="G_IN_ORDER"/>
+      <member name="pre_order" value="1" c:identifier="G_PRE_ORDER"/>
+      <member name="post_order" value="2" c:identifier="G_POST_ORDER"/>
+      <member name="level_order" value="3" c:identifier="G_LEVEL_ORDER"/>
+    </enumeration>
     <callback name="GNodeTraverseFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
@@ -12562,6 +13310,38 @@
     <record name="OptionContext" c:type="GOptionContext"/>
     <record name="OptionGroup" c:type="GOptionGroup"/>
     <record name="OptionEntry" c:type="GOptionEntry"/>
+    <enumeration name="GOptionFlags" c:type="GOptionFlags">
+      <member name="_hidden" value="1" c:identifier="G_OPTION_FLAG_HIDDEN"/>
+      <member name="_in_main" value="2" c:identifier="G_OPTION_FLAG_IN_MAIN"/>
+      <member name="_reverse" value="4" c:identifier="G_OPTION_FLAG_REVERSE"/>
+      <member name="_no_arg" value="8" c:identifier="G_OPTION_FLAG_NO_ARG"/>
+      <member name="_filename"
+              value="16"
+              c:identifier="G_OPTION_FLAG_FILENAME"/>
+      <member name="_optional_arg"
+              value="32"
+              c:identifier="G_OPTION_FLAG_OPTIONAL_ARG"/>
+      <member name="_noalias" value="64" c:identifier="G_OPTION_FLAG_NOALIAS"/>
+    </enumeration>
+    <enumeration name="GOptionArg" c:type="GOptionArg">
+      <member name="g_none" value="0" c:identifier="G_OPTION_ARG_NONE"/>
+      <member name="g_string" value="1" c:identifier="G_OPTION_ARG_STRING"/>
+      <member name="g_int" value="2" c:identifier="G_OPTION_ARG_INT"/>
+      <member name="g_callback"
+              value="3"
+              c:identifier="G_OPTION_ARG_CALLBACK"/>
+      <member name="g_filename"
+              value="4"
+              c:identifier="G_OPTION_ARG_FILENAME"/>
+      <member name="g_string_array"
+              value="5"
+              c:identifier="G_OPTION_ARG_STRING_ARRAY"/>
+      <member name="g_filename_array"
+              value="6"
+              c:identifier="G_OPTION_ARG_FILENAME_ARRAY"/>
+      <member name="g_double" value="7" c:identifier="G_OPTION_ARG_DOUBLE"/>
+      <member name="g_int64" value="8" c:identifier="G_OPTION_ARG_INT64"/>
+    </enumeration>
     <callback name="GOptionArgFunc">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
@@ -12619,6 +13399,15 @@
         </parameter>
       </parameters>
     </callback>
+    <enumeration name="GOptionError" c:type="GOptionError">
+      <member name="r_unknown_option"
+              value="0"
+              c:identifier="G_OPTION_ERROR_UNKNOWN_OPTION"/>
+      <member name="r_bad_value"
+              value="1"
+              c:identifier="G_OPTION_ERROR_BAD_VALUE"/>
+      <member name="r_failed" value="2" c:identifier="G_OPTION_ERROR_FAILED"/>
+    </enumeration>
     <function name="option_error_quark" c:identifier="g_option_error_quark">
       <return-value>
         <type name="GQuark" c:type="GQuark"/>
@@ -13829,11 +14618,184 @@
         </parameter>
       </parameters>
     </function>
+    <enumeration name="GRegexError" c:type="GRegexError">
+      <member name="r_compile" value="0" c:identifier="G_REGEX_ERROR_COMPILE"/>
+      <member name="r_optimize"
+              value="1"
+              c:identifier="G_REGEX_ERROR_OPTIMIZE"/>
+      <member name="r_replace" value="2" c:identifier="G_REGEX_ERROR_REPLACE"/>
+      <member name="r_match" value="3" c:identifier="G_REGEX_ERROR_MATCH"/>
+      <member name="r_internal"
+              value="4"
+              c:identifier="G_REGEX_ERROR_INTERNAL"/>
+      <member name="r_stray_backslash"
+              value="101"
+              c:identifier="G_REGEX_ERROR_STRAY_BACKSLASH"/>
+      <member name="r_missing_control_char"
+              value="102"
+              c:identifier="G_REGEX_ERROR_MISSING_CONTROL_CHAR"/>
+      <member name="r_unrecognized_escape"
+              value="103"
+              c:identifier="G_REGEX_ERROR_UNRECOGNIZED_ESCAPE"/>
+      <member name="r_quantifiers_out_of_order"
+              value="104"
+              c:identifier="G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER"/>
+      <member name="r_quantifier_too_big"
+              value="105"
+              c:identifier="G_REGEX_ERROR_QUANTIFIER_TOO_BIG"/>
+      <member name="r_unterminated_character_class"
+              value="106"
+              c:identifier="G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS"/>
+      <member name="r_invalid_escape_in_character_class"
+              value="107"
+              c:identifier="G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS"/>
+      <member name="r_range_out_of_order"
+              value="108"
+              c:identifier="G_REGEX_ERROR_RANGE_OUT_OF_ORDER"/>
+      <member name="r_nothing_to_repeat"
+              value="109"
+              c:identifier="G_REGEX_ERROR_NOTHING_TO_REPEAT"/>
+      <member name="r_unrecognized_character"
+              value="112"
+              c:identifier="G_REGEX_ERROR_UNRECOGNIZED_CHARACTER"/>
+      <member name="r_posix_named_class_outside_class"
+              value="113"
+              c:identifier="G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS"/>
+      <member name="r_unmatched_parenthesis"
+              value="114"
+              c:identifier="G_REGEX_ERROR_UNMATCHED_PARENTHESIS"/>
+      <member name="r_inexistent_subpattern_reference"
+              value="115"
+              c:identifier="G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE"/>
+      <member name="r_unterminated_comment"
+              value="118"
+              c:identifier="G_REGEX_ERROR_UNTERMINATED_COMMENT"/>
+      <member name="r_expression_too_large"
+              value="120"
+              c:identifier="G_REGEX_ERROR_EXPRESSION_TOO_LARGE"/>
+      <member name="r_memory_error"
+              value="121"
+              c:identifier="G_REGEX_ERROR_MEMORY_ERROR"/>
+      <member name="r_variable_length_lookbehind"
+              value="125"
+              c:identifier="G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND"/>
+      <member name="r_malformed_condition"
+              value="126"
+              c:identifier="G_REGEX_ERROR_MALFORMED_CONDITION"/>
+      <member name="r_too_many_conditional_branches"
+              value="127"
+              c:identifier="G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES"/>
+      <member name="r_assertion_expected"
+              value="128"
+              c:identifier="G_REGEX_ERROR_ASSERTION_EXPECTED"/>
+      <member name="r_unknown_posix_class_name"
+              value="130"
+              c:identifier="G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME"/>
+      <member name="r_posix_collating_elements_not_supported"
+              value="131"
+              c:identifier="G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED"/>
+      <member name="r_hex_code_too_large"
+              value="134"
+              c:identifier="G_REGEX_ERROR_HEX_CODE_TOO_LARGE"/>
+      <member name="r_invalid_condition"
+              value="135"
+              c:identifier="G_REGEX_ERROR_INVALID_CONDITION"/>
+      <member name="r_single_byte_match_in_lookbehind"
+              value="136"
+              c:identifier="G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND"/>
+      <member name="r_infinite_loop"
+              value="140"
+              c:identifier="G_REGEX_ERROR_INFINITE_LOOP"/>
+      <member name="r_missing_subpattern_name_terminator"
+              value="142"
+              c:identifier="G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR"/>
+      <member name="r_duplicate_subpattern_name"
+              value="143"
+              c:identifier="G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME"/>
+      <member name="r_malformed_property"
+              value="146"
+              c:identifier="G_REGEX_ERROR_MALFORMED_PROPERTY"/>
+      <member name="r_unknown_property"
+              value="147"
+              c:identifier="G_REGEX_ERROR_UNKNOWN_PROPERTY"/>
+      <member name="r_subpattern_name_too_long"
+              value="148"
+              c:identifier="G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG"/>
+      <member name="r_too_many_subpatterns"
+              value="149"
+              c:identifier="G_REGEX_ERROR_TOO_MANY_SUBPATTERNS"/>
+      <member name="r_invalid_octal_value"
+              value="151"
+              c:identifier="G_REGEX_ERROR_INVALID_OCTAL_VALUE"/>
+      <member name="r_too_many_branches_in_define"
+              value="154"
+              c:identifier="G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE"/>
+      <member name="r_define_repetion"
+              value="155"
+              c:identifier="G_REGEX_ERROR_DEFINE_REPETION"/>
+      <member name="r_inconsistent_newline_options"
+              value="156"
+              c:identifier="G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS"/>
+      <member name="r_missing_back_reference"
+              value="157"
+              c:identifier="G_REGEX_ERROR_MISSING_BACK_REFERENCE"/>
+    </enumeration>
     <function name="regex_error_quark" c:identifier="g_regex_error_quark">
       <return-value>
         <type name="GQuark" c:type="GQuark"/>
       </return-value>
     </function>
+    <enumeration name="GRegexCompileFlags" c:type="GRegexCompileFlags">
+      <member name="aseless" value="1" c:identifier="G_REGEX_CASELESS"/>
+      <member name="multiline" value="2" c:identifier="G_REGEX_MULTILINE"/>
+      <member name="dotall" value="4" c:identifier="G_REGEX_DOTALL"/>
+      <member name="extended" value="8" c:identifier="G_REGEX_EXTENDED"/>
+      <member name="anchored" value="16" c:identifier="G_REGEX_ANCHORED"/>
+      <member name="dollar_endonly"
+              value="32"
+              c:identifier="G_REGEX_DOLLAR_ENDONLY"/>
+      <member name="ungreedy" value="512" c:identifier="G_REGEX_UNGREEDY"/>
+      <member name="raw" value="2048" c:identifier="G_REGEX_RAW"/>
+      <member name="no_auto_capture"
+              value="4096"
+              c:identifier="G_REGEX_NO_AUTO_CAPTURE"/>
+      <member name="optimize" value="8192" c:identifier="G_REGEX_OPTIMIZE"/>
+      <member name="dupnames" value="524288" c:identifier="G_REGEX_DUPNAMES"/>
+      <member name="newline_cr"
+              value="1048576"
+              c:identifier="G_REGEX_NEWLINE_CR"/>
+      <member name="newline_lf"
+              value="2097152"
+              c:identifier="G_REGEX_NEWLINE_LF"/>
+      <member name="newline_crlf"
+              value="3145728"
+              c:identifier="G_REGEX_NEWLINE_CRLF"/>
+    </enumeration>
+    <enumeration name="GRegexMatchFlags" c:type="GRegexMatchFlags">
+      <member name="anchored"
+              value="16"
+              c:identifier="G_REGEX_MATCH_ANCHORED"/>
+      <member name="notbol" value="128" c:identifier="G_REGEX_MATCH_NOTBOL"/>
+      <member name="noteol" value="256" c:identifier="G_REGEX_MATCH_NOTEOL"/>
+      <member name="notempty"
+              value="1024"
+              c:identifier="G_REGEX_MATCH_NOTEMPTY"/>
+      <member name="partial"
+              value="32768"
+              c:identifier="G_REGEX_MATCH_PARTIAL"/>
+      <member name="newline_cr"
+              value="1048576"
+              c:identifier="G_REGEX_MATCH_NEWLINE_CR"/>
+      <member name="newline_lf"
+              value="2097152"
+              c:identifier="G_REGEX_MATCH_NEWLINE_LF"/>
+      <member name="newline_crlf"
+              value="3145728"
+              c:identifier="G_REGEX_MATCH_NEWLINE_CRLF"/>
+      <member name="newline_any"
+              value="4194304"
+              c:identifier="G_REGEX_MATCH_NEWLINE_ANY"/>
+    </enumeration>
     <record name="Regex" c:type="GRegex"/>
     <record name="MatchInfo" c:type="GMatchInfo"/>
     <callback name="GRegexEvalCallback">
@@ -14572,6 +15534,56 @@
         </parameter>
       </parameters>
     </callback>
+    <enumeration name="GErrorType" c:type="GErrorType">
+      <member name="_unknown" value="0" c:identifier="G_ERR_UNKNOWN"/>
+      <member name="_unexp_eof" value="1" c:identifier="G_ERR_UNEXP_EOF"/>
+      <member name="_unexp_eof_in_string"
+              value="2"
+              c:identifier="G_ERR_UNEXP_EOF_IN_STRING"/>
+      <member name="_unexp_eof_in_comment"
+              value="3"
+              c:identifier="G_ERR_UNEXP_EOF_IN_COMMENT"/>
+      <member name="_non_digit_in_const"
+              value="4"
+              c:identifier="G_ERR_NON_DIGIT_IN_CONST"/>
+      <member name="_digit_radix" value="5" c:identifier="G_ERR_DIGIT_RADIX"/>
+      <member name="_float_radix" value="6" c:identifier="G_ERR_FLOAT_RADIX"/>
+      <member name="_float_malformed"
+              value="7"
+              c:identifier="G_ERR_FLOAT_MALFORMED"/>
+    </enumeration>
+    <enumeration name="GTokenType" c:type="GTokenType">
+      <member name="eof" value="0" c:identifier="G_TOKEN_EOF"/>
+      <member name="left_paren" value="0" c:identifier="G_TOKEN_LEFT_PAREN"/>
+      <member name="right_paren" value="0" c:identifier="G_TOKEN_RIGHT_PAREN"/>
+      <member name="left_curly" value="0" c:identifier="G_TOKEN_LEFT_CURLY"/>
+      <member name="right_curly" value="0" c:identifier="G_TOKEN_RIGHT_CURLY"/>
+      <member name="left_brace" value="0" c:identifier="G_TOKEN_LEFT_BRACE"/>
+      <member name="right_brace" value="0" c:identifier="G_TOKEN_RIGHT_BRACE"/>
+      <member name="equal_sign" value="0" c:identifier="G_TOKEN_EQUAL_SIGN"/>
+      <member name="comma" value="0" c:identifier="G_TOKEN_COMMA"/>
+      <member name="none" value="256" c:identifier="G_TOKEN_NONE"/>
+      <member name="error" value="257" c:identifier="G_TOKEN_ERROR"/>
+      <member name="char" value="258" c:identifier="G_TOKEN_CHAR"/>
+      <member name="binary" value="259" c:identifier="G_TOKEN_BINARY"/>
+      <member name="octal" value="260" c:identifier="G_TOKEN_OCTAL"/>
+      <member name="int" value="261" c:identifier="G_TOKEN_INT"/>
+      <member name="hex" value="262" c:identifier="G_TOKEN_HEX"/>
+      <member name="float" value="263" c:identifier="G_TOKEN_FLOAT"/>
+      <member name="string" value="264" c:identifier="G_TOKEN_STRING"/>
+      <member name="symbol" value="265" c:identifier="G_TOKEN_SYMBOL"/>
+      <member name="identifier" value="266" c:identifier="G_TOKEN_IDENTIFIER"/>
+      <member name="identifier_null"
+              value="267"
+              c:identifier="G_TOKEN_IDENTIFIER_NULL"/>
+      <member name="comment_single"
+              value="268"
+              c:identifier="G_TOKEN_COMMENT_SINGLE"/>
+      <member name="comment_multi"
+              value="269"
+              c:identifier="G_TOKEN_COMMENT_MULTI"/>
+      <member name="last" value="270" c:identifier="G_TOKEN_LAST"/>
+    </enumeration>
     <record name="GScannerConfig" c:type="_GScannerConfig">
       <field name="cset_skip_characters">
         <type name="string" c:type="gchar*"/>
@@ -15511,6 +16523,15 @@
         </parameter>
       </parameters>
     </function>
+    <enumeration name="GShellError" c:type="GShellError">
+      <member name="r_bad_quoting"
+              value="0"
+              c:identifier="G_SHELL_ERROR_BAD_QUOTING"/>
+      <member name="r_empty_string"
+              value="1"
+              c:identifier="G_SHELL_ERROR_EMPTY_STRING"/>
+      <member name="r_failed" value="2" c:identifier="G_SHELL_ERROR_FAILED"/>
+    </enumeration>
     <function name="shell_error_quark" c:identifier="g_shell_error_quark">
       <return-value>
         <type name="GQuark" c:type="GQuark"/>
@@ -15558,6 +16579,32 @@
         </parameter>
       </parameters>
     </function>
+    <enumeration name="GSpawnError" c:type="GSpawnError">
+      <member name="r_fork" value="0" c:identifier="G_SPAWN_ERROR_FORK"/>
+      <member name="r_read" value="1" c:identifier="G_SPAWN_ERROR_READ"/>
+      <member name="r_chdir" value="2" c:identifier="G_SPAWN_ERROR_CHDIR"/>
+      <member name="r_acces" value="3" c:identifier="G_SPAWN_ERROR_ACCES"/>
+      <member name="r_perm" value="4" c:identifier="G_SPAWN_ERROR_PERM"/>
+      <member name="r_2big" value="5" c:identifier="G_SPAWN_ERROR_2BIG"/>
+      <member name="r_noexec" value="6" c:identifier="G_SPAWN_ERROR_NOEXEC"/>
+      <member name="r_nametoolong"
+              value="7"
+              c:identifier="G_SPAWN_ERROR_NAMETOOLONG"/>
+      <member name="r_noent" value="8" c:identifier="G_SPAWN_ERROR_NOENT"/>
+      <member name="r_nomem" value="9" c:identifier="G_SPAWN_ERROR_NOMEM"/>
+      <member name="r_notdir" value="10" c:identifier="G_SPAWN_ERROR_NOTDIR"/>
+      <member name="r_loop" value="11" c:identifier="G_SPAWN_ERROR_LOOP"/>
+      <member name="r_txtbusy"
+              value="12"
+              c:identifier="G_SPAWN_ERROR_TXTBUSY"/>
+      <member name="r_io" value="13" c:identifier="G_SPAWN_ERROR_IO"/>
+      <member name="r_nfile" value="14" c:identifier="G_SPAWN_ERROR_NFILE"/>
+      <member name="r_mfile" value="15" c:identifier="G_SPAWN_ERROR_MFILE"/>
+      <member name="r_inval" value="16" c:identifier="G_SPAWN_ERROR_INVAL"/>
+      <member name="r_isdir" value="17" c:identifier="G_SPAWN_ERROR_ISDIR"/>
+      <member name="r_libbad" value="18" c:identifier="G_SPAWN_ERROR_LIBBAD"/>
+      <member name="r_failed" value="19" c:identifier="G_SPAWN_ERROR_FAILED"/>
+    </enumeration>
     <callback name="GSpawnChildSetupFunc">
       <return-value>
         <type name="none" c:type="void"/>
@@ -15568,6 +16615,27 @@
         </parameter>
       </parameters>
     </callback>
+    <enumeration name="GSpawnFlags" c:type="GSpawnFlags">
+      <member name="leave_descriptors_open"
+              value="1"
+              c:identifier="G_SPAWN_LEAVE_DESCRIPTORS_OPEN"/>
+      <member name="do_not_reap_child"
+              value="2"
+              c:identifier="G_SPAWN_DO_NOT_REAP_CHILD"/>
+      <member name="search_path" value="4" c:identifier="G_SPAWN_SEARCH_PATH"/>
+      <member name="stdout_to_dev_null"
+              value="8"
+              c:identifier="G_SPAWN_STDOUT_TO_DEV_NULL"/>
+      <member name="stderr_to_dev_null"
+              value="16"
+              c:identifier="G_SPAWN_STDERR_TO_DEV_NULL"/>
+      <member name="child_inherits_stdin"
+              value="32"
+              c:identifier="G_SPAWN_CHILD_INHERITS_STDIN"/>
+      <member name="ile_and_argv_zero"
+              value="64"
+              c:identifier="G_SPAWN_FILE_AND_ARGV_ZERO"/>
+    </enumeration>
     <function name="spawn_error_quark" c:identifier="g_spawn_error_quark">
       <return-value>
         <type name="GQuark" c:type="GQuark"/>
@@ -16512,6 +17580,17 @@
         </parameter>
       </parameters>
     </function>
+    <enumeration name="GTestTrapFlags" c:type="GTestTrapFlags">
+      <member name="silence_stdout"
+              value="128"
+              c:identifier="G_TEST_TRAP_SILENCE_STDOUT"/>
+      <member name="silence_stderr"
+              value="256"
+              c:identifier="G_TEST_TRAP_SILENCE_STDERR"/>
+      <member name="inherit_stdin"
+              value="512"
+              c:identifier="G_TEST_TRAP_INHERIT_STDIN"/>
+    </enumeration>
     <function name="test_trap_fork" c:identifier="g_test_trap_fork">
       <return-value>
         <type name="boolean" c:type="gboolean"/>
@@ -16815,6 +17894,26 @@
       </parameters>
     </function>
     <record name="TestConfig" c:type="GTestConfig"/>
+    <enumeration name="GTestLogType" c:type="GTestLogType">
+      <member name="none" value="0" c:identifier="G_TEST_LOG_NONE"/>
+      <member name="error" value="1" c:identifier="G_TEST_LOG_ERROR"/>
+      <member name="start_binary"
+              value="2"
+              c:identifier="G_TEST_LOG_START_BINARY"/>
+      <member name="list_case" value="3" c:identifier="G_TEST_LOG_LIST_CASE"/>
+      <member name="skip_case" value="4" c:identifier="G_TEST_LOG_SKIP_CASE"/>
+      <member name="start_case"
+              value="5"
+              c:identifier="G_TEST_LOG_START_CASE"/>
+      <member name="stop_case" value="6" c:identifier="G_TEST_LOG_STOP_CASE"/>
+      <member name="min_result"
+              value="7"
+              c:identifier="G_TEST_LOG_MIN_RESULT"/>
+      <member name="max_result"
+              value="8"
+              c:identifier="G_TEST_LOG_MAX_RESULT"/>
+      <member name="message" value="9" c:identifier="G_TEST_LOG_MESSAGE"/>
+    </enumeration>
     <record name="TestLogMsg" c:type="GTestLogMsg"/>
     <record name="TestLogBuffer" c:type="GTestLogBuffer"/>
     <function name="test_log_type_name" c:identifier="g_test_log_type_name">
diff --git a/gir/gobject-2.0.gir b/gir/gobject-2.0.gir
index 71fe684..f88f257 100644
--- a/gir/gobject-2.0.gir
+++ b/gir/gobject-2.0.gir
@@ -33,7 +33,7 @@
         <type name="uint32" c:type="guint"/>
       </field>
     </record>
-    <enumeration name="gtypedebugflags" c:type="GTypeDebugFlags">
+    <enumeration name="GTypeDebugFlags" c:type="GTypeDebugFlags">
       <member name="none" value="0" c:identifier="G_TYPE_DEBUG_NONE"/>
       <member name="objects" value="1" c:identifier="G_TYPE_DEBUG_OBJECTS"/>
       <member name="signals" value="2" c:identifier="G_TYPE_DEBUG_SIGNALS"/>
@@ -419,7 +419,7 @@
         </parameter>
       </parameters>
     </callback>
-    <enumeration name="gtypefundamentalflags" c:type="GTypeFundamentalFlags">
+    <enumeration name="GTypeFundamentalFlags" c:type="GTypeFundamentalFlags">
       <member name="lag_classed" value="1" c:identifier="G_TYPE_FLAG_CLASSED"/>
       <member name="lag_instantiatable"
               value="2"
@@ -431,7 +431,7 @@
               value="8"
               c:identifier="G_TYPE_FLAG_DEEP_DERIVABLE"/>
     </enumeration>
-    <enumeration name="gtypeflags" c:type="GTypeFlags">
+    <enumeration name="GTypeFlags" c:type="GTypeFlags">
       <member name="_abstract" value="16" c:identifier="G_TYPE_FLAG_ABSTRACT"/>
       <member name="_value_abstract"
               value="32"
@@ -454,7 +454,7 @@
         <type name="GClassFinalizeFunc" c:type="GClassFinalizeFunc"/>
       </field>
       <field name="class_data">
-        <type name="gconstpointer" c:type="gconstpointer"/>
+        <type name="any" c:type="gconstpointer"/>
       </field>
       <field name="instance_size">
         <type name="uint16" c:type="guint16"/>
@@ -1109,7 +1109,7 @@
           <type name="GType" c:type="GType"/>
         </parameter>
         <parameter name="src_boxed">
-          <type name="gconstpointer" c:type="gconstpointer"/>
+          <type name="any" c:type="gconstpointer"/>
         </parameter>
       </parameters>
     </function>
@@ -1135,7 +1135,7 @@
           <type name="GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="v_boxed">
-          <type name="gconstpointer" c:type="gconstpointer"/>
+          <type name="any" c:type="gconstpointer"/>
         </parameter>
       </parameters>
     </function>
@@ -1149,7 +1149,7 @@
           <type name="GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="v_boxed">
-          <type name="gconstpointer" c:type="gconstpointer"/>
+          <type name="any" c:type="gconstpointer"/>
         </parameter>
       </parameters>
     </function>
@@ -1199,7 +1199,7 @@
           <type name="GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="v_boxed">
-          <type name="gconstpointer" c:type="gconstpointer"/>
+          <type name="any" c:type="gconstpointer"/>
         </parameter>
       </parameters>
     </function>
@@ -1213,7 +1213,7 @@
           <type name="GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="v_boxed">
-          <type name="gconstpointer" c:type="gconstpointer"/>
+          <type name="any" c:type="gconstpointer"/>
         </parameter>
       </parameters>
     </function>
@@ -2518,7 +2518,7 @@
         </parameter>
       </parameters>
     </function>
-    <enumeration name="gparamflags" c:type="GParamFlags">
+    <enumeration name="GParamFlags" c:type="GParamFlags">
       <member name="readable" value="1" c:identifier="G_PARAM_READABLE"/>
       <member name="writable" value="2" c:identifier="G_PARAM_WRITABLE"/>
       <member name="construct" value="4" c:identifier="G_PARAM_CONSTRUCT"/>
@@ -3183,7 +3183,7 @@
         </parameter>
       </parameters>
     </callback>
-    <enumeration name="gsignalflags" c:type="GSignalFlags">
+    <enumeration name="GSignalFlags" c:type="GSignalFlags">
       <member name="run_first" value="1" c:identifier="G_SIGNAL_RUN_FIRST"/>
       <member name="run_last" value="2" c:identifier="G_SIGNAL_RUN_LAST"/>
       <member name="run_cleanup"
@@ -3194,11 +3194,11 @@
       <member name="action" value="32" c:identifier="G_SIGNAL_ACTION"/>
       <member name="no_hooks" value="64" c:identifier="G_SIGNAL_NO_HOOKS"/>
     </enumeration>
-    <enumeration name="gconnectflags" c:type="GConnectFlags">
+    <enumeration name="GConnectFlags" c:type="GConnectFlags">
       <member name="after" value="1" c:identifier="G_CONNECT_AFTER"/>
       <member name="swapped" value="2" c:identifier="G_CONNECT_SWAPPED"/>
     </enumeration>
-    <enumeration name="gsignalmatchtype" c:type="GSignalMatchType">
+    <enumeration name="GSignalMatchType" c:type="GSignalMatchType">
       <member name="id" value="1" c:identifier="G_SIGNAL_MATCH_ID"/>
       <member name="detail" value="2" c:identifier="G_SIGNAL_MATCH_DETAIL"/>
       <member name="closure" value="4" c:identifier="G_SIGNAL_MATCH_CLOSURE"/>
@@ -3279,43 +3279,6 @@
         </parameter>
       </parameters>
     </function>
-    <function name="signal_new_valist" c:identifier="g_signal_new_valist">
-      <return-value>
-        <type name="uint32" c:type="guint"/>
-      </return-value>
-      <parameters>
-        <parameter name="signal_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="itype">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="signal_flags">
-          <type name="GSignalFlags" c:type="GSignalFlags"/>
-        </parameter>
-        <parameter name="class_closure">
-          <type name="GClosure" c:type="GClosure*"/>
-        </parameter>
-        <parameter name="accumulator">
-          <type name="GSignalAccumulator" c:type="GSignalAccumulator"/>
-        </parameter>
-        <parameter name="accu_data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="c_marshaller">
-          <type name="GSignalCMarshaller" c:type="GSignalCMarshaller"/>
-        </parameter>
-        <parameter name="return_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="n_params">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="args">
-          <type name="va_list" c:type="va_list"/>
-        </parameter>
-      </parameters>
-    </function>
     <function name="signal_new" c:identifier="g_signal_new">
       <return-value>
         <type name="uint32" c:type="guint"/>
@@ -3369,25 +3332,6 @@
         </parameter>
       </parameters>
     </function>
-    <function name="signal_emit_valist" c:identifier="g_signal_emit_valist">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="instance">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="signal_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="detail">
-          <type name="GLib.GQuark" c:type="GQuark"/>
-        </parameter>
-        <parameter name="var_args">
-          <type name="va_list" c:type="va_list"/>
-        </parameter>
-      </parameters>
-    </function>
     <function name="signal_emit" c:identifier="g_signal_emit">
       <return-value>
         <type name="none" c:type="void"/>
@@ -4258,22 +4202,6 @@
         </parameter>
       </parameters>
     </function>
-    <function name="object_new_valist" c:identifier="g_object_new_valist">
-      <return-value>
-        <type name="Object" c:type="GObject*"/>
-      </return-value>
-      <parameters>
-        <parameter name="object_type">
-          <type name="GType" c:type="GType"/>
-        </parameter>
-        <parameter name="first_property_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="var_args">
-          <type name="va_list" c:type="va_list"/>
-        </parameter>
-      </parameters>
-    </function>
     <function name="object_set" c:identifier="g_object_set">
       <return-value>
         <type name="none" c:type="void"/>
@@ -4326,38 +4254,6 @@
         </parameter>
       </parameters>
     </function>
-    <function name="object_set_valist" c:identifier="g_object_set_valist">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="first_property_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="var_args">
-          <type name="va_list" c:type="va_list"/>
-        </parameter>
-      </parameters>
-    </function>
-    <function name="object_get_valist" c:identifier="g_object_get_valist">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="Object" c:type="GObject*"/>
-        </parameter>
-        <parameter name="first_property_name">
-          <type name="string" c:type="gchar*"/>
-        </parameter>
-        <parameter name="var_args">
-          <type name="va_list" c:type="va_list"/>
-        </parameter>
-      </parameters>
-    </function>
     <function name="object_set_property" c:identifier="g_object_set_property">
       <return-value>
         <type name="none" c:type="void"/>
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index a31239b..a08e0f1 100644
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -46,7 +46,7 @@ pre-check:
 	@if test "$(top_builddir)" != "$(top_srcdir)"; then \
 	   cp $(top_srcdir)/giscanner/*.py $(top_builddir)/giscanner; \
 	fi
-	@echo "Running parser checks..."
+	@echo "Running scanner checks..."
 
 check-local: pre-check check-utility.gir check-Foo.gir
 	@echo "======================="
-- 
2.7.4