Updated to Gtk 3.12

2014-11-03 15:52:55 +01:00 · 2014-11-03 15:52:55 +01:00 · d33628d632
commit d33628d632
parent 5fc657a39c
12 changed files with 8492 additions and 3518 deletions
--- a/atk/atk-api.raw
+++ b/atk/atk-api.raw
@ -138,6 +138,35 @@
      <member cname="ATK_ROLE_FORM" name="Form" />
      <member cname="ATK_ROLE_LINK" name="Link" />
      <member cname="ATK_ROLE_INPUT_METHOD_WINDOW" name="InputMethodWindow" />
      <member cname="ATK_ROLE_TABLE_ROW" name="TableRow" />
      <member cname="ATK_ROLE_TREE_ITEM" name="TreeItem" />
      <member cname="ATK_ROLE_DOCUMENT_SPREADSHEET" name="DocumentSpreadsheet" />
      <member cname="ATK_ROLE_DOCUMENT_PRESENTATION" name="DocumentPresentation" />
      <member cname="ATK_ROLE_DOCUMENT_TEXT" name="DocumentText" />
      <member cname="ATK_ROLE_DOCUMENT_WEB" name="DocumentWeb" />
      <member cname="ATK_ROLE_DOCUMENT_EMAIL" name="DocumentEmail" />
      <member cname="ATK_ROLE_COMMENT" name="Comment" />
      <member cname="ATK_ROLE_LIST_BOX" name="ListBox" />
      <member cname="ATK_ROLE_GROUPING" name="Grouping" />
      <member cname="ATK_ROLE_IMAGE_MAP" name="ImageMap" />
      <member cname="ATK_ROLE_NOTIFICATION" name="Notification" />
      <member cname="ATK_ROLE_INFO_BAR" name="InfoBar" />
      <member cname="ATK_ROLE_LEVEL_BAR" name="LevelBar" />
      <member cname="ATK_ROLE_TITLE_BAR" name="TitleBar" />
      <member cname="ATK_ROLE_BLOCK_QUOTE" name="BlockQuote" />
      <member cname="ATK_ROLE_AUDIO" name="Audio" />
      <member cname="ATK_ROLE_VIDEO" name="Video" />
      <member cname="ATK_ROLE_DEFINITION" name="Definition" />
      <member cname="ATK_ROLE_ARTICLE" name="Article" />
      <member cname="ATK_ROLE_LANDMARK" name="Landmark" />
      <member cname="ATK_ROLE_LOG" name="Log" />
      <member cname="ATK_ROLE_MARQUEE" name="Marquee" />
      <member cname="ATK_ROLE_MATH" name="Math" />
      <member cname="ATK_ROLE_RATING" name="Rating" />
      <member cname="ATK_ROLE_TIMER" name="Timer" />
      <member cname="ATK_ROLE_DESCRIPTION_LIST" name="DescriptionList" />
      <member cname="ATK_ROLE_DESCRIPTION_TERM" name="DescriptionTerm" />
      <member cname="ATK_ROLE_DESCRIPTION_VALUE" name="DescriptionValue" />
      <member cname="ATK_ROLE_LAST_DEFINED" name="LastDefined" />
    </enum>
    <enum name="StateType" cname="AtkStateType" gtype="atk_state_type_get_type" type="enum">
@ -180,6 +209,8 @@
      <member cname="ATK_STATE_DEFAULT" name="Default" />
      <member cname="ATK_STATE_ANIMATED" name="Animated" />
      <member cname="ATK_STATE_VISITED" name="Visited" />
      <member cname="ATK_STATE_CHECKABLE" name="Checkable" />
      <member cname="ATK_STATE_HAS_POPUP" name="HasPopup" />
      <member cname="ATK_STATE_LAST_DEFINED" name="LastDefined" />
    </enum>
    <enum name="TextAttribute" cname="AtkTextAttribute" gtype="atk_text_attribute_get_type" type="enum">
@ -228,6 +259,31 @@
      <member cname="ATK_TEXT_CLIP_MAX" name="Max" />
      <member cname="ATK_TEXT_CLIP_BOTH" name="Both" />
    </enum>
    <enum name="TextGranularity" cname="AtkTextGranularity" gtype="atk_text_granularity_get_type" type="enum">
      <member cname="ATK_TEXT_GRANULARITY_CHAR" name="Char" />
      <member cname="ATK_TEXT_GRANULARITY_WORD" name="Word" />
      <member cname="ATK_TEXT_GRANULARITY_SENTENCE" name="Sentence" />
      <member cname="ATK_TEXT_GRANULARITY_LINE" name="Line" />
      <member cname="ATK_TEXT_GRANULARITY_PARAGRAPH" name="Paragraph" />
    </enum>
    <enum name="ValueType" cname="AtkValueType" gtype="atk_value_type_get_type" type="enum">
      <member cname="ATK_VALUE_VERY_WEAK" name="VeryWeak" />
      <member cname="ATK_VALUE_WEAK" name="Weak" />
      <member cname="ATK_VALUE_ACCEPTABLE" name="Acceptable" />
      <member cname="ATK_VALUE_STRONG" name="Strong" />
      <member cname="ATK_VALUE_VERY_STRONG" name="VeryStrong" />
      <member cname="ATK_VALUE_VERY_LOW" name="VeryLow" />
      <member cname="ATK_VALUE_LOW" name="Low" />
      <member cname="ATK_VALUE_MEDIUM" name="Medium" />
      <member cname="ATK_VALUE_HIGH" name="High" />
      <member cname="ATK_VALUE_VERY_HIGH" name="VeryHigh" />
      <member cname="ATK_VALUE_VERY_BAD" name="VeryBad" />
      <member cname="ATK_VALUE_BAD" name="Bad" />
      <member cname="ATK_VALUE_GOOD" name="Good" />
      <member cname="ATK_VALUE_VERY_GOOD" name="VeryGood" />
      <member cname="ATK_VALUE_BEST" name="Best" />
      <member cname="ATK_VALUE_LAST_DEFINED" name="LastDefined" />
    </enum>
    <callback name="EventListener" cname="AtkEventListener">
      <return-type type="void" />
      <parameters>
@ -240,28 +296,28 @@
    <callback name="FocusHandler" cname="AtkFocusHandler">
      <return-type type="void" />
      <parameters>
-        <parameter type="AtkObject*" name="arg1" />
+        <parameter type="AtkObject*" name="object" />
-        <parameter type="gboolean" name="arg2" />
+        <parameter type="gboolean" name="focus_in" />
      </parameters>
    </callback>
    <callback name="Function" cname="AtkFunction">
      <return-type type="gboolean" />
      <parameters>
-        <parameter type="gpointer" name="data" />
+        <parameter type="gpointer" name="user_data" />
      </parameters>
    </callback>
    <callback name="KeySnoopFunc" cname="AtkKeySnoopFunc">
      <return-type type="gint" />
      <parameters>
        <parameter type="AtkKeyEventStruct*" name="event" />
-        <parameter type="gpointer" name="func_data" />
+        <parameter type="gpointer" name="user_data" />
      </parameters>
    </callback>
    <callback name="PropertyChangeHandler" cname="AtkPropertyChangeHandler">
      <return-type type="void" />
      <parameters>
-        <parameter type="AtkObject*" name="arg1" />
+        <parameter type="AtkObject*" name="obj" />
-        <parameter type="AtkPropertyValues*" name="arg2" />
+        <parameter type="AtkPropertyValues*" name="vals" />
      </parameters>
    </callback>
    <interface name="Action" cname="AtkAction">
@ -274,7 +330,6 @@
        <method vm="get_keybinding" />
        <method vm="set_description" />
        <method vm="get_localized_name" />
        <field name="Pad2" cname="pad2" type="AtkFunction" />
      </class_struct>
      <virtual_method name="DoAction" cname="do_action">
        <return-type type="gboolean" />
@ -287,19 +342,19 @@
        <parameters />
      </virtual_method>
      <virtual_method name="GetDescription" cname="get_description">
-        <return-type type="const-gchar*" />
+        <return-type type="gchar*" />
        <parameters>
          <parameter type="gint" name="i" />
        </parameters>
      </virtual_method>
      <virtual_method name="GetName" cname="get_name">
-        <return-type type="const-gchar*" />
+        <return-type type="gchar*" />
        <parameters>
          <parameter type="gint" name="i" />
        </parameters>
      </virtual_method>
      <virtual_method name="GetKeybinding" cname="get_keybinding">
-        <return-type type="const-gchar*" />
+        <return-type type="gchar*" />
        <parameters>
          <parameter type="gint" name="i" />
        </parameters>
@ -312,7 +367,7 @@
        </parameters>
      </virtual_method>
      <virtual_method name="GetLocalizedName" cname="get_localized_name">
-        <return-type type="const-gchar*" />
+        <return-type type="gchar*" />
        <parameters>
          <parameter type="gint" name="i" />
        </parameters>
@ -480,7 +535,7 @@
        <return-type type="gdouble" />
        <parameters />
      </virtual_method>
-      <method name="AddFocusHandler" cname="atk_component_add_focus_handler">
+      <method name="AddFocusHandler" cname="atk_component_add_focus_handler" deprecated="1">
        <return-type type="guint" />
        <parameters>
          <parameter type="AtkFocusHandler" name="handler" />
@ -513,21 +568,6 @@
      <method name="GetMdiZorder" cname="atk_component_get_mdi_zorder">
        <return-type type="gint" />
      </method>
      <method name="GetPosition" cname="atk_component_get_position">
        <return-type type="void" />
        <parameters>
          <parameter type="gint*" name="x" />
          <parameter type="gint*" name="y" />
          <parameter type="AtkCoordType" name="coord_type" />
        </parameters>
      </method>
      <method name="GetSize" cname="atk_component_get_size">
        <return-type type="void" />
        <parameters>
          <parameter type="gint*" name="width" />
          <parameter type="gint*" name="height" />
        </parameters>
      </method>
      <method name="GetType" cname="atk_component_get_type" shared="true">
        <return-type type="GType" />
      </method>
@ -542,7 +582,7 @@
          <parameter type="AtkCoordType" name="coord_type" />
        </parameters>
      </method>
-      <method name="RemoveFocusHandler" cname="atk_component_remove_focus_handler">
+      <method name="RemoveFocusHandler" cname="atk_component_remove_focus_handler" deprecated="1">
        <return-type type="void" />
        <parameters>
          <parameter type="guint" name="handler_id" />
@ -583,10 +623,8 @@
        <method vm="get_document_attributes" />
        <method vm="get_document_attribute_value" />
        <method vm="set_document_attribute" />
-        <field name="Pad1" cname="pad1" type="AtkFunction" />
+        <method vm="get_current_page_number" />
-        <field name="Pad2" cname="pad2" type="AtkFunction" />
+        <method vm="get_page_count" />
        <field name="Pad3" cname="pad3" type="AtkFunction" />
        <field name="Pad4" cname="pad4" type="AtkFunction" />
      </class_struct>
      <signal name="LoadComplete" cname="load_complete" when="LAST">
        <return-type type="void" />
@ -600,8 +638,14 @@
        <return-type type="void" />
        <parameters />
      </signal>
      <signal name="PageChanged" cname="page_changed" when="LAST">
        <return-type type="void" />
        <parameters>
          <parameter name="p0" type="gint32" />
        </parameters>
      </signal>
      <virtual_method name="GetDocumentType" cname="get_document_type">
-        <return-type type="const-gchar*" />
+        <return-type type="gchar*" />
        <parameters />
      </virtual_method>
      <virtual_method name="GetDocument" cname="get_document">
@ -609,7 +653,7 @@
        <parameters />
      </virtual_method>
      <virtual_method name="GetDocumentLocale" cname="get_document_locale">
-        <return-type type="const-gchar*" />
+        <return-type type="gchar*" />
        <parameters />
      </virtual_method>
      <virtual_method name="GetDocumentAttributes" cname="get_document_attributes">
@ -617,7 +661,7 @@
        <parameters />
      </virtual_method>
      <virtual_method name="GetDocumentAttributeValue" cname="get_document_attribute_value">
-        <return-type type="const-gchar*" />
+        <return-type type="gchar*" />
        <parameters>
          <parameter type="const-gchar*" name="attribute_name" />
        </parameters>
@ -629,6 +673,14 @@
          <parameter type="const-gchar*" name="attribute_value" />
        </parameters>
      </virtual_method>
      <virtual_method name="GetCurrentPageNumber" cname="get_current_page_number">
        <return-type type="gint" />
        <parameters />
      </virtual_method>
      <virtual_method name="GetPageCount" cname="get_page_count">
        <return-type type="gint" />
        <parameters />
      </virtual_method>
      <method name="GetAttributeValue" cname="atk_document_get_attribute_value">
        <return-type type="const-gchar*" />
        <parameters>
@ -638,15 +690,21 @@
      <method name="GetAttributes" cname="atk_document_get_attributes">
        <return-type type="AtkAttributeSet*" />
      </method>
-      <method name="GetDocument" cname="atk_document_get_document">
+      <method name="GetCurrentPageNumber" cname="atk_document_get_current_page_number">
        <return-type type="gint" />
      </method>
      <method name="GetDocument" cname="atk_document_get_document" deprecated="1">
        <return-type type="gpointer" />
      </method>
-      <method name="GetDocumentType" cname="atk_document_get_document_type">
+      <method name="GetDocumentType" cname="atk_document_get_document_type" deprecated="1">
        <return-type type="const-gchar*" />
      </method>
-      <method name="GetLocale" cname="atk_document_get_locale">
+      <method name="GetLocale" cname="atk_document_get_locale" deprecated="1">
        <return-type type="const-gchar*" />
      </method>
      <method name="GetPageCount" cname="atk_document_get_page_count">
        <return-type type="gint" />
      </method>
      <method name="GetType" cname="atk_document_get_type" shared="true">
        <return-type type="GType" />
      </method>
@ -668,8 +726,6 @@
        <method vm="cut_text" />
        <method vm="delete_text" />
        <method vm="paste_text" />
        <field name="Pad1" cname="pad1" type="AtkFunction" />
        <field name="Pad2" cname="pad2" type="AtkFunction" />
      </class_struct>
      <virtual_method name="SetRunAttributes" cname="set_run_attributes">
        <return-type type="gboolean" />
@ -777,7 +833,6 @@
      <class_struct cname="AtkHyperlinkImplIface">
        <field name="Parent" cname="parent" type="GTypeInterface" />
        <method vm="get_hyperlink" />
        <field name="Pad1" cname="pad1" type="AtkFunction" />
      </class_struct>
      <virtual_method name="GetHyperlink" cname="get_hyperlink">
        <return-type type="AtkHyperlink*" />
@ -797,9 +852,6 @@
        <method vm="get_n_links" />
        <method vm="get_link_index" />
        <method signal_vm="link_selected" />
        <field name="Pad1" cname="pad1" type="AtkFunction" />
        <field name="Pad2" cname="pad2" type="AtkFunction" />
        <field name="Pad3" cname="pad3" type="AtkFunction" />
      </class_struct>
      <signal name="LinkSelected" cname="link_selected" when="LAST" field_name="link_selected">
        <return-type type="void" />
@ -850,7 +902,6 @@
        <method vm="get_image_size" />
        <method vm="set_image_description" />
        <method vm="get_image_locale" />
        <field name="Pad1" cname="pad1" type="AtkFunction" />
      </class_struct>
      <virtual_method name="GetImagePosition" cname="get_image_position">
        <return-type type="void" />
@ -861,7 +912,7 @@
        </parameters>
      </virtual_method>
      <virtual_method name="GetImageDescription" cname="get_image_description">
-        <return-type type="const-gchar*" />
+        <return-type type="gchar*" />
        <parameters />
      </virtual_method>
      <virtual_method name="GetImageSize" cname="get_image_size">
@ -878,7 +929,7 @@
        </parameters>
      </virtual_method>
      <virtual_method name="GetImageLocale" cname="get_image_locale">
-        <return-type type="const-gchar*" />
+        <return-type type="gchar*" />
        <parameters />
      </virtual_method>
      <method name="GetImageDescription" cname="atk_image_get_image_description">
@ -939,8 +990,6 @@
        <method vm="remove_selection" />
        <method vm="select_all_selection" />
        <method signal_vm="selection_changed" />
        <field name="Pad1" cname="pad1" type="AtkFunction" />
        <field name="Pad2" cname="pad2" type="AtkFunction" />
      </class_struct>
      <signal name="SelectionChanged" cname="selection_changed" when="LAST" field_name="selection_changed">
        <return-type type="void" />
@ -1035,7 +1084,7 @@
        <parameters />
      </virtual_method>
      <virtual_method name="GetMimeType" cname="get_mime_type">
-        <return-type type="const-gchar*" />
+        <return-type type="gchar*" />
        <parameters>
          <parameter type="gint" name="i" />
        </parameters>
@ -1047,7 +1096,7 @@
        </parameters>
      </virtual_method>
      <virtual_method name="GetUri" cname="get_uri">
-        <return-type type="const-gchar*" />
+        <return-type type="gchar*" />
        <parameters>
          <parameter type="const-gchar*" name="mime_type" />
        </parameters>
@ -1071,7 +1120,7 @@
        <return-type type="GType" />
      </method>
      <method name="GetUri" cname="atk_streamable_content_get_uri">
-        <return-type type="gchar*" />
+        <return-type type="const-gchar*" />
        <parameters>
          <parameter type="const-gchar*" name="mime_type" />
        </parameters>
@ -1116,10 +1165,6 @@
        <method signal_vm="row_reordered" />
        <method signal_vm="column_reordered" />
        <method signal_vm="model_changed" />
        <field name="Pad1" cname="pad1" type="AtkFunction" />
        <field name="Pad2" cname="pad2" type="AtkFunction" />
        <field name="Pad3" cname="pad3" type="AtkFunction" />
        <field name="Pad4" cname="pad4" type="AtkFunction" />
      </class_struct>
      <signal name="RowInserted" cname="row_inserted" when="LAST" field_name="row_inserted">
        <return-type type="void" />
@ -1214,7 +1259,7 @@
        <parameters />
      </virtual_method>
      <virtual_method name="GetColumnDescription" cname="get_column_description">
-        <return-type type="const-gchar*" />
+        <return-type type="gchar*" />
        <parameters>
          <parameter type="gint" name="column" />
        </parameters>
@ -1226,7 +1271,7 @@
        </parameters>
      </virtual_method>
      <virtual_method name="GetRowDescription" cname="get_row_description">
-        <return-type type="const-gchar*" />
+        <return-type type="gchar*" />
        <parameters>
          <parameter type="gint" name="row" />
        </parameters>
@ -1351,7 +1396,7 @@
      <method name="GetCaption" cname="atk_table_get_caption">
        <return-type type="AtkObject*" />
      </method>
-      <method name="GetColumnAtIndex" cname="atk_table_get_column_at_index">
+      <method name="GetColumnAtIndex" cname="atk_table_get_column_at_index" deprecated="1">
        <return-type type="gint" />
        <parameters>
          <parameter type="gint" name="index_" />
@ -1376,20 +1421,13 @@
          <parameter type="gint" name="column" />
        </parameters>
      </method>
      <method name="GetIndexAt" cname="atk_table_get_index_at">
        <return-type type="gint" />
        <parameters>
          <parameter type="gint" name="row" />
          <parameter type="gint" name="column" />
        </parameters>
      </method>
      <method name="GetNColumns" cname="atk_table_get_n_columns">
        <return-type type="gint" />
      </method>
      <method name="GetNRows" cname="atk_table_get_n_rows">
        <return-type type="gint" />
      </method>
-      <method name="GetRowAtIndex" cname="atk_table_get_row_at_index">
+      <method name="GetRowAtIndex" cname="atk_table_get_row_at_index" deprecated="1">
        <return-type type="gint" />
        <parameters>
          <parameter type="gint" name="index_" />
@ -1511,6 +1549,88 @@
        </parameters>
      </method>
    </interface>
    <interface name="TableCell" cname="AtkTableCell">
      <class_struct cname="AtkTableCellIface">
        <field name="Parent" cname="parent" type="GTypeInterface" />
        <method vm="get_column_span" />
        <method vm="get_column_header_cells" />
        <method vm="get_position" />
        <method vm="get_row_span" />
        <method vm="get_row_header_cells" />
        <method vm="get_row_column_span" />
        <method vm="get_table" />
      </class_struct>
      <virtual_method name="GetColumnSpan" cname="get_column_span">
        <return-type type="gint" />
        <parameters />
      </virtual_method>
      <virtual_method name="GetColumnHeaderCells" cname="get_column_header_cells">
        <return-type type="GPtrArray*" />
        <parameters />
      </virtual_method>
      <virtual_method name="GetPosition" cname="get_position">
        <return-type type="gboolean" />
        <parameters>
          <parameter type="gint*" name="row" />
          <parameter type="gint*" name="column" />
        </parameters>
      </virtual_method>
      <virtual_method name="GetRowSpan" cname="get_row_span">
        <return-type type="gint" />
        <parameters />
      </virtual_method>
      <virtual_method name="GetRowHeaderCells" cname="get_row_header_cells">
        <return-type type="GPtrArray*" />
        <parameters />
      </virtual_method>
      <virtual_method name="GetRowColumnSpan" cname="get_row_column_span">
        <return-type type="gboolean" />
        <parameters>
          <parameter type="gint*" name="row" />
          <parameter type="gint*" name="column" />
          <parameter type="gint*" name="row_span" />
          <parameter type="gint*" name="column_span" />
        </parameters>
      </virtual_method>
      <virtual_method name="GetTable" cname="get_table">
        <return-type type="AtkObject*" />
        <parameters />
      </virtual_method>
      <method name="GetColumnHeaderCells" cname="atk_table_cell_get_column_header_cells">
        <return-type type="GPtrArray*" />
      </method>
      <method name="GetColumnSpan" cname="atk_table_cell_get_column_span">
        <return-type type="gint" />
      </method>
      <method name="GetPosition" cname="atk_table_cell_get_position">
        <return-type type="gboolean" />
        <parameters>
          <parameter type="gint*" name="row" />
          <parameter type="gint*" name="column" />
        </parameters>
      </method>
      <method name="GetRowColumnSpan" cname="atk_table_cell_get_row_column_span">
        <return-type type="gboolean" />
        <parameters>
          <parameter type="gint*" name="row" />
          <parameter type="gint*" name="column" />
          <parameter type="gint*" name="row_span" />
          <parameter type="gint*" name="column_span" />
        </parameters>
      </method>
      <method name="GetRowHeaderCells" cname="atk_table_cell_get_row_header_cells">
        <return-type type="GPtrArray*" />
      </method>
      <method name="GetRowSpan" cname="atk_table_cell_get_row_span">
        <return-type type="gint" />
      </method>
      <method name="GetTable" cname="atk_table_cell_get_table">
        <return-type type="AtkObject*" />
      </method>
      <method name="GetType" cname="atk_table_cell_get_type" shared="true">
        <return-type type="GType" />
      </method>
    </interface>
    <interface name="Text" cname="AtkText">
      <class_struct cname="AtkTextIface">
        <field name="Parent" cname="parent" type="GTypeInterface" />
@ -1537,7 +1657,7 @@
        <method signal_vm="text_attributes_changed" />
        <method vm="get_range_extents" />
        <method vm="get_bounded_ranges" />
-        <field name="Pad4" cname="pad4" type="AtkFunction" />
+        <method vm="get_string_at_offset" />
      </class_struct>
      <signal name="TextChanged" cname="text_changed" when="LAST" field_name="text_changed">
        <return-type type="void" />
@ -1546,6 +1666,22 @@
          <parameter type="gint" name="length" />
        </parameters>
      </signal>
      <signal name="TextInsert" cname="text_insert" when="LAST">
        <return-type type="void" />
        <parameters>
          <parameter name="p0" type="gint32" />
          <parameter name="p1" type="gint32" />
          <parameter name="p2" type="gchar*" />
        </parameters>
      </signal>
      <signal name="TextRemove" cname="text_remove" when="LAST">
        <return-type type="void" />
        <parameters>
          <parameter name="p0" type="gint32" />
          <parameter name="p1" type="gint32" />
          <parameter name="p2" type="gchar*" />
        </parameters>
      </signal>
      <signal name="TextCaretMoved" cname="text_caret_moved" when="LAST" field_name="text_caret_moved">
        <return-type type="void" />
        <parameters>
@ -1696,6 +1832,15 @@
          <parameter type="AtkTextClipType" name="y_clip_type" />
        </parameters>
      </virtual_method>
      <virtual_method name="GetStringAtOffset" cname="get_string_at_offset">
        <return-type type="gchar*" />
        <parameters>
          <parameter type="gint" name="offset" />
          <parameter type="AtkTextGranularity" name="granularity" />
          <parameter type="gint*" name="start_offset" />
          <parameter type="gint*" name="end_offset" />
        </parameters>
      </virtual_method>
      <method name="AddSelection" cname="atk_text_add_selection">
        <return-type type="gboolean" />
        <parameters>
@ -1805,6 +1950,15 @@
          <parameter type="gint*" name="end_offset" />
        </parameters>
      </method>
      <method name="GetStringAtOffset" cname="atk_text_get_string_at_offset">
        <return-type type="gchar*" />
        <parameters>
          <parameter type="gint" name="offset" />
          <parameter type="AtkTextGranularity" name="granularity" />
          <parameter type="gint*" name="start_offset" />
          <parameter type="gint*" name="end_offset" />
        </parameters>
      </method>
      <method name="GetText" cname="atk_text_get_text">
        <return-type type="gchar*" />
        <parameters>
@ -1812,33 +1966,6 @@
          <parameter type="gint" name="end_offset" />
        </parameters>
      </method>
      <method name="GetTextAfterOffset" cname="atk_text_get_text_after_offset">
        <return-type type="gchar*" />
        <parameters>
          <parameter type="gint" name="offset" />
          <parameter type="AtkTextBoundary" name="boundary_type" />
          <parameter type="gint*" name="start_offset" />
          <parameter type="gint*" name="end_offset" />
        </parameters>
      </method>
      <method name="GetTextAtOffset" cname="atk_text_get_text_at_offset">
        <return-type type="gchar*" />
        <parameters>
          <parameter type="gint" name="offset" />
          <parameter type="AtkTextBoundary" name="boundary_type" />
          <parameter type="gint*" name="start_offset" />
          <parameter type="gint*" name="end_offset" />
        </parameters>
      </method>
      <method name="GetTextBeforeOffset" cname="atk_text_get_text_before_offset">
        <return-type type="gchar*" />
        <parameters>
          <parameter type="gint" name="offset" />
          <parameter type="AtkTextBoundary" name="boundary_type" />
          <parameter type="gint*" name="start_offset" />
          <parameter type="gint*" name="end_offset" />
        </parameters>
      </method>
      <method name="GetType" cname="atk_text_get_type" shared="true">
        <return-type type="GType" />
      </method>
@ -1871,8 +1998,19 @@
        <method vm="get_minimum_value" />
        <method vm="set_current_value" />
        <method vm="get_minimum_increment" />
-        <field name="Pad1" cname="pad1" type="AtkFunction" />
+        <method vm="get_value_and_text" />
        <method vm="get_range" />
        <method vm="get_increment" />
        <method vm="get_sub_ranges" />
        <method vm="set_value" />
      </class_struct>
      <signal name="ValueChanged" cname="value_changed" when="LAST">
        <return-type type="void" />
        <parameters>
          <parameter name="p0" type="gdouble" />
          <parameter name="p1" type="gchar*" />
        </parameters>
      </signal>
      <virtual_method name="GetCurrentValue" cname="get_current_value">
        <return-type type="void" />
        <parameters>
@ -1903,39 +2041,76 @@
          <parameter type="GValue*" name="value" />
        </parameters>
      </virtual_method>
-      <method name="GetCurrentValue" cname="atk_value_get_current_value">
+      <virtual_method name="GetValueAndText" cname="get_value_and_text">
        <return-type type="void" />
        <parameters>
-          <parameter type="GValue*" name="value" />
+          <parameter type="gdouble*" name="value" />
          <parameter type="gchar**" name="text" />
        </parameters>
      </virtual_method>
      <virtual_method name="GetRange" cname="get_range">
        <return-type type="AtkRange*" />
        <parameters />
      </virtual_method>
      <virtual_method name="GetIncrement" cname="get_increment">
        <return-type type="gdouble" />
        <parameters />
      </virtual_method>
      <virtual_method name="GetSubRanges" cname="get_sub_ranges">
        <return-type type="GSList*" />
        <parameters />
      </virtual_method>
      <virtual_method name="SetValue" cname="set_value">
        <return-type type="void" />
        <parameters>
          <parameter type="const-gdouble" name="new_value" />
        </parameters>
      </virtual_method>
      <method name="GetIncrement" cname="atk_value_get_increment">
        <return-type type="gdouble" />
      </method>
-      <method name="GetMaximumValue" cname="atk_value_get_maximum_value">
+      <method name="GetRange" cname="atk_value_get_range">
-        <return-type type="void" />
+        <return-type type="AtkRange*" />
        <parameters>
          <parameter type="GValue*" name="value" />
        </parameters>
      </method>
-      <method name="GetMinimumIncrement" cname="atk_value_get_minimum_increment">
+      <method name="GetSubRanges" cname="atk_value_get_sub_ranges">
-        <return-type type="void" />
+        <return-type type="GSList*" />
        <parameters>
          <parameter type="GValue*" name="value" />
        </parameters>
      </method>
      <method name="GetMinimumValue" cname="atk_value_get_minimum_value">
        <return-type type="void" />
        <parameters>
          <parameter type="GValue*" name="value" />
        </parameters>
      </method>
      <method name="GetType" cname="atk_value_get_type" shared="true">
        <return-type type="GType" />
      </method>
-      <method name="SetCurrentValue" cname="atk_value_set_current_value">
+      <method name="GetValueAndText" cname="atk_value_get_value_and_text">
-        <return-type type="gboolean" />
+        <return-type type="void" />
        <parameters>
-          <parameter type="const-GValue*" name="value" />
+          <parameter type="gdouble*" name="value" />
          <parameter type="gchar**" name="text" />
        </parameters>
      </method>
      <method name="SetValue" cname="atk_value_set_value">
        <return-type type="void" />
        <parameters>
          <parameter type="const-gdouble" name="new_value" />
        </parameters>
      </method>
      <method name="TypeGetLocalizedName" cname="atk_value_type_get_localized_name" shared="true">
        <return-type type="const-gchar*" />
        <parameters>
          <parameter type="AtkValueType" name="value_type" />
        </parameters>
      </method>
      <method name="TypeGetName" cname="atk_value_type_get_name" shared="true">
        <return-type type="const-gchar*" />
        <parameters>
          <parameter type="AtkValueType" name="value_type" />
        </parameters>
      </method>
    </interface>
    <interface name="Window" cname="AtkWindow">
      <class_struct cname="AtkWindowIface">
        <field name="Parent" cname="parent" type="GTypeInterface" />
      </class_struct>
      <method name="GetType" cname="atk_window_get_type" shared="true">
        <return-type type="GType" />
      </method>
    </interface>
    <object name="GObjectAccessible" cname="AtkGObjectAccessible" parent="AtkObject">
      <class_struct cname="AtkGObjectAccessibleClass">
@ -2066,16 +2241,16 @@
        <return-type type="void" />
        <parameters />
      </virtual_method>
-      <method name="GetInstance" cname="atk_misc_get_instance" shared="true">
+      <method name="GetInstance" cname="atk_misc_get_instance" deprecated="1" shared="true">
        <return-type type="const-AtkMisc*" />
      </method>
      <method name="GetType" cname="atk_misc_get_type" shared="true">
        <return-type type="GType" />
      </method>
-      <method name="ThreadsEnter" cname="atk_misc_threads_enter">
+      <method name="ThreadsEnter" cname="atk_misc_threads_enter" deprecated="1">
        <return-type type="void" />
      </method>
-      <method name="ThreadsLeave" cname="atk_misc_threads_leave">
+      <method name="ThreadsLeave" cname="atk_misc_threads_leave" deprecated="1">
        <return-type type="void" />
      </method>
    </object>
@ -2090,10 +2265,12 @@
        <interface cname="AtkImage" />
        <interface cname="AtkSelection" />
        <interface cname="AtkTable" />
        <interface cname="AtkTableCell" />
        <interface cname="AtkText" />
        <interface cname="AtkHypertext" />
        <interface cname="AtkValue" />
        <interface cname="AtkDocument" />
        <interface cname="AtkWindow" />
      </implements>
      <method name="GetType" cname="atk_no_op_object_get_type" shared="true">
        <return-type type="GType" />
@ -2141,8 +2318,8 @@
        <method signal_vm="visible_data_changed" />
        <method signal_vm="active_descendant_changed" />
        <method vm="get_attributes" />
        <method vm="get_object_locale" />
        <field name="Pad1" cname="pad1" type="AtkFunction" />
        <field name="Pad2" cname="pad2" type="AtkFunction" />
      </class_struct>
      <field name="Description" cname="description" type="gchar*" />
      <field name="Name" cname="name" type="gchar*" />
@ -2202,11 +2379,11 @@
        </parameters>
      </signal>
      <virtual_method name="GetName" cname="get_name">
-        <return-type type="const-gchar*" />
+        <return-type type="gchar*" />
        <parameters />
      </virtual_method>
      <virtual_method name="GetDescription" cname="get_description">
-        <return-type type="const-gchar*" />
+        <return-type type="gchar*" />
        <parameters />
      </virtual_method>
      <virtual_method name="GetParent" cname="get_parent">
@ -2293,6 +2470,10 @@
        <return-type type="AtkAttributeSet*" />
        <parameters />
      </virtual_method>
      <virtual_method name="GetObjectLocale" cname="get_object_locale">
        <return-type type="gchar*" />
        <parameters />
      </virtual_method>
      <method name="AddRelationship" cname="atk_object_add_relationship">
        <return-type type="gboolean" />
        <parameters>
@ -2300,7 +2481,7 @@
          <parameter type="AtkObject*" name="target" />
        </parameters>
      </method>
-      <method name="ConnectPropertyChangeHandler" cname="atk_object_connect_property_change_handler">
+      <method name="ConnectPropertyChangeHandler" cname="atk_object_connect_property_change_handler" deprecated="1">
        <return-type type="guint" />
        <parameters>
          <parameter type="AtkPropertyChangeHandler*" name="handler" />
@ -2315,18 +2496,15 @@
      <method name="GetIndexInParent" cname="atk_object_get_index_in_parent">
        <return-type type="gint" />
      </method>
      <method name="GetLayer" cname="atk_object_get_layer" deprecated="1">
        <return-type type="AtkLayer" />
      </method>
      <method name="GetMdiZorder" cname="atk_object_get_mdi_zorder" deprecated="1">
        <return-type type="gint" />
      </method>
      <method name="GetNAccessibleChildren" cname="atk_object_get_n_accessible_children">
        <return-type type="gint" />
      </method>
      <method name="GetName" cname="atk_object_get_name">
        <return-type type="const-gchar*" />
      </method>
      <method name="GetObjectLocale" cname="atk_object_get_object_locale">
        <return-type type="const-gchar*" />
      </method>
      <method name="GetParent" cname="atk_object_get_parent">
        <return-type type="AtkObject*" />
      </method>
@ -2349,6 +2527,9 @@
          <parameter type="gboolean" name="value" />
        </parameters>
      </method>
      <method name="PeekParent" cname="atk_object_peek_parent">
        <return-type type="AtkObject*" />
      </method>
      <method name="RefAccessibleChild" cname="atk_object_ref_accessible_child">
        <return-type type="AtkObject*" />
        <parameters>
@ -2361,7 +2542,7 @@
      <method name="RefStateSet" cname="atk_object_ref_state_set">
        <return-type type="AtkStateSet*" />
      </method>
-      <method name="RemovePropertyChangeHandler" cname="atk_object_remove_property_change_handler">
+      <method name="RemovePropertyChangeHandler" cname="atk_object_remove_property_change_handler" deprecated="1">
        <return-type type="void" />
        <parameters>
          <parameter type="guint" name="handler_id" />
@ -2567,6 +2748,13 @@
          <parameter type="AtkRelationType" name="relationship" />
        </parameters>
      </method>
      <method name="ContainsTarget" cname="atk_relation_set_contains_target">
        <return-type type="gboolean" />
        <parameters>
          <parameter type="AtkRelationType" name="relationship" />
          <parameter type="AtkObject*" name="target" />
        </parameters>
      </method>
      <method name="GetNRelations" cname="atk_relation_set_get_n_relations">
        <return-type type="gint" />
      </method>
@ -2728,10 +2916,10 @@
        <return-type type="AtkObject*" />
      </virtual_method>
      <virtual_method name="GetToolkitName" cname="get_toolkit_name" shared="true">
-        <return-type type="const-gchar*" />
+        <return-type type="gchar*" />
      </virtual_method>
      <virtual_method name="GetToolkitVersion" cname="get_toolkit_version" shared="true">
-        <return-type type="const-gchar*" />
+        <return-type type="gchar*" />
      </virtual_method>
      <method name="GetType" cname="atk_util_get_type" shared="true">
        <return-type type="GType" />
@ -2762,6 +2950,33 @@
      <field name="OldValue" cname="old_value" type="GValue" />
      <field name="NewValue" cname="new_value" type="GValue" />
    </struct>
    <boxed name="Range" cname="AtkRange" opaque="true">
      <method name="Copy" cname="atk_range_copy">
        <return-type type="AtkRange*" owned="true" />
      </method>
      <method name="Free" cname="atk_range_free">
        <return-type type="void" />
      </method>
      <method name="GetDescription" cname="atk_range_get_description">
        <return-type type="const-gchar*" />
      </method>
      <method name="GetLowerLimit" cname="atk_range_get_lower_limit">
        <return-type type="gdouble" />
      </method>
      <method name="GetType" cname="atk_range_get_type" shared="true">
        <return-type type="GType" />
      </method>
      <method name="GetUpperLimit" cname="atk_range_get_upper_limit">
        <return-type type="gdouble" />
      </method>
      <constructor cname="atk_range_new">
        <parameters>
          <parameter type="gdouble" name="lower_limit" />
          <parameter type="gdouble" name="upper_limit" />
          <parameter type="const-gchar*" name="description" />
        </parameters>
      </constructor>
    </boxed>
    <struct name="RealStateSet" cname="AtkRealStateSet" opaque="true" />
    <boxed name="Rectangle" cname="AtkRectangle">
      <field name="X" cname="x" type="gint" />
@ -2773,21 +2988,25 @@
      </method>
    </boxed>
    <alias name="State" cname="AtkState" type="guint64" />
-    <struct name="TextRange" cname="AtkTextRange">
+    <boxed name="TextRange" cname="AtkTextRange">
      <field name="Bounds" cname="bounds" type="AtkTextRectangle" />
      <field name="StartOffset" cname="start_offset" type="gint" />
      <field name="EndOffset" cname="end_offset" type="gint" />
      <field name="Content" cname="content" type="gchar*" />
-    </struct>
+      <method name="GetType" cname="atk_text_range_get_type" shared="true">
        <return-type type="GType" />
      </method>
    </boxed>
    <struct name="TextRectangle" cname="AtkTextRectangle">
      <field name="X" cname="x" type="gint" />
      <field name="Y" cname="y" type="gint" />
      <field name="Width" cname="width" type="gint" />
      <field name="Height" cname="height" type="gint" />
    </struct>
    <struct name="UtilListenerInfo" cname="AtkUtilListenerInfo" opaque="true" />
    <struct name="FocusTracker" cname="FocusTracker" opaque="true" />
    <class name="Global" cname="AtkGlobal">
-      <method name="AddFocusTracker" cname="atk_add_focus_tracker" shared="true">
+      <method name="AddFocusTracker" cname="atk_add_focus_tracker" deprecated="1" shared="true">
        <return-type type="guint" />
        <parameters>
          <parameter type="AtkEventListener" name="focus_tracker" />
@ -2807,12 +3026,27 @@
          <parameter type="gpointer" name="data" />
        </parameters>
      </method>
      <method name="GetBinaryAge" cname="atk_get_binary_age" shared="true">
        <return-type type="guint" />
      </method>
      <method name="GetDefaultRegistry" cname="atk_get_default_registry" shared="true">
        <return-type type="AtkRegistry*" />
      </method>
      <method name="GetFocusObject" cname="atk_get_focus_object" shared="true">
        <return-type type="AtkObject*" />
      </method>
      <method name="GetInterfaceAge" cname="atk_get_interface_age" shared="true">
        <return-type type="guint" />
      </method>
      <method name="GetMajorVersion" cname="atk_get_major_version" shared="true">
        <return-type type="guint" />
      </method>
      <method name="GetMicroVersion" cname="atk_get_micro_version" shared="true">
        <return-type type="guint" />
      </method>
      <method name="GetMinorVersion" cname="atk_get_minor_version" shared="true">
        <return-type type="guint" />
      </method>
      <method name="GetRoot" cname="atk_get_root" shared="true">
        <return-type type="AtkObject*" />
      </method>
@ -2825,7 +3059,7 @@
      <method name="GetVersion" cname="atk_get_version" shared="true">
        <return-type type="const-gchar*" />
      </method>
-      <method name="RemoveFocusTracker" cname="atk_remove_focus_tracker" shared="true">
+      <method name="RemoveFocusTracker" cname="atk_remove_focus_tracker" deprecated="1" shared="true">
        <return-type type="void" />
        <parameters>
          <parameter type="guint" name="tracker_id" />
@ -2861,7 +3095,7 @@
          <parameter type="AtkRole" name="role" />
        </parameters>
      </method>
-      <method name="RoleRegister" cname="atk_role_register" shared="true">
+      <method name="RoleRegister" cname="atk_role_register" deprecated="1" shared="true">
        <return-type type="AtkRole" />
        <parameters>
          <parameter type="const-gchar*" name="name" />
@ -2869,13 +3103,13 @@
      </method>
    </class>
    <class name="Focus" cname="AtkFocus_">
-      <method name="TrackerInit" cname="atk_focus_tracker_init" shared="true">
+      <method name="TrackerInit" cname="atk_focus_tracker_init" deprecated="1" shared="true">
        <return-type type="void" />
        <parameters>
          <parameter type="AtkEventListenerInit" name="init" />
        </parameters>
      </method>
-      <method name="TrackerNotify" cname="atk_focus_tracker_notify" shared="true">
+      <method name="TrackerNotify" cname="atk_focus_tracker_notify" deprecated="1" shared="true">
        <return-type type="void" />
        <parameters>
          <parameter type="AtkObject*" name="object" />
--- a/gdk/gdk-api.raw
+++ b/gdk/gdk-api.raw
--- a/gio/Gio.metadata
+++ b/gio/Gio.metadata
@ -108,6 +108,7 @@
  <attr path="/api/namespace/object/property[@type='GUnixFdList']" name="type">GUnixFDList</attr>
  <attr path="/api/namespace/object[@cname='GApplication']/signal[@cname='activate']" name="name">Activated</attr>
  <attr path="/api/namespace/object[@cname='GApplication']/signal[@cname='open']" name="name">Opened</attr>
  <attr path="/api/namespace/object[@cname='GAppLaunchContext']/signal[@cname='launch-failed']" name="name">LaunchedFailed</attr>
  <attr path="/api/namespace/object[@cname='GDBusAuthObserver']/signal[@cname='authorize-authenticated-peer']" name="name">AuthenticatedPeerAuthorized</attr>
  <attr path="/api/namespace/object[@cname='GDBusConnection']/property[@cname='closed']" name="name">IsClosed</attr>
  <attr path="/api/namespace/object[@cname='GDBusConnection']/method[@cname='g_dbus_connection_is_closed']" name="name">GetIsClosed</attr>
@ -131,6 +132,7 @@
  <attr path="/api/namespace/object[@cname='GInputStream']/method[@cname='g_input_stream_read_async']/parameters/parameter[@name='buffer']" name="type">guchar*</attr>
  <attr path="/api/namespace/object[@cname='GInputStream']/method[@cname='g_input_stream_read_async']/parameters/parameter[@name='buffer']" name="array">1</attr>
  <attr path="/api/namespace/object[@cname='GMemoryOutputStream']/method[@name='GetData']" name="new_flag">1</attr>
  <attr path="/api/namespace/object[@cname='GMenuModel']/method[@cname='g_menu_model_items_changed']" name="name">SetItemsChanged</attr>
  <attr path="/api/namespace/object[@cname='GMountOperation']/method[@name='Reply']" name="name">EmitReply</attr>
  <attr path="/api/namespace/object[@cname='GOutputStream']/method[@cname='g_output_stream_write']/parameters/parameter[@name='buffer']" name="type">guchar*</attr>
  <attr path="/api/namespace/object[@cname='GOutputStream']/method[@cname='g_output_stream_write']/parameters/parameter[@name='buffer']" name="array">1</attr>
@ -138,6 +140,7 @@
  <attr path="/api/namespace/object[@cname='GOutputStream']/method[@cname='g_output_stream_write_all']/parameters/parameter[@name='buffer']" name="array">1</attr>
  <attr path="/api/namespace/object[@cname='GOutputStream']/method[@cname='g_output_stream_write_async']/parameters/parameter[@name='buffer']" name="type">guchar*</attr>
  <attr path="/api/namespace/object[@cname='GOutputStream']/method[@cname='g_output_stream_write_async']/parameters/parameter[@name='buffer']" name="array">1</attr>
  <attr path="/api/namespace/object[@cname='GOutputStream']/method[@cname='g_output_stream_vprintf']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GResolver']/*[@name='LookupByName']/return-type" name="element_type">GInetAddress*</attr>
  <attr path="/api/namespace/object[@cname='GResolver']/*[@name='LookupByName']/return-type" name="owned">true</attr>
  <attr path="/api/namespace/object[@cname='GResolver']/*[@name='LookupByName']/return-type" name="elements_owned">true</attr>
--- a/gio/gio-api.raw
+++ b/gio/gio-api.raw
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@ -8,6 +8,9 @@
  <attr path="/api/namespace/struct[@cname='GtkRadioActionEntry']" name="hidden">1</attr>
  <attr path="/api/namespace/struct[@cname='GtkToggleActionEntry']" name="hidden">1</attr>
  <attr path="/api/namespace/boxed[@cname='GtkBorder']" name="opaque">false</attr>
  <attr path="/api/namespace/boxed[@cname='GtkGradient']/method[@cname='gtk_gradient_add_color_stop']" name="hidden">1</attr>
  <attr path="/api/namespace/boxed[@cname='GtkGradient']/method[@cname='gtk_gradient_resolve']" name="hidden">1</attr>
  <attr path="/api/namespace/boxed[@cname='GtkGradient']/method[@cname='gtk_gradient_resolve_for_context']" name="hidden">1</attr>
  <attr path="/api/namespace/boxed[@cname='GtkIconInfo']/method[@name='Free']" name="deprecated">1</attr>
  <attr path="/api/namespace/boxed[@cname='GtkIconInfo']/method[@name='GetFilename']" name="win32_utf8_variant">true</attr>
  <attr path="/api/namespace/boxed[@cname='GtkIconSet']/method[@name='GetSizes']" name="hidden">1</attr>
@ -32,6 +35,7 @@
  <attr path="/api/namespace/boxed[@cname='GtkSelectionData']/method[@name='SetText']" name="hidden">1</attr>
  <attr path="/api/namespace/boxed[@cname='GtkSelectionData']/method[@name='Set']/*/*[@name='data']" name="type">guchar</attr>
  <attr path="/api/namespace/boxed[@cname='GtkSelectionData']/method[@name='Set']/*/*[@name='data']" name="array">1</attr>
  <attr path="/api/namespace/boxed[@cname='GtkSymbolicColor']/method[@cname='gtk_symbolic_color_resolve']" name="hidden">1</attr>
  <attr path="/api/namespace/boxed[@cname='GtkTargetEntry']" name="opaque">false</attr>
  <attr path="/api/namespace/boxed[@cname='GtkTargetEntry']/field[@cname='flags']" name="type">GtkTargetFlags</attr>
  <attr path="/api/namespace/boxed[@cname='GtkTextAttributes']/field[@cname='appearance']" name="hidden">1</attr>
@ -73,6 +77,7 @@
  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='EventsPending']" name="name">GetEventsPending</attr>
  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='CheckVersion']/return-type" name="type">const-gchar*</attr>
  <attr path="/api/namespace/class[@cname='GtkGlobal']/method[@name='EnumeratePrinters']" name="hidden">1</attr>
  <attr path="/api/namespace/class[@cname='GtkIcon_']/method[@cname='gtk_icon_size_lookup_for_settings']" name="hidden">1</attr>
  <attr path="/api/namespace/class[@cname='GtkInit_']/method[@name='Check']" name="hidden">1</attr>
  <attr path="/api/namespace/class[@cname='GtkInit_']/method[@name='CheckAbiCheck']" name="hidden">1</attr>
  <attr path="/api/namespace/class[@cname='GtkInit_']/method[@name='AbiCheck']" name="hidden">1</attr>
@ -83,6 +88,9 @@
  <attr path="/api/namespace/class[@cname='GtkRc_']/method[@name='Parse']" name="win32_utf8_variant">true</attr>
  <attr path="/api/namespace/class[@cname='GtkRc_']/method[@name='SetDefaultFiles']" name="win32_utf8_variant">true</attr>
  <attr path="/api/namespace/class[@cname='GtkRc_']/method[@name='SetDefaultFiles']/*/*[@name='filenames']" name="null_term_array">1</attr>
  <attr path="/api/namespace/class[@cname='GtkRc_']/method[@cname='gtk_rc_get_style_by_paths']" name="hidden">1</attr>
  <attr path="/api/namespace/class[@cname='GtkRc_']/method[@cname='gtk_rc_reparse_all_for_settings']" name="hidden">1</attr>
  <attr path="/api/namespace/class[@cname='GtkRc_']/method[@cname='gtk_rc_reset_styles']" name="hidden">1</attr>
  <attr path="/api/namespace/class[@cname='GtkRender_']" name="internal">1</attr>
  <attr path="/api/namespace/class[@cname='GtkRender_']/method[@name='IconPixbuf']/return-type" name="owned">true</attr>
  <attr path="/api/namespace/class[@cname='GtkStock_']" name="hidden">1</attr>
@ -113,6 +121,7 @@
  <attr path="/api/namespace/enum[@cname='GtkTextBufferTargetInfo']/member[@name='Text']" name="value">UInt32.MaxValue-2U</attr>
  <attr path="/api/namespace/enum[@cname='GtkToolbarSpaceStyle']" name="hidden">1</attr>
  <attr path="/api/namespace/enum[@cname='GtkWin32EmbedMessageType']" name="hidden">1</attr>
  <attr path="/api/namespace/interface[@cname='GtkActionable']/property[@name='ActionName']" name="hidden">1</attr> 
  <attr path="/api/namespace/interface[@cname='GtkBuildable']" name="hidden">1</attr> 
  <attr path="/api/namespace/interface[@cname='GtkCellEditable']/method[@name='EditingDone']" name="name">FinishEditing</attr>
  <attr path="/api/namespace/interface[@cname='GtkCellEditable']/signal[@name='RemoveWidget']" name="name">WidgetRemoved</attr>
@ -191,6 +200,8 @@
  <attr path="/api/namespace/interface[@cname='GtkRecentChooser']/virtual_method[@cname='list_filters']/return-type" name="element_type">GtkRecentFilter*</attr>
  <attr path="/api/namespace/interface[@cname='GtkRecentChooser']/virtual_method[@cname='list_filters']/return-type" name="elements_owned">false</attr>
  <attr path="/api/namespace/interface[@cname='GtkRecentChooser']/virtual_method[@cname='list_filters']/return-type" name="owned">true</attr>
  <attr path="/api/namespace/interface[@cname='GtkStyleProvider']/method[@cname='gtk_style_provider_get_icon_factory']" name="hidden">1</attr>
  <attr path="/api/namespace/interface[@cname='GtkStyleProvider']/method[@cname='gtk_style_provider_get_style']" name="hidden">1</attr>
  <attr path="/api/namespace/interface[@cname='GtkTreeModel']/method[@name='Foreach']/*/*[@name='func']" name="scope">call</attr>
  <attr path="/api/namespace/interface[@cname='GtkTreeModel']/*[@name='GetIterFirst']/*/*[@name='iter']" name="pass_as">out</attr>
  <attr path="/api/namespace/interface[@cname='GtkTreeModel']/method[@name='Get']" name="hidden">1</attr>
@ -257,6 +268,9 @@
  <attr path="/api/namespace/object[@cname='GtkApplication']/method[@name='GetWindows']/return-type" name="element_type">GtkWindow*</attr>
  <attr path="/api/namespace/object[@cname='GtkArrow']/method[@name='Set']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkBin']/method[@name='GetChild']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkBuilder']/constructor[@cname='gtk_builder_new_from_file']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkBuilder']/constructor[@cname='gtk_builder_new_from_resource']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkBuilder']/constructor[@cname='gtk_builder_new_from_string']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkBuilder']/method[@name='AddFromFile']/*/*[@name='filename']" name="type">const-gfilename*</attr>
  <attr path="/api/namespace/object[@cname='GtkBuilder']/method[@cname='gtk_builder_connect_signals']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkBuilder']/method[@cname='gtk_builder_connect_signals_full']" name="hidden">1</attr>
@ -293,6 +307,7 @@
  <attr path="/api/namespace/object[@cname='GtkCheckMenuItem']/constructor[@cname='gtk_check_menu_item_new_with_mnemonic']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkCheckMenuItem']/constructor[@cname='gtk_check_menu_item_new_with_label']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkCheckMenuItem']/method[@name='Toggled']" name="name">EmitToggled</attr>
  <attr path="/api/namespace/object[@cname='GtkFileChooserWidget']/signal[@cname='show-hidden']" name="name">ShowedHidden</attr>
  <attr path="/api/namespace/object[@cname='GtkClipboard']/method[@name='RequestContents']/*/*[@name='callback']" name="scope">async</attr>
  <attr path="/api/namespace/object[@cname='GtkClipboard']/method[@name='RequestImage']/*/*[@name='callback']" name="scope">async</attr>
  <attr path="/api/namespace/object[@cname='GtkClipboard']/method[@name='RequestTargets']/*/*[@name='callback']" name="scope">async</attr>
@ -306,6 +321,7 @@
  <attr path="/api/namespace/object[@cname='GtkClipboard']/signal" name="block_glue">1</attr>
  <attr path="/api/namespace/object[@cname='GtkColorButton']/method[@name='GetColor']/*/*[@name='color']" name="pass_as">out</attr>
  <attr path="/api/namespace/object[@cname='GtkColorButton']/property[@name='Rgba']" name="type">GdkRGBA</attr>
  <attr path="/api/namespace/object[@cname='GtkColorButton']/property[@cname='use-alpha']" name="name">HasAlpha</attr>
  <attr path="/api/namespace/object[@cname='GtkColorSelection']/method[@name='GetCurrentColor']/*/*[@name='color']" name="pass_as">out</attr>
  <attr path="/api/namespace/object[@cname='GtkColorSelection']/method[@name='GetPreviousColor']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkColorSelection']/method[@name='PaletteFromString']" name="hidden">1</attr>
@ -363,6 +379,8 @@
  <attr path="/api/namespace/object[@cname='GtkExpander']/signal[@name='Activate']" name="name">Activated</attr>
  <attr path="/api/namespace/object[@cname='GtkFileChooserDialog']/constructor[@cname='gtk_file_chooser_dialog_new']" name="hidden">1</attr>
  <remove-node path="/api/namespace/object[@cname='GtkFileChooserWidget']/implements/interface[@cname='GtkFileChooserEmbed']" />
  <attr path="/api/namespace/object[@cname='GtkFlowBox']/signal[@cname='select-all']" name="name">SelectedAll</attr>
  <attr path="/api/namespace/object[@cname='GtkFlowBox']/signal[@cname='unselect-all']" name="name">UnselectedAll</attr>
  <attr path="/api/namespace/object[@cname='GtkFontSelectionDialog']/method[@name='GetCancelButton']/return-type" name="type">GtkButton*</attr>
  <attr path="/api/namespace/object[@cname='GtkFontSelectionDialog']/method[@name='GetOkButton']/return-type" name="type">GtkButton*</attr>
  <attr path="/api/namespace/object[@cname='GtkFrame']/method[@name='GetLabelAlign']" name="hidden">1</attr>
@ -471,6 +489,7 @@
  <attr path="/api/namespace/object[@cname='GtkMenu']/method[@name='SetScreen']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkMenuShell']/signal[@name='Cancel']" name="name">Canceled</attr>
  <attr path="/api/namespace/object[@cname='GtkMenuShell']/signal[@name='Deactivate']" name="name">Deactivated</attr>
  <attr path="/api/namespace/object[@cname='GtkMenuShell']/signal[@name='Insert']" name="name">Inserted</attr>
  <attr path="/api/namespace/object[@cname='GtkMessageDialog']/constructor[@cname='gtk_message_dialog_new']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkMessageDialog']/constructor[@cname='gtk_message_dialog_new_with_markup']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkMountOperation']/method[@name='IsShowing']" name="name">GetIsShowing</attr>
@ -478,6 +497,7 @@
  <attr path="/api/namespace/object[@cname='GtkNotebook']/signal[@name='ReorderTab']/return-type" name="type">void</attr>
  <attr path="/api/namespace/object[@cname='GtkPageSetup']/constructor[@cname='gtk_page_setup_new_from_file']/*/*[@name='file_name']" name="type">const-gfilename*</attr>
  <attr path="/api/namespace/object[@cname='GtkPageSetup']/method[@name='ToFile']/*/*[@name='file_name']" name="type">const-gfilename*</attr>
  <attr path="/api/namespace/object[@cname='GtkPlacesSidebar']/signal[@cname='show-connect-to-server']" name="name">ShowedConnectToServer</attr>
  <attr path="/api/namespace/object[@cname='GtkPlug']/constructor[@cname='gtk_plug_new']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkPlug']/constructor[@cname='gtk_plug_new_for_display']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkPlug']/property[@name='Embedded']" name="name">IsEmbedded</attr>
@ -816,9 +836,10 @@
  <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='SetHadjustment']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='SetVadjustment']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkUIManager']/constructor[@cname='gtk_ui_manager_new_merge_id']" name="hidden">1</attr>
-   <attr path="/api/namespace/object[@cname='GtkUIManager']/method[@name='AddUiFromFile']" name="win32_utf8_variant">true</attr>
+  <attr path="/api/namespace/object[@cname='GtkUIManager']/method[@name='AddUiFromResource']" name="hidden">1</attr>
-   <attr path="/api/namespace/object[@cname='GtkUIManager']/method[@cname='gtk_ui_manager_get_action_groups']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkUIManager']/method[@name='AddUiFromFile']" name="win32_utf8_variant">true</attr>
-   <attr path="/api/namespace/object[@cname='GtkUIManager']/method[@name='GetToplevels']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkUIManager']/method[@cname='gtk_ui_manager_get_action_groups']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkUIManager']/method[@name='GetToplevels']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkViewport']/method[@name='GetHadjustment']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkViewport']/method[@name='GetVadjustment']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkViewport']/method[@name='SetHadjustment']" name="hidden">1</attr>
@ -858,6 +879,7 @@
  <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='StyleGet']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='StyleGetProperty']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='StyleGetValist']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetSettings']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='CanActivateAccel']" name="name">AccelCanActivate</attr>
  <attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='ChildNotify']" name="name">ChildNotified</attr>
  <attr path="/api/namespace/object[@cname='GtkWidget']/signal[@name='Destroy']" name="hidden">1</attr>
@ -894,6 +916,7 @@
  <attr path="/api/namespace/object[@cname='GtkWindow']/method[@name='SetIconFromFile']" name="win32_utf8_variant">true</attr>
  <attr path="/api/namespace/object[@cname='GtkWindow']/method[@name='SetIconList']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GtkWindow']/property[@name='Screen']" name="new_flag">1</attr>
  <attr path="/api/namespace/object[@cname='GtkWindow']/property[@cname='is-maximized']" name="name">Maximized</attr>
  <attr path="/api/namespace/object[@cname='GtkWindow']/signal[@name='ActivateDefault']" name="name">DefaultActivated</attr>
  <attr path="/api/namespace/object[@cname='GtkWindow']/signal[@name='ActivateFocus']" name="name">FocusActivated</attr>
  <attr path="/api/namespace/struct[@cname='GtkBindingArg']" name="hidden">1</attr>
@ -950,7 +973,6 @@
  <move-node path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintSlider']">/api/namespace/object[@cname='GtkStyle']</move-node>
  <move-node path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintTab']">/api/namespace/object[@cname='GtkStyle']</move-node>
  <move-node path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintVline']">/api/namespace/object[@cname='GtkStyle']</move-node>
  <remove-node path="/api/namespace/boxed[@cname='Gtk9Slice']" />
  <remove-node path="/api/namespace/struct[@cname='IconSize']" />
  <remove-node path="/api/namespace/struct[@cname='Range']" />
 </metadata>
--- a/gtk/gtk-api.raw
+++ b/gtk/gtk-api.raw
--- a/pango/Pango.metadata
+++ b/pango/Pango.metadata
@ -40,7 +40,6 @@
  <attr path="/api/namespace/class[@cname='PangoCairo_']/method[@name='ContextGetFontOptions']" name="hidden">1</attr>
  <attr path="/api/namespace/class[@cname='PangoCairo_']/method[@name='ContextSetFontOptions']" name="hidden">1</attr>
  <attr path="/api/namespace/class[@cname='PangoGlobal']/method[@name='ExtentsToPixels']/*/*[@type='PangoRectangle*']" name="pass_as">ref</attr>
  <attr path="/api/namespace/class[@cname='PangoGlobal']/method[@name='GetMirrorChar']" name="hidden">1</attr>
  <attr path="/api/namespace/class[@cname='PangoGlobal']/method[@name='ParseMarkup']" name="hidden">1</attr>
  <attr path="/api/namespace/class[@cname='PangoGlobal']/method[@name='ReadLine']" name="hidden">1</attr>
  <attr path="/api/namespace/class[@cname='PangoGlobal']/method[@name='ReorderItems']" name="hidden">1</attr>
@ -49,8 +48,10 @@
  <attr path="/api/namespace/class[@cname='PangoGlobal']/method[@name='ScanWord']" name="hidden">1</attr>
  <attr path="/api/namespace/class[@cname='PangoGlobal']/method[@name='SkipSpace']/*/*[@name='pos']" name="pass_as">ref</attr>
  <attr path="/api/namespace/class[@name='Version']" name="hidden">1</attr>
-  <attr path="/api/namespace/object[@cname='PangoCairoFont']" name="hidden">1</attr>
+  <attr path="/api/namespace/interface[@cname='PangoCairoFont']" name="hidden">1</attr>
-  <attr path="/api/namespace/object[@cname='PangoCairoFontMap']" name="hidden">1</attr>
+  <attr path="/api/namespace/interface[@cname='PangoCairoFontMap']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='PangoCairoCoreTextFont']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='PangoCairoCoreTextFontMap']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='PangoContext']/method[@name='ListFamilies']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='PangoFont']/method[@name='Describe']/return-type" name="owned">true</attr>
  <attr path="/api/namespace/object[@cname='PangoFont']/method[@name='DescriptionsFree']" name="hidden">1</attr>
--- a/pango/pango-api.raw
+++ b/pango/pango-api.raw
@ -186,6 +186,16 @@
      <member cname="PANGO_SCRIPT_CARIAN" name="Carian" />
      <member cname="PANGO_SCRIPT_LYCIAN" name="Lycian" />
      <member cname="PANGO_SCRIPT_LYDIAN" name="Lydian" />
      <member cname="PANGO_SCRIPT_BATAK" name="Batak" />
      <member cname="PANGO_SCRIPT_BRAHMI" name="Brahmi" />
      <member cname="PANGO_SCRIPT_MANDAIC" name="Mandaic" />
      <member cname="PANGO_SCRIPT_CHAKMA" name="Chakma" />
      <member cname="PANGO_SCRIPT_MEROITIC_CURSIVE" name="MeroiticCursive" />
      <member cname="PANGO_SCRIPT_MEROITIC_HIEROGLYPHS" name="MeroiticHieroglyphs" />
      <member cname="PANGO_SCRIPT_MIAO" name="Miao" />
      <member cname="PANGO_SCRIPT_SHARADA" name="Sharada" />
      <member cname="PANGO_SCRIPT_SORA_SOMPENG" name="SoraSompeng" />
      <member cname="PANGO_SCRIPT_TAKRI" name="Takri" />
    </enum>
    <enum name="Stretch" cname="PangoStretch" gtype="pango_stretch_get_type" type="enum">
      <member cname="PANGO_STRETCH_ULTRA_CONDENSED" name="UltraCondensed" />
@ -238,14 +248,14 @@
    <callback name="AttrDataCopyFunc" cname="PangoAttrDataCopyFunc">
      <return-type type="gpointer" />
      <parameters>
-        <parameter type="gconstpointer" name="data" />
+        <parameter type="gconstpointer" name="user_data" />
      </parameters>
    </callback>
    <callback name="AttrFilterFunc" cname="PangoAttrFilterFunc">
      <return-type type="gboolean" />
      <parameters>
        <parameter type="PangoAttribute*" name="attribute" />
-        <parameter type="gpointer" name="data" />
+        <parameter type="gpointer" name="user_data" />
      </parameters>
    </callback>
    <callback name="CairoShapeRendererFunc" cname="PangoCairoShapeRendererFunc">
@ -269,21 +279,18 @@
      <parameters>
        <parameter type="PangoFontset*" name="fontset" />
        <parameter type="PangoFont*" name="font" />
-        <parameter type="gpointer" name="data" />
+        <parameter type="gpointer" name="user_data" />
      </parameters>
    </callback>
-    <object name="CairoFont" cname="PangoCairoFont">
+    <interface name="CairoFont" cname="PangoCairoFont" consume_only="1">
      <method name="GetScaledFont" cname="pango_cairo_font_get_scaled_font">
        <return-type type="cairo_scaled_font_t*" />
      </method>
      <method name="GetType" cname="pango_cairo_font_get_type" shared="true">
        <return-type type="GType" />
      </method>
-    </object>
+    </interface>
-    <object name="CairoFontMap" cname="PangoCairoFontMap">
+    <interface name="CairoFontMap" cname="PangoCairoFontMap" consume_only="1">
      <method name="CreateContext" cname="pango_cairo_font_map_create_context" deprecated="1">
        <return-type type="PangoContext*" />
      </method>
      <method name="GetDefault" cname="pango_cairo_font_map_get_default" shared="true">
        <return-type type="PangoFontMap*" />
      </method>
@ -311,11 +318,38 @@
          <parameter type="double" name="dpi" />
        </parameters>
      </method>
    </interface>
    <object name="CairoCoreTextFont" cname="PangoCairoCoreTextFont" parent="PangoCoreTextFont">
      <class_struct cname="PangoCairoCoreTextFontClass">
        <field name="ParentClass" cname="parent_class" type="PangoCoreTextFontClass" />
      </class_struct>
      <implements>
        <interface cname="PangoCairoFont" />
      </implements>
      <method name="GetType" cname="pango_cairo_core_text_font_get_type" shared="true">
        <return-type type="GType" />
      </method>
    </object>
    <object name="CairoCoreTextFontMap" cname="PangoCairoCoreTextFontMap" parent="PangoCoreTextFontMap">
      <class_struct cname="PangoCairoCoreTextFontMapClass">
        <field name="ParentClass" cname="parent_class" type="PangoCoreTextFontMapClass" />
      </class_struct>
      <field name="Serial" cname="serial" type="guint" />
      <field name="Dpi" cname="dpi" type="gdouble" />
      <implements>
        <interface cname="PangoCairoFontMap" />
      </implements>
      <method name="GetType" cname="pango_cairo_core_text_font_map_get_type" shared="true">
        <return-type type="GType" />
      </method>
    </object>
    <object name="Context" cname="PangoContext" parent="GObject">
      <class_struct cname="PangoContextClass">
        <field name="ParentClass" cname="parent_class" type="GObjectClass" />
      </class_struct>
      <method name="Changed" cname="pango_context_changed">
        <return-type type="void" />
      </method>
      <method name="GetBaseDir" cname="pango_context_get_base_dir">
        <return-type type="PangoDirection" />
      </method>
@ -347,6 +381,9 @@
          <parameter type="PangoLanguage*" name="language" />
        </parameters>
      </method>
      <method name="GetSerial" cname="pango_context_get_serial">
        <return-type type="guint" />
      </method>
      <method name="GetType" cname="pango_context_get_type" shared="true">
        <return-type type="GType" />
      </method>
@ -414,6 +451,30 @@
        </parameters>
      </method>
    </object>
    <object name="CoreTextFont" cname="PangoCoreTextFont" parent="PangoFont">
      <class_struct cname="PangoCoreTextFontClass">
        <field name="ParentClass" cname="parent_class" type="PangoFontClass" />
        <method vm="_pango_reserved1" />
        <method vm="_pango_reserved2" />
        <method vm="_pango_reserved3" />
        <method vm="_pango_reserved4" />
      </class_struct>
      <virtual_method name="PangoReserved1" cname="_pango_reserved1" shared="true" padding="true">
        <return-type type="void" />
      </virtual_method>
      <virtual_method name="PangoReserved2" cname="_pango_reserved2" shared="true" padding="true">
        <return-type type="void" />
      </virtual_method>
      <virtual_method name="PangoReserved3" cname="_pango_reserved3" shared="true" padding="true">
        <return-type type="void" />
      </virtual_method>
      <virtual_method name="PangoReserved4" cname="_pango_reserved4" shared="true" padding="true">
        <return-type type="void" />
      </virtual_method>
      <method name="GetType" cname="pango_core_text_font_get_type" shared="true">
        <return-type type="GType" />
      </method>
    </object>
    <object name="Font" cname="PangoFont" parent="GObject">
      <method name="Describe" cname="pango_font_describe">
        <return-type type="PangoFontDescription*" />
@ -523,9 +584,15 @@
      </method>
    </object>
    <object name="FontMap" cname="PangoFontMap" parent="GObject">
      <method name="Changed" cname="pango_font_map_changed">
        <return-type type="void" />
      </method>
      <method name="CreateContext" cname="pango_font_map_create_context">
        <return-type type="PangoContext*" />
      </method>
      <method name="GetSerial" cname="pango_font_map_get_serial">
        <return-type type="guint" />
      </method>
      <method name="GetType" cname="pango_font_map_get_type" shared="true">
        <return-type type="GType" />
      </method>
@ -556,12 +623,6 @@
      <class_struct cname="PangoFT2FontMapClass">
        <field name="ParentClass" cname="parent_class" type="PangoFcFontMapClass" />
      </class_struct>
      <method name="CreateContext" cname="pango_ft2_font_map_create_context" deprecated="1">
        <return-type type="PangoContext*" />
      </method>
      <method name="ForDisplay" cname="pango_ft2_font_map_for_display" deprecated="1" shared="true">
        <return-type type="PangoFontMap*" />
      </method>
      <method name="GetType" cname="pango_ft2_font_map_get_type" shared="true">
        <return-type type="GType" />
      </method>
@ -607,6 +668,9 @@
      <method name="GetBaseline" cname="pango_layout_get_baseline">
        <return-type type="int" />
      </method>
      <method name="GetCharacterCount" cname="pango_layout_get_character_count">
        <return-type type="gint" />
      </method>
      <method name="GetContext" cname="pango_layout_get_context">
        <return-type type="PangoContext*" />
      </method>
@ -671,6 +735,12 @@
          <parameter type="gint*" name="n_attrs" />
        </parameters>
      </method>
      <method name="GetLogAttrsReadonly" cname="pango_layout_get_log_attrs_readonly">
        <return-type type="const-PangoLogAttr*" />
        <parameters>
          <parameter type="gint*" name="n_attrs" />
        </parameters>
      </method>
      <method name="GetPixelExtents" cname="pango_layout_get_pixel_extents">
        <return-type type="void" />
        <parameters>
@ -685,6 +755,9 @@
          <parameter type="int*" name="height" />
        </parameters>
      </method>
      <method name="GetSerial" cname="pango_layout_get_serial">
        <return-type type="guint" />
      </method>
      <method name="GetSingleParagraphMode" cname="pango_layout_get_single_paragraph_mode">
        <return-type type="gboolean" />
      </method>
@ -1105,7 +1178,6 @@
    <struct name="EllipsizeState" cname="EllipsizeState" opaque="true" />
    <struct name="Extents" cname="Extents" opaque="true" />
    <struct name="FontHashKey" cname="FontHashKey" opaque="true" />
    <struct name="GlyphInfo" cname="GlyphInfo" opaque="true" />
    <struct name="ItemProperties" cname="ItemProperties" opaque="true" />
    <struct name="ItemizeState" cname="ItemizeState" opaque="true" />
    <struct name="LineIter" cname="LineIter" opaque="true" />
@ -1326,7 +1398,6 @@
      </method>
    </struct>
    <struct name="BlockInfo" cname="PangoBlockInfo" opaque="true" />
    <struct name="CairoATSUIFontMapClass" cname="PangoCairoATSUIFontMapClass" opaque="true" />
    <struct name="CairoContextInfo" cname="PangoCairoContextInfo" opaque="true" />
    <struct name="CairoFcFont" cname="PangoCairoFcFont" opaque="true" />
    <struct name="CairoFcFontClass" cname="PangoCairoFcFontClass" opaque="true" />
@ -1358,6 +1429,16 @@
        <return-type type="gchar*" />
      </method>
    </boxed>
    <struct name="CoreTextFace" cname="PangoCoreTextFace" opaque="true" />
    <struct name="CoreTextFaceClass" cname="PangoCoreTextFaceClass" opaque="true" />
    <struct name="CoreTextFamily" cname="PangoCoreTextFamily" opaque="true" />
    <struct name="CoreTextFamilyClass" cname="PangoCoreTextFamilyClass" opaque="true" />
    <struct name="CoreTextFontKey" cname="PangoCoreTextFontKey" opaque="true" />
    <struct name="CoreTextFontMap" cname="PangoCoreTextFontMap" opaque="true" />
    <struct name="CoreTextFontMapClass" cname="PangoCoreTextFontMapClass" opaque="true" />
    <struct name="CoreTextFontset" cname="PangoCoreTextFontset" opaque="true" />
    <struct name="CoreTextFontsetClass" cname="PangoCoreTextFontsetClass" opaque="true" />
    <struct name="CoreTextFontsetKey" cname="PangoCoreTextFontsetKey" opaque="true" />
    <struct name="Coverage" cname="PangoCoverage" opaque="true">
      <method name="Copy" cname="pango_coverage_copy">
        <return-type type="PangoCoverage*" owned="true" />
@ -1407,29 +1488,7 @@
    <struct name="EnginePair" cname="PangoEnginePair" opaque="true" />
    <struct name="EngineShape" cname="PangoEngineShape" opaque="true" />
    <struct name="FT2Family" cname="PangoFT2Family" opaque="true" />
-    <struct name="FT2Font" cname="PangoFT2Font" opaque="true">
+    <struct name="FT2Font" cname="PangoFT2Font" opaque="true" />
      <method name="GetCoverage" cname="pango_ft2_font_get_coverage" deprecated="1" shared="true">
        <return-type type="PangoCoverage*" />
        <parameters>
          <parameter type="PangoFont*" name="font" />
          <parameter type="PangoLanguage*" name="language" />
        </parameters>
      </method>
      <method name="GetFace" cname="pango_ft2_font_get_face" deprecated="1" shared="true">
        <return-type type="FT_Face" />
        <parameters>
          <parameter type="PangoFont*" name="font" />
        </parameters>
      </method>
      <method name="GetKerning" cname="pango_ft2_font_get_kerning" deprecated="1" shared="true">
        <return-type type="int" />
        <parameters>
          <parameter type="PangoFont*" name="font" />
          <parameter type="PangoGlyph" name="left" />
          <parameter type="PangoGlyph" name="right" />
        </parameters>
      </method>
    </struct>
    <struct name="FT2FontClass" cname="PangoFT2FontClass" opaque="true" />
    <struct name="FT2GlyphInfo" cname="PangoFT2GlyphInfo" opaque="true" />
    <struct name="FT2Renderer" cname="PangoFT2Renderer" opaque="true" />
@ -2083,7 +2142,6 @@
    <struct name="Module" cname="PangoModule" opaque="true" />
    <struct name="ModuleClass" cname="PangoModuleClass" opaque="true" />
    <struct name="OTInfoClass" cname="PangoOTInfoClass" opaque="true" />
    <struct name="OTRule" cname="PangoOTRule" opaque="true" />
    <struct name="OTRulesetClass" cname="PangoOTRulesetClass" opaque="true" />
    <struct name="Rectangle" cname="PangoRectangle">
      <field name="X" cname="x" type="int" />
@ -2098,8 +2156,8 @@
      <method name="GetRange" cname="pango_script_iter_get_range">
        <return-type type="void" />
        <parameters>
-          <parameter type="const-char**" pass_as="out" name="start" />
+          <parameter type="const-char**" name="start" />
-          <parameter type="const-char**" pass_as="out" name="end" />
+          <parameter type="const-char**" name="end" />
          <parameter type="PangoScript*" name="script" />
        </parameters>
      </method>
@ -2413,13 +2471,6 @@
          <parameter type="int" name="attrs_len" />
        </parameters>
      </method>
      <method name="GetMirrorChar" cname="pango_get_mirror_char" deprecated="1" shared="true">
        <return-type type="gboolean" />
        <parameters>
          <parameter type="gunichar" name="ch" />
          <parameter type="gunichar*" name="mirrored_ch" />
        </parameters>
      </method>
      <method name="GravityGetForMatrix" cname="pango_gravity_get_for_matrix" shared="true">
        <return-type type="PangoGravity" />
        <parameters>
@ -2574,6 +2625,17 @@
          <parameter type="PangoScript" name="script" />
        </parameters>
      </method>
      <method name="ShapeFull" cname="pango_shape_full" shared="true">
        <return-type type="void" />
        <parameters>
          <parameter type="const-gchar*" name="item_text" />
          <parameter type="gint" name="item_length" />
          <parameter type="const-gchar*" name="paragraph_text" />
          <parameter type="gint" name="paragraph_length" />
          <parameter type="const-PangoAnalysis*" name="analysis" />
          <parameter type="PangoGlyphString*" name="glyphs" />
        </parameters>
      </method>
      <method name="SkipSpace" cname="pango_skip_space" shared="true">
        <return-type type="gboolean" />
        <parameters>
@ -2741,6 +2803,24 @@
        </parameters>
      </method>
    </class>
    <class name="Markup" cname="PangoMarkup_">
      <method name="ParserFinish" cname="pango_markup_parser_finish" shared="true">
        <return-type type="gboolean" />
        <parameters>
          <parameter type="GMarkupParseContext*" name="context" />
          <parameter type="PangoAttrList**" name="attr_list" />
          <parameter type="char**" name="text" />
          <parameter type="gunichar*" name="accel_char" />
          <parameter type="GError**" name="error" />
        </parameters>
      </method>
      <method name="ParserNew" cname="pango_markup_parser_new" shared="true">
        <return-type type="GMarkupParseContext*" />
        <parameters>
          <parameter type="gunichar" name="accel_marker" />
        </parameters>
      </method>
    </class>
    <class name="Units" cname="PangoUnits_">
      <method name="FromDouble" cname="pango_units_from_double" shared="true">
        <return-type type="int" />
--- a/sources/Makefile.am
+++ b/sources/Makefile.am
@ -3,24 +3,27 @@ EXTRA_DIST =					\
 	sources.xml				\
 	gtk_tree_model_signal_fix.patch
-TARGET_GTK_VERSION=3.0.0
+TARGET_GTK_VERSION=3.12.0
 TARGET_GTK_API=3.12
 GTK_DOWNLOADS = \
-	http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-2.28.0.tar.bz2			\
+	http://ftp.gnome.org/pub/GNOME/sources/glib/2.40/glib-2.40.0.tar.xz			\
-	http://ftp.gnome.org/pub/GNOME/sources/pango/1.28/pango-1.28.3.tar.bz2			\
+	http://ftp.gnome.org/pub/GNOME/sources/pango/1.36/pango-1.36.0.tar.xz			\
-	http://ftp.gnome.org/pub/GNOME/sources/atk/1.32/atk-1.32.0.tar.bz2			\
+	http://ftp.gnome.org/pub/GNOME/sources/atk/2.12/atk-2.12.0.tar.xz			\
-	http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.22/gdk-pixbuf-2.22.1.tar.bz2	\
+	http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.28/gdk-pixbuf-2.28.0.tar.xz	\
-	http://ftp.gnome.org/pub/GNOME/sources/gtk+/3.0/gtk+-$(TARGET_GTK_VERSION).tar.bz2
+	http://ftp.gnome.org/pub/GNOME/sources/gtk+/$(TARGET_GTK_API)/gtk+-$(TARGET_GTK_VERSION).tar.xz
 api: 
 	PATH=../parser:$$PATH $(RUNTIME) ../parser/gapi-parser.exe sources.xml
 get-source-code:
 	for i in $(GTK_DOWNLOADS); do                  \
-		wget $$i --output-document=- | tar -xj ;   \
+		wget $$i --output-document=- | tar -xJ ;   \
 	done;
 	ln -f -s gtkfilechooserprivate.h gtk+-$(TARGET_GTK_VERSION)/gtk/gtkfilechooserpriv.h
 	patch -p0 gtk+-$(TARGET_GTK_VERSION)/gtk/gtktreemodel.c < gtk_tree_model_signal_fix.patch
 	echo "typedef struct _GtkClipboard GtkClipboard;" >> gtk+-$(TARGET_GTK_VERSION)/gtk/gtkclipboard.h
 	echo "typedef struct _GtkClipboardClass GtkClipboardClass;" >> gtk+-$(TARGET_GTK_VERSION)/gtk/gtkclipboard.h
 	patch -p0 gtk+-$(TARGET_GTK_VERSION)/gtk/gtkselectionprivate.h < gtkselectionprivate-space.patch 
 	patch -p0 gtk+-$(TARGET_GTK_VERSION)/gtk/gtktextattributes.h < gtktextattributes-gi-scanner.patch 
--- a/sources/gtkselectionprivate-space.patch
+++ b/sources/gtkselectionprivate-space.patch
@ -0,0 +1,11 @@
 --- gtk+-3.12.0.orig/gtk/gtkselectionprivate.h	2014-06-10 09:14:53.055629108 +0200
 +++ gtk+-3.12.0/gtk/gtkselectionprivate.h	2014-06-10 09:14:59.503650175 +0200
@@ -52,7 +52,7 @@
   /*< private >*/
   GList *list;
   guint ref_count;
 - };
 +};
 gboolean _gtk_selection_clear           (GtkWidget         *widget,
                                          GdkEventSelection *event);
--- a/sources/gtktextattributes-gi-scanner.patch
+++ b/sources/gtktextattributes-gi-scanner.patch
@ -0,0 +1,29 @@
 --- gtk+-3.12.0/gtk/gtktextattributes.h	2014-03-24 18:28:56.000000000 +0100
 +++ gtk+-3.12.0.new/gtk/gtktextattributes.h	2014-06-10 13:49:44.619905956 +0200
@@ -112,26 +112,12 @@
   guint inside_selection : 1;
   guint is_text : 1;
 -  /* For the sad story of this bit of code, see
 -   * https://bugzilla.gnome.org/show_bug.cgi?id=711158
 -   */
 -#ifdef __GI_SCANNER__
 -  /* The scanner should only see the transparent union, so that its
 -   * content does not vary across architectures.
 -   */
 -  union {
 -    GdkRGBA *rgba[2];
 -    /*< private >*/
 -    guint padding[4];
 -  };
 -#else
   GdkRGBA *rgba[2];
 #if (defined(__SIZEOF_INT__) && defined(__SIZEOF_POINTER__)) && (__SIZEOF_INT__ == __SIZEOF_POINTER__)
   /* unusable, just for ABI compat */
   /*< private >*/
   guint padding[2];
 #endif
 -#endif
 };
 /**
--- a/sources/sources.xml
+++ b/sources/sources.xml
@ -2,7 +2,7 @@
  <api filename="../gio/gio-api.raw">
    <library name="libgio-2.0-0.dll">
      <namespace name="G">
-        <directory path="glib-2.28.0/gio">
+        <directory path="glib-2.40.0/gio">
          <exclude>gasynchelper.h</exclude>
          <exclude>gcontenttypeprivate.h</exclude>
          <exclude>gdelayedsettingsbackend.h</exclude>
@ -35,6 +35,51 @@
          <exclude>gwin32outputstream.h</exclude>
          <exclude>gwin32resolver.h</exclude>
          <exclude>gwin32volumemonitor.h</exclude>
          <exclude>gdesktopappinfo.h</exclude>
          <exclude>gdesktopappinfo.c</exclude>
          <exclude>gdbusactiongroup.h</exclude>
          <exclude>gdbusdaemon.h</exclude>
          <exclude>gdbusobject.h</exclude>
          <exclude>gdbusaddress.h</exclude>
          <exclude>gdbuserror.h</exclude>
          <exclude>gdbusobjectmanagerclient.h</exclude>
          <exclude>gdbusauth.h</exclude>
          <exclude>gdbusinterface.h</exclude>
          <exclude>gdbusobjectmanager.h</exclude>
          <exclude>gdbusauthmechanismanon.h</exclude>
          <exclude>gdbusinterfaceskeleton.h</exclude>
          <exclude>gdbusobjectmanagerserver.h</exclude>
          <exclude>gdbusauthmechanismexternal.h</exclude>
          <exclude>gdbusintrospection.h</exclude>
          <exclude>gdbusobjectproxy.h</exclude>
          <exclude>gdbusauthmechanism.h</exclude>
          <exclude>gdbusmenumodel.h</exclude>
          <exclude>gdbusobjectskeleton.h</exclude>
          <exclude>gdbusauthmechanismsha1.h</exclude>
          <exclude>gdbusmessage.h</exclude>
          <exclude>gdbusprivate.h</exclude>
          <exclude>gdbusauthobserver.h</exclude>
          <exclude>gdbusmethodinvocation.h</exclude>
          <exclude>gdbusproxy.h</exclude>
          <exclude>gdbusconnection.h</exclude>
          <exclude>gdbusnameowning.h</exclude>
          <exclude>gdbusserver.h</exclude>
          <exclude>gdbus-daemon-generated.h</exclude>
          <exclude>gdbusnamewatching.h</exclude>
          <exclude>gdbusutils.h</exclude>
          <exclude>gpollableoutputstream.h</exclude>
          <exclude>gsocket.h</exclude>
          <exclude>gpollableinputstream.h</exclude>
          <exclude>gnetworkmonitor.h</exclude>
          <exclude>gnetworkmonitorbase.h</exclude>
          <exclude>gremoteactiongroup.h</exclude>
          <exclude>gapplicationimpl.h</exclude>
          <exclude>gresourcefile.h</exclude>
          <exclude>gsettingsschema.h</exclude>
          <exclude>gsettingsschema-internal.h</exclude>
          <exclude>gtlsfiledatabase.h</exclude>
          <exclude>gsimpleaction.h</exclude>
          <exclude>gsimpleactiongroup.h</exclude>
        </directory>
      </namespace>
    </library>
@ -42,14 +87,14 @@
  <api filename="../atk/atk-api.raw">
    <library name="libatk-1.0-0.dll">
      <namespace name="Atk">
-        <dir>atk-1.32.0/atk</dir>
+        <dir>atk-2.12.0/atk</dir>
      </namespace>
    </library>
  </api>
  <api filename="../pango/pango-api.raw">
    <library name="libpango-1.0-0.dll">
      <namespace name="Pango">
-        <directory path="pango-1.28.3/pango">
+        <directory path="pango-1.36.0/pango">
          <exclude>pangoatsui.c</exclude>
          <exclude>pangoatsui.h</exclude>
          <exclude>pangoatsui-fontmap.h</exclude>
@ -91,7 +136,7 @@
  <api filename="../gdk/gdk-api.raw">
    <library name="libgdk-3-0.dll">
      <namespace name="Gdk">
-        <directory path="gtk+-3.0.0/gdk">
+        <directory path="gtk+-3.12.0/gdk">
          <exclude>gdkalias.h</exclude>
          <exclude>gdkwindowimpl.h</exclude>
          <exclude>keyname-table.h</exclude>
@ -100,7 +145,7 @@
    </library>
    <library name="libgdk_pixbuf-2.0-0.dll">
      <namespace name="Gdk">
-        <directory path="gdk-pixbuf-2.22.1/gdk-pixbuf">
+        <directory path="gdk-pixbuf-2.28.0/gdk-pixbuf">
          <exclude>io-gdip-native.h</exclude>
          <exclude>io-gdip-propertytags.h</exclude>
          <exclude>io-gdip-utils.h</exclude>
@ -115,7 +160,7 @@
  <api filename="../gtk/gtk-api.raw">
    <library name="libgtk-3-0.dll">
      <namespace name="Gtk">
-        <directory path="gtk+-3.0.0/gtk">
+        <directory path="gtk+-3.12.0/gtk">
          <!-- Internal stuff -->
          <exclude>gtkalias.h</exclude>
          <exclude>gtkappchooseronline.h</exclude>
@ -208,7 +253,10 @@
          <exclude>gtktree.h</exclude>
          <exclude>gtktreeitem.c</exclude>
          <exclude>gtktreeitem.h</exclude>
 	  <exclude>gtkcellarea.c</exclude>
 	  <exclude>gtklockbutton.h</exclude>
        </directory>
 	<directory path="gtk+-3.12.0/gtk/deprecated" />
      </namespace>
    </library>
  </api>