From 9925ac1e6f00299f4eee1e3f25a2c9c33ab4f964 Mon Sep 17 00:00:00 2001
From: Martin Willemoes Hansen <mwh@mono-cvs.ximian.com>
Date: Sun, 26 Oct 2003 19:05:59 +0000
Subject: [PATCH]         * gtk/Gtk.metadata: Added the rest of
 sources/Gtk.metadata           and sorted the metadata.         *
 gtk/gtk-api.xml: Regenerated, to reflect the above changes.           Tags
 are swapped around. PaintBox, PaintBoxGap, PaintShadow and          
 PaintShadowGap are moved arround as well.         * sources/Gtk.metadata:
 Removed

svn path=/trunk/gtk-sharp/; revision=19407
---
 ChangeLog            |   9 +
 gtk/Gtk.metadata     | 190 +++++++++---
 gtk/gtk-api.xml      |  82 ++---
 sources/Gtk.metadata | 697 -------------------------------------------
 4 files changed, 200 insertions(+), 778 deletions(-)
 delete mode 100644 sources/Gtk.metadata

diff --git a/ChangeLog b/ChangeLog
index 36c960a4c..366d4fefa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-10-26  Martin Willemoes Hansen  <mwh@sysrq.dk>
+
+	* gtk/Gtk.metadata: Added the rest of sources/Gtk.metadata 
+	  and sorted the metadata.
+	* gtk/gtk-api.xml: Regenerated, to reflect the above changes.
+	  Tags are swapped around. PaintBox, PaintBoxGap, PaintShadow and
+	  PaintShadowGap are moved arround as well.
+	* sources/Gtk.metadata: Removed
+
 2003-10-23  Martin Willemoes Hansen  <mwh@sysrq.dk>
 
 	* gtk/Gtk.metadata: Added metadata from sources/Gtk.metadata
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index c18c170b4..7704174c6 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -1,16 +1,39 @@
 <?xml version="1.0"?>
 <metadata>
+  <attr path="//boxed[@cname='GtkBorder']" name="hidden">1</attr>
+  <attr path="//boxed[@cname='GtkIconSet']/method[@name='GetSizes']" name="hidden">1</attr>
+  <attr path="//boxed[@cname='GtkSelectionData']/method[@name='GetText']" name="hidden">1</attr>
+  <attr path="//boxed[@cname='GtkSelectionData']/method[@name='Set']" name="hidden">1</attr>
+  <attr path="//boxed[@cname='GtkSelectionData']/method[@name='SetText']" name="hidden">1</attr>
+  <attr path="//boxed[@cname='GtkTextIter']/method[@name='BackwardSearch']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//boxed[@cname='GtkTextIter']/method[@name='BackwardToTagToggle']/*/*[@type='GtkTextTag*']" name="null_ok">1</attr>
+  <attr path="//boxed[@cname='GtkTextIter']/method[@name='ForwardSearch']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//boxed[@cname='GtkTextIter']/method[@name='ForwardToTagToggle']/*/*[@type='GtkTextTag*']" name="null_ok">1</attr>
+  <attr path="//boxed[@cname='GtkTreePath']/method[@name='GetIndices']" name="hidden">1</attr>
   <attr path="//callback[@cname='GtkClipboardGetFunc']/*/*[@type='GtkSelectionData*']" name="pass_as">ref</attr>
-  <attr path="//interface[@cname='GtkCellEditable']/signal[@name='RemoveWidget']" name="name">WidgetRemoved</attr>
+  <attr path="//class[@cname='GtkAccelerator_']/method[@name='GetDefaultModMask']/return-type" name="type">GdkModifierType</attr>
+  <attr path="//class[@cname='GtkIdle_']" name="hidden">1</attr>
+  <attr path="//class[@cname='GtkStock_']" name="name">StockManager</attr>
+  <attr path="//enum[@cname='GtkDebugFlag']" name="hidden">1</attr>
+  <attr path="//enum[@cname='GtkDestDefaults']" name="hidden">1</attr>
+  <attr path="//enum[@cname='GtkExpanderStyle']" name="hidden">1</attr>
+  <attr path="//enum[@cname='GtkObjectFlags']" name="hidden">1</attr>
+  <attr path="//enum[@cname='GtkPathPriorityType']" name="hidden">1</attr>
+  <attr path="//enum[@cname='GtkPathType']" name="hidden">1</attr>
+  <attr path="//enum[@cname='GtkRBNodeColor']" name="hidden">1</attr>
+  <attr path="//enum[@cname='GtkRcFlags']" name="hidden">1</attr>
+  <attr path="//enum[@cname='GtkToolbarSpaceStyle']" name="hidden">1</attr>
+  <attr path="//enum[@cname='GtkWidgetFlags']" name="hidden">1</attr>
   <attr path="//interface[@cname='GtkCellEditable']/method[@name='EditingDone']" name="name">FinishEditing</attr>
+  <attr path="//interface[@cname='GtkCellEditable']/signal[@name='RemoveWidget']" name="name">WidgetRemoved</attr>
   <attr path="//interface[@cname='GtkEditable']/method[@name='GetEditable']" name="name">GetIsEditable</attr>
-  <attr path="//interface[@cname='GtkEditable']/method[@name='SetEditable']" name="name">SetIsEditable</attr>
   <attr path="//interface[@cname='GtkEditable']/method[@name='InsertText']/*/*[@name='position']" name="pass_as">ref</attr>
-  <attr path="//interface[@cname='GtkEditable']/signal[@name='InsertText']" name="name">TextInserted</attr>
+  <attr path="//interface[@cname='GtkEditable']/method[@name='SetEditable']" name="name">SetIsEditable</attr>
   <attr path="//interface[@cname='GtkEditable']/signal[@name='DeleteText']" name="name">TextDeleted</attr>
-  <attr path="//interface[@cname='GtkTreeModel']/method[@name='GetIter']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//interface[@cname='GtkEditable']/signal[@name='InsertText']" name="name">TextInserted</attr>
   <attr path="//interface[@cname='GtkTreeModel']/method[@name='GetIterFirst']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//interface[@cname='GtkTreeModel']/method[@name='GetIterFromString']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//interface[@cname='GtkTreeModel']/method[@name='GetIter']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//interface[@cname='GtkTreeModel']/method[@name='IterChildren']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//interface[@cname='GtkTreeModel']/method[@name='IterNext']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//interface[@cname='GtkTreeModel']/method[@name='IterNthChild']/*/*[@name='iter']" name="pass_as">out</attr>
@@ -23,72 +46,122 @@
   <attr path="//interface[@cname='GtkTreeSortable']/method[@name='SortColumnChanged']" name="name">ChangeSortColumn</attr>
   <attr path="//object[@cname='GtkAdjustment']/method[@name='Changed']" name="name">Change</attr>
   <attr path="//object[@cname='GtkAdjustment']/method[@name='ValueChanged']" name="name">ChangeValue</attr>
+  <attr path="//object[@cname='GtkArrow']/method[@name='Set']" name="hidden">1</attr>
   <attr path="//object[@cname='GtkBin']/method[@name='GetChild']" name="new_flag">1</attr>
+  <attr path="//object[@cname='GtkBox']/method[@name='PackEndDefaults']" name="name">PackEnd</attr>
+  <attr path="//object[@cname='GtkBox']/method[@name='PackStartDefaults']" name="name">PackStart</attr>
   <attr path="//object[@cname='GtkButton']/constructor[@cname='gtk_button_new_with_mnemonic']" name="preferred">1</attr>
-  <attr path="//object[@cname='GtkButton']/signal[@name='Activate']" name="name">Activated</attr>
-  <attr path="//object[@cname='GtkButton']/signal[@name='Enter']" name="name">Entered</attr>
-  <attr path="//object[@cname='GtkButton']/signal[@name='Leave']" name="name">Left</attr>
   <attr path="//object[@cname='GtkButton']/method[@name='Clicked']" name="name">Click</attr>
   <attr path="//object[@cname='GtkButton']/method[@name='Pressed']" name="name">Press</attr>
   <attr path="//object[@cname='GtkButton']/method[@name='Released']" name="name">Release</attr>
+  <attr path="//object[@cname='GtkButton']/signal[@name='Activate']" name="name">Activated</attr>
+  <attr path="//object[@cname='GtkButton']/signal[@name='Enter']" name="name">Entered</attr>
+  <attr path="//object[@cname='GtkButton']/signal[@name='Leave']" name="name">Left</attr>
   <attr path="//object[@cname='GtkCalendar']/method[@name='DisplayOptions']" name="name">SetDisplayOptions</attr>
   <attr path="//object[@cname='GtkCheckButton']/constructor[@cname='gtk_check_button_new_with_mnemonic']" name="preferred">1</attr>
   <attr path="//object[@cname='GtkCheckMenuItem']/constructor[@cname='gtk_check_menu_item_new_with_mnemonic']" name="preferred">1</attr>
   <attr path="//object[@cname='GtkCheckMenuItem']/method[@name='Toggled']" name="name">Toggle</attr>
+  <attr path="//object[@cname='GtkColorSelection']/method[@name='GetPreviousColor']" name="hidden">1</attr>
+  <attr path="//object[@cname='GtkColorSelection']/method[@name='PaletteFromString']" name="hidden">1</attr>
+  <attr path="//object[@cname='GtkColorSelection']/method[@name='PaletteToString']" name="hidden">1</attr>
+  <attr path="//object[@cname='GtkColorSelection']/method[@name='SetChangePaletteHook']" name="hidden">1</attr>
+  <attr path="//object[@cname='GtkColorSelection']/method[@name='SetChangePaletteWithScreenHook']" name="hidden">1</attr>
+  <attr path="//object[@cname='GtkColorSelection']/method[@name='SetPreviousColor']" name="hidden">1</attr>
   <attr path="//object[@cname='GtkContainer']/signal[@name='Add']" name="name">Added</attr>
+  <attr path="//object[@cname='GtkContainer']/signal[@name='CheckResize']" name="name">ResizeChecked</attr>
   <attr path="//object[@cname='GtkContainer']/signal[@name='Remove']" name="name">Removed</attr>
   <attr path="//object[@cname='GtkContainer']/signal[@name='SetFocusChild']" name="name">FocusChildSet</attr>
-  <attr path="//object[@cname='GtkContainer']/signal[@name='CheckResize']" name="name">ResizeChecked</attr>
+  <attr path="//object[@cname='GtkDialog']/constructor[@cname='gtk_dialog_new_with_buttons']/*/*[@type='GtkWindow*']" name="null_ok">1</attr>
   <attr path="//object[@cname='GtkDialog']/method[@name='Response']" name="name">Respond</attr>
   <attr path="//object[@cname='GtkEntry']/signal[@name='Activate']" name="name">Activated</attr>
-  <attr path="//object[@cname='GtkEntry']/signal[@name='PasteClipboard']" name="name">ClipboardPasted</attr>
-  <attr path="//object[@cname='GtkEntry']/signal[@name='CutClipboard']" name="name">ClipboardCut</attr>
   <attr path="//object[@cname='GtkEntry']/signal[@name='CopyClipboard']" name="name">ClipboardCopied</attr>
+  <attr path="//object[@cname='GtkEntry']/signal[@name='CutClipboard']" name="name">ClipboardCut</attr>
+  <attr path="//object[@cname='GtkEntry']/signal[@name='PasteClipboard']" name="name">ClipboardPasted</attr>
+  <attr path="//object[@cname='GtkFileSelection']/method[@name='GetSelections']" name="hidden">1</attr>
+  <attr path="//object[@cname='GtkFrame']/method[@name='GetLabelAlign']" name="hidden">1</attr>
+  <attr path="//object[@cname='GtkFrame']/method[@name='SetLabelAlign']" name="hidden">1</attr>
+  <attr path="//object[@cname='GtkFrame']" name="disabledefaultconstructor">1</attr>
+  <attr path="//object[@cname='GtkHandleBox']/property[@name='ShadowType']" name="hidden">1</attr>
+  <attr path="//object[@cname='GtkHScale']/constructor[@cname='gtk_hscale_new']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkHScrollbar']/constructor[@cname='gtk_hscrollbar_new']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
   <attr path="//object[@cname='GtkImageMenuItem']/constructor[@cname='gtk_image_menu_item_new_with_mnemonic']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkImage']/method[@name='SetFromPixmap']/*/*[@type='GdkBitmap*']" name="null_ok">1</attr>
   <attr path="//object[@cname='GtkIMContext']/signal[@name='DeleteSurrounding']" name="name">SurroundingDeleted</attr>
   <attr path="//object[@cname='GtkInvisible']/property[@name='Screen']" name="new_flag">1</attr>
-  <attr path="//object[@cname='GtkItem']/signal[@name='Select']" name="name">Selected</attr>
+  <attr path="//object[@cname='GtkItemFactory']/constructor[@cname='gtk_item_factory_new']/*/*[@type='GtkAccelGroup*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkItemFactory']/method[@name='GetItemByAction']" name="name">GetItem</attr>
+  <attr path="//object[@cname='GtkItemFactory']/method[@name='GetWidgetByAction']" name="name">GetWidget</attr>
   <attr path="//object[@cname='GtkItem']/signal[@name='Deselect']" name="name">Deselected</attr>
+  <attr path="//object[@cname='GtkItem']/signal[@name='Select']" name="name">Selected</attr>
   <attr path="//object[@cname='GtkItem']/signal[@name='Toggle']" name="name">Toggled</attr>
   <attr path="//object[@cname='GtkLabel']/constructor[@cname='gtk_label_new']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkLayout']/constructor[@cname='gtk_layout_new']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkLayout']/method[@name='SetHadjustment']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkLayout']/method[@name='SetVadjustment']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
   <attr path="//object[@cname='GtkLayout']/signal[@name='SetScrollAdjustments']" name="name">ScrollAdjustmentsSet</attr>
   <attr path="//object[@cname='GtkListStore']/constructor[@cname='gtk_list_store_newv']/parameters" name="va_type">length_param</attr>
   <attr path="//object[@cname='GtkListStore']/method[@name='Append']/*/*[@name='iter']" name="pass_as">out</attr>
-  <attr path="//object[@cname='GtkListStore']/method[@name='Insert']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkListStore']/method[@name='InsertAfter']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkListStore']/method[@name='InsertBefore']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkListStore']/method[@name='Insert']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkListStore']/method[@name='Prepend']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkListStore']/method[@name='Remove']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkListStore']/method[@name='SetColumnTypes']/*/*[@name='types']" name="array">1</attr>
-  <attr path="//object[@cname='GtkMenu']/method[@name='SetScreen']" name="new_flag">1</attr>
   <attr path="//object[@cname='GtkMenuItem']/constructor[@cname='gtk_menu_item_new_with_mnemonic']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkMenuItem']/method[@name='SetSubmenu']/*/*[@type='GtkWidget*']" name="null_ok">1</attr>
   <attr path="//object[@cname='GtkMenuItem']/signal[@name='Activate']" name="name">Activated</attr>
+  <attr path="//object[@cname='GtkMenuItem']/signal[@name='ChildNotify']" name="name">ChildNotified</attr>
   <attr path="//object[@cname='GtkMenuItem']/signal[@name='Deactivate']" name="name">Deactivated</attr>
-  <attr path="//object[@cname='GtkMenuItem']/signal[@name='ToggleSizeRequest']" name="name">ToggleSizeRequested</attr>
-  <attr path="//object[@cname='GtkMenuItem']/signal[@name='ToggleSizeAllocate']" name="name">ToggleSizeAllocated</attr>
+  <attr path="//object[@cname='GtkMenuItem']/signal[@name='MnemonicActivate']" name="name">MnemonicActivated</attr>
   <attr path="//object[@cname='GtkMenuItem']/signal[@name='RemoveWidget']" name="name">WidgetRemoved</attr>
   <attr path="//object[@cname='GtkMenuItem']/signal[@name='SizeAllocate']" name="name">SizeAllocated</attr>
-  <attr path="//object[@cname='GtkMenuItem']/signal[@name='MnemonicActivate']" name="name">MnemonicActivated</attr>
   <attr path="//object[@cname='GtkMenuItem']/signal[@name='SizeRequest']" name="name">SizeRequested</attr>
-  <attr path="//object[@cname='GtkMenuItem']/signal[@name='ChildNotify']" name="name">ChildNotified</attr>
+  <attr path="//object[@cname='GtkMenuItem']/signal[@name='ToggleSizeAllocate']" name="name">ToggleSizeAllocated</attr>
+  <attr path="//object[@cname='GtkMenuItem']/signal[@name='ToggleSizeRequest']" name="name">ToggleSizeRequested</attr>
+  <attr path="//object[@cname='GtkMenu']/method[@name='Popup']/*/*[@type='GtkMenuPositionFunc']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkMenu']/method[@name='Popup']/*/*[@type='GtkWidget*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkMenu']/method[@name='SetScreen']" name="new_flag">1</attr>
   <attr path="//object[@cname='GtkMenuShell']/signal[@name='Deactivate']" name="name">Deactivated</attr>
+  <attr path="//object[@cname='GtkMessageDialog']/constructor[@cname='gtk_message_dialog_new']/*/*[@type='GtkWindow*']" name="null_ok">1</attr>
   <attr path="//object[@cname='GtkObject']/signal[@name='Destroy']" name="name">Destroyed</attr>
+  <attr path="//object[@cname='GtkPixmap']/constructor[@cname='gtk_pixmap_new']/*/*[@type='GdkBitmap*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkPixmap']/method[@name='Set']/*/*[@type='GdkBitmap*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkProgressBar']/constructor[@cname='gtk_progress_bar_new_with_adjustment']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
   <attr path="//object[@cname='GtkProgressBar']" name="parent">GtkWidget</attr>
+  <attr path="//object[@cname='GtkRadioButton']/constructor[@cname='gtk_radio_button_new']/*/*[@type='GSList*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkRadioButton']/constructor[@cname='gtk_radio_button_new_with_label']/*/*[@type='GSList*']" name="null_ok">1</attr>
   <attr path="//object[@cname='GtkRadioButton']/constructor[@cname='gtk_radio_button_new_with_mnemonic']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkRadioButton']/constructor[@cname='gtk_radio_button_new_with_mnemonic']/*/*[@type='GSList*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkRadioButton']/property[@name='Group']" name="hidden">1</attr>
+  <attr path="//object[@cname='GtkRadioMenuItem']/constructor[@cname='gtk_radio_menu_item_new_with_label']/*/*[@type='GSList*']" name="null_ok">1</attr>
   <attr path="//object[@cname='GtkRadioMenuItem']/constructor[@cname='gtk_radio_menu_item_new_with_mnemonic']" name="preferred">1</attr>
+  <attr path="//object[@cname='GtkRcStyle']/method[@name='Ref']" name="hidden">1</attr>
+  <attr path="//object[@cname='GtkRcStyle']/method[@name='Unref']" name="hidden">1</attr>
+  <attr path="//object[@cname='GtkReadyEvent']" name="hidden">1</attr>
+  <attr path="//object[@cname='GtkScrolledWindow']/constructor[@cname='gtk_scrolled_window_new']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
   <attr path="//object[@cname='GtkScrolledWindow']/method[@name='GetPolicy']/*/*[@type='GtkPolicyType*']" name="pass_as">out</attr>
-  <attr path="//object[@cname='GtkText']/signal[@name='SetScrollAdjustments']" name="name">ScrollAdjustmentsSet</attr>
+  <attr path="//object[@cname='GtkScrolledWindow']" name="disabledefaultconstructor">1</attr>
+  <attr path="//object[@cname='GtkSpinButton']/constructor[@cname='gtk_spin_button_new']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkSpinButton']/method[@name='Configure']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkTable']/method[@name='AttachDefaults']" name="name">Attach</attr>
+  <attr path="//object[@cname='GtkTable']/method[@name='SetColSpacings']" name="hidden">1</attr>
+  <attr path="//object[@cname='GtkTable']/method[@name='SetRowSpacings']" name="hidden">1</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/constructor[@cname='gtk_text_buffer_new']/*/*[@type='GtkTextTagTable*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/method[@name='ApplyTagByName']" name="name">ApplyTag</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/method[@name='DeleteMarkByName']" name="name">DeleteMark</attr>
   <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetBounds']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetEndIter']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetInsert']" name="name">GetInsertMark</attr>
   <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtChildAnchor']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
-  <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtLine']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtLineIndex']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtLineOffset']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtLine']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtMark']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetIterAtOffset']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetSelectionBounds']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetStartIter']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
-  <attr path="//object[@cname='GtkTextBuffer']/method[@name='GetInsert']" name="name">GetInsertMark</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/method[@name='MoveMarkByName']" name="name">MoveMark</attr>
+  <attr path="//object[@cname='GtkTextBuffer']/method[@name='RemoveTagByName']" name="name">RemoveTag</attr>
   <attr path="//object[@cname='GtkTextBuffer']/signal[@name='ApplyTag']" name="name">TagApplied</attr>
   <attr path="//object[@cname='GtkTextBuffer']/signal[@name='BeginUserAction']" name="name">UserActionBegun</attr>
   <attr path="//object[@cname='GtkTextBuffer']/signal[@name='EndUserAction']" name="name">UserActionEnded</attr>
@@ -97,51 +170,71 @@
   <attr path="//object[@cname='GtkTextBuffer']/signal[@name='RemoveChildAnchor']" name="name">ChildAnchorRemoved</attr>
   <attr path="//object[@cname='GtkTextBuffer']/signal[@name='RemoveTag']" name="name">TagRemoved</attr>
   <attr path="//object[@cname='GtkTextLayout']/method[@name='GetIterAtLine']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkText']/signal[@name='SetScrollAdjustments']" name="name">ScrollAdjustmentsSet</attr>
   <attr path="//object[@cname='GtkTextTag']/method[@name='Event']" name="name">ProcessEvent</attr>
-  <attr path="//object[@cname='GtkTextTag']/signal[@name='Event']" name="name">TextEvent</attr>
   <attr path="//object[@cname='GtkTextTag']/property[@name='Weight']" name="type">PangoWeight</attr>
+  <attr path="//object[@cname='GtkTextTag']/signal[@name='Event']" name="name">TextEvent</attr>
   <attr path="//object[@cname='GtkTextView']/method[@name='GetIterAtLocation']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTextView']/method[@name='GetLineAtY']/*/*[@type='GtkTextIter*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTextView']/signal[@name='SetScrollAdjustments']" name="name">ScrollAdjustmentsSet</attr>
   <attr path="//object[@cname='GtkToggleButton']/constructor[@cname='gtk_toggle_button_new_with_mnemonic']" name="preferred">1</attr>
   <attr path="//object[@cname='GtkToggleButton']/method[@name='Toggled']" name="name">Toggle</attr>
+  <attr path="//object[@cname='GtkToolbar']/method[@name='AppendItem']/*/*[@type='gpointer']" name="null_ok">1</attr>
   <attr path="//object[@cname='GtkTreeModelSort']/method[@name='ConvertChildIterToIter']/*/*[@name='sort_iter']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTreeModelSort']/method[@name='ConvertIterToChildIter']/*/*[@name='child_iter']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTreeSelection']/method[@name='GetSelected']/*/*" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTreeStore']/constructor[@cname='gtk_tree_store_newv']/parameters" name="va_type">length_param</attr>
   <attr path="//object[@cname='GtkTreeStore']/method[@name='Append']/*/*[@name='iter']" name="pass_as">out</attr>
-  <attr path="//object[@cname='GtkTreeStore']/method[@name='Insert']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTreeStore']/method[@name='InsertAfter']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTreeStore']/method[@name='InsertBefore']/*/*[@name='iter']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeStore']/method[@name='Insert']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTreeStore']/method[@name='Prepend']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTreeStore']/method[@name='Remove']/*/*[@name='iter']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTreeStore']/method[@name='SetColumnTypes']/*/*[@name='types']" name="array">1</attr>
+  <attr path="//object[@cname='GtkTreeViewColumn']/method[@name='Clicked']" name="name">Click</attr>
+  <attr path="//object[@cname='GtkTreeView']/constructor[@cname='gtk_tree_view_new_with_model']/*/*[@type='GtkTreeModel*']" name="null_ok">1</attr>
   <attr path="//object[@cname='GtkTreeView']/method[@name='GetCellArea']/*/*[@name='rect']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTreeView']/method[@name='GetCursor']/*/*[@name='focus_column']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTreeView']/method[@name='GetCursor']/*/*[@name='path']" name="pass_as">out</attr>
-  <attr path="//object[@cname='GtkTreeView']/method[@name='GetDestRowAtPos']/*/*[@name='pos']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTreeView']/method[@name='GetDestRowAtPos']/*/*[@name='path']" name="pass_as">out</attr>
-  <attr path="//object[@cname='GtkTreeView']/method[@name='GetDragDestRow']/*/*[@name='pos']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeView']/method[@name='GetDestRowAtPos']/*/*[@name='pos']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkTreeView']/method[@name='GetDragDestRow']/*/*[@name='path']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeView']/method[@name='GetDragDestRow']/*/*[@name='pos']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkTreeView']/method[@name='GetPathAtPos']" name="hidden">1</attr>
+  <attr path="//object[@cname='GtkTreeView']/method[@name='GetSearchEqualFunc']" name="hidden">1</attr>
   <attr path="//object[@cname='GtkTreeView']/method[@name='RowActivated']" name="name">ActivateRow</attr>
   <attr path="//object[@cname='GtkTreeView']/method[@name='RowExpanded']" name="name">RowExpand</attr>
+  <attr path="//object[@cname='GtkTreeView']/method[@name='ScrollToCell']/*/*[@type='GtkTreePath*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkTreeView']/method[@name='ScrollToCell']/*/*[@type='GtkTreeViewColumn*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkTreeView']/method[@name='SetModel']/*/*[@type='GtkTreeModel*']" name="null_ok">1</attr>
   <attr path="//object[@cname='GtkTreeView']/signal[@name='SetScrollAdjustments']" name="name">ScrollAdjustmentsSet</attr>
-  <attr path="//object[@cname='GtkTreeViewColumn']/method[@name='Clicked']" name="name">Click</attr>
+  <attr path="//object[@cname='GtkViewport']/constructor[@cname='gtk_viewport_new']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkViewport']/method[@name='SetHadjustment']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkViewport']/method[@name='SetVadjustment']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkViewport']" name="disabledefaultconstructor">1</attr>
   <attr path="//object[@cname='GtkViewport']/signal[@name='SetScrollAdjustments']" name="name">ScrollAdjustmentsSet</attr>
+  <attr path="//object[@cname='GtkVScale']/constructor[@cname='gtk_vscale_new']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkVScrollbar']/constructor[@cname='gtk_vscrollbar_new']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
   <attr path="//object[@cname='GtkWidget']/method[@name='ClassPath']/*/*[@type='gchar**']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='Destroyed']" name="hidden">1</attr>
   <attr path="//object[@cname='GtkWidget']/method[@name='Event']" name="name">ProcessEvent</attr>
-  <attr path="//object[@cname='GtkWidget']/method[@name='GetStyle']" name="needs_ref">1</attr>
-  <attr path="//object[@cname='GtkWidget']/method[@name='GetModifierStyle']" name="needs_ref">1</attr>
-  <attr path="//object[@cname='GtkWidget']/method[@name='GetDefaultStyle']" name="needs_ref">1</attr>
-  <attr path="//object[@cname='GtkWidget']/method[@name='GetParentWindow']" name="needs_ref">1</attr>
   <attr path="//object[@cname='GtkWidget']/method[@name='GetColormap']" name="needs_ref">1</attr>
-  <attr path="//object[@cname='GtkWidget']/method[@name='GetVisual']" name="needs_ref">1</attr>
   <attr path="//object[@cname='GtkWidget']/method[@name='GetDefaultColormap']" name="needs_ref">1</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='GetDefaultStyle']" name="needs_ref">1</attr>
   <attr path="//object[@cname='GtkWidget']/method[@name='GetDefaultVisual']" name="needs_ref">1</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='GetModifierStyle']" name="needs_ref">1</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='GetParentWindow']" name="needs_ref">1</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='GetStyle']" name="needs_ref">1</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='GetVisual']" name="needs_ref">1</attr>
   <attr path="//object[@cname='GtkWidget']/method[@name='Intersect']/*/*[@name='intersection']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkWidget']/method[@name='IsFocus']" name="name">GetIsFocus</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='ListAccelClosures']" name="hidden">1</attr>
   <attr path="//object[@cname='GtkWidget']/method[@name='Path']/*/*[@type='gchar**']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='Ref']" name="hidden">1</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='SetScrollAdjustments']/*/*[@type='GtkAdjustment*']" name="null_ok">1</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='SetStyle']/*/*[@type='GtkStyle*']" name="null_ok">1</attr>
   <attr path="//object[@cname='GtkWidget']/method[@name='SizeRequest']/*/*[@name='requisition']" name="pass_as">ref</attr>
+  <attr path="//object[@cname='GtkWidget']/method[@name='Unref']" name="hidden">1</attr>
   <attr path="//object[@cname='GtkWidget']/signal[@name='ChildNotify']" name="name">ChildNotified</attr>
   <attr path="//object[@cname='GtkWidget']/signal[@name='Event']" name="name">WidgetEvent</attr>
   <attr path="//object[@cname='GtkWidget']/signal[@name='Focus']" name="name">Focused</attr>
@@ -150,24 +243,42 @@
   <attr path="//object[@cname='GtkWidget']/signal[@name='Map']" name="name">Mapped</attr>
   <attr path="//object[@cname='GtkWidget']/signal[@name='MnemonicActivate']" name="name">MnemonicActivated</attr>
   <attr path="//object[@cname='GtkWidget']/signal[@name='Realize']" name="name">Realized</attr>
-  <attr path="//object[@cname='GtkWidget']/signal[@name='Show']" name="name">Shown</attr>
   <attr path="//object[@cname='GtkWidget']/signal[@name='ShowHelp']" name="name">HelpShown</attr>
+  <attr path="//object[@cname='GtkWidget']/signal[@name='Show']" name="name">Shown</attr>
   <attr path="//object[@cname='GtkWidget']/signal[@name='SizeAllocate']" name="name">SizeAllocated</attr>
   <attr path="//object[@cname='GtkWidget']/signal[@name='SizeRequest']" name="name">SizeRequested</attr>
   <attr path="//object[@cname='GtkWidget']/signal[@name='Unmap']" name="name">Unmapped</attr>
   <attr path="//object[@cname='GtkWidget']/signal[@name='Unrealize']" name="name">Unrealized</attr>
-  <attr path="//object[@cname='GtkWindow']/signal[@name='ActivateDefault']" name="name">DefaultActivated</attr>
-  <attr path="//object[@cname='GtkWindow']/signal[@name='ActivateFocus']" name="name">FocusActivated</attr>
-  <attr path="//object[@cname='GtkWindow']/property[@name='Screen']" name="new_flag">1</attr>
+  <attr path="//object[@cname='GtkWindow']/method[@name='GetDefaultSize']/*/*[@type='gint*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkWindow']/method[@name='GetPosition']/*/*[@type='gint*']" name="pass_as">out</attr>
   <attr path="//object[@cname='GtkWindow']/method[@name='GetSize']/*/*[@type='gint*']" name="pass_as">out</attr>
-  <attr path="//object[@cname='GtkWindow']/method[@name='GetDefaultSize']/*/*[@type='gint*']" name="pass_as">out</attr>
+  <attr path="//object[@cname='GtkWindow']/property[@name='Screen']" name="new_flag">1</attr>
+  <attr path="//object[@cname='GtkWindow']/signal[@name='ActivateDefault']" name="name">DefaultActivated</attr>
+  <attr path="//object[@cname='GtkWindow']/signal[@name='ActivateFocus']" name="name">FocusActivated</attr>
+  <attr path="//struct[@cname='GtkBindingArg']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GtkBindingEntry']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GtkBindingSet']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GtkBindingSignal']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GtkBoxChild']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GtkFixedChild']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GtkItemFactoryItem']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GtkKeyHash']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GtkLabelSelectionInfo']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GtkProgressClass']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GtkProgress']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GtkRangeLayout']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GtkRangeStepTimer']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GtkRcContext']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GtkTableChild']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GtkTableRowCol']" name="hidden">1</attr>
   <attr path="//struct[@cname='GtkTargetEntry']/field[@cname='flags']" name="type">GtkTargetFlags</attr>
-  <attr path="//class[@cname='GtkAccelerator_']/method[@name='GetDefaultModMask']/return-type" name="type">GdkModifierType</attr>
-  <attr path="//class[@cname='GtkStock_']" name="name">StockManager</attr>
+  <attr path="//struct[@cname='GtkToolbarChild']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GtkWidgetAuxInfo']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GtkWidgetShapeInfo']" name="hidden">1</attr>
+  <attr path="//struct[@cname='GtkWindowGeometryInfo']" name="hidden">1</attr>
   <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintArrow']">//object[@cname='GtkStyle']</move-node>
-  <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintBox']">//object[@cname='GtkStyle']</move-node>
   <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintBoxGap']">//object[@cname='GtkStyle']</move-node>
+  <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintBox']">//object[@cname='GtkStyle']</move-node>
   <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintCheck']">//object[@cname='GtkStyle']</move-node>
   <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintDiamond']">//object[@cname='GtkStyle']</move-node>
   <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintExpander']">//object[@cname='GtkStyle']</move-node>
@@ -180,10 +291,9 @@
   <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintOption']">//object[@cname='GtkStyle']</move-node>
   <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintPolygon']">//object[@cname='GtkStyle']</move-node>
   <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintResizeGrip']">//object[@cname='GtkStyle']</move-node>
-  <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintShadow']">//object[@cname='GtkStyle']</move-node>
   <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintShadowGap']">//object[@cname='GtkStyle']</move-node>
+  <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintShadow']">//object[@cname='GtkStyle']</move-node>
   <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintSlider']">//object[@cname='GtkStyle']</move-node>
   <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintTab']">//object[@cname='GtkStyle']</move-node>
   <move-node path="//class[@cname='GtkGlobal']/method[@name='PaintVline']">//object[@cname='GtkStyle']</move-node>
 </metadata>
-
diff --git a/gtk/gtk-api.xml b/gtk/gtk-api.xml
index b9bcc46f2..446447d3b 100644
--- a/gtk/gtk-api.xml
+++ b/gtk/gtk-api.xml
@@ -1547,7 +1547,7 @@
           <parameter type="guint" name="padding" />
         </parameters>
       </method>
-      <method name="PackEnd" cname="gtk_box_pack_end_defaults">
+      <method cname="gtk_box_pack_end_defaults" name="PackEnd">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
@@ -1562,7 +1562,7 @@
           <parameter type="guint" name="padding" />
         </parameters>
       </method>
-      <method name="PackStart" cname="gtk_box_pack_start_defaults">
+      <method cname="gtk_box_pack_start_defaults" name="PackStart">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
@@ -3969,7 +3969,7 @@
           <parameter type="const-gchar*" name="path" />
         </parameters>
       </method>
-      <method name="GetItem" cname="gtk_item_factory_get_item_by_action">
+      <method cname="gtk_item_factory_get_item_by_action" name="GetItem">
         <return-type type="GtkWidget*" />
         <parameters>
           <parameter type="guint" name="action" />
@@ -3984,7 +3984,7 @@
           <parameter type="const-gchar*" name="path" />
         </parameters>
       </method>
-      <method name="GetWidget" cname="gtk_item_factory_get_widget_by_action">
+      <method cname="gtk_item_factory_get_widget_by_action" name="GetWidget">
         <return-type type="GtkWidget*" />
         <parameters>
           <parameter type="guint" name="action" />
@@ -6319,22 +6319,6 @@
           <parameter type="gint" name="height" />
         </parameters>
       </method>
-      <method name="PaintBox" cname="gtk_paint_box" shared="true">
-        <return-type type="void" />
-        <parameters>
-          <parameter type="GtkStyle*" name="style" />
-          <parameter type="GdkWindow*" name="window" />
-          <parameter type="GtkStateType" name="state_type" />
-          <parameter type="GtkShadowType" name="shadow_type" />
-          <parameter type="GdkRectangle*" name="area" />
-          <parameter type="GtkWidget*" name="widget" />
-          <parameter type="const-gchar*" name="detail" />
-          <parameter type="gint" name="x" />
-          <parameter type="gint" name="y" />
-          <parameter type="gint" name="width" />
-          <parameter type="gint" name="height" />
-        </parameters>
-      </method>
       <method name="PaintBoxGap" cname="gtk_paint_box_gap" shared="true">
         <return-type type="void" />
         <parameters>
@@ -6354,6 +6338,22 @@
           <parameter type="gint" name="gap_width" />
         </parameters>
       </method>
+      <method name="PaintBox" cname="gtk_paint_box" shared="true">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GtkShadowType" name="shadow_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
+        </parameters>
+      </method>
       <method name="PaintCheck" cname="gtk_paint_check" shared="true">
         <return-type type="void" />
         <parameters>
@@ -6541,22 +6541,6 @@
           <parameter type="gint" name="height" />
         </parameters>
       </method>
-      <method name="PaintShadow" cname="gtk_paint_shadow" shared="true">
-        <return-type type="void" />
-        <parameters>
-          <parameter type="GtkStyle*" name="style" />
-          <parameter type="GdkWindow*" name="window" />
-          <parameter type="GtkStateType" name="state_type" />
-          <parameter type="GtkShadowType" name="shadow_type" />
-          <parameter type="GdkRectangle*" name="area" />
-          <parameter type="GtkWidget*" name="widget" />
-          <parameter type="const-gchar*" name="detail" />
-          <parameter type="gint" name="x" />
-          <parameter type="gint" name="y" />
-          <parameter type="gint" name="width" />
-          <parameter type="gint" name="height" />
-        </parameters>
-      </method>
       <method name="PaintShadowGap" cname="gtk_paint_shadow_gap" shared="true">
         <return-type type="void" />
         <parameters>
@@ -6576,6 +6560,22 @@
           <parameter type="gint" name="gap_width" />
         </parameters>
       </method>
+      <method name="PaintShadow" cname="gtk_paint_shadow" shared="true">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkStyle*" name="style" />
+          <parameter type="GdkWindow*" name="window" />
+          <parameter type="GtkStateType" name="state_type" />
+          <parameter type="GtkShadowType" name="shadow_type" />
+          <parameter type="GdkRectangle*" name="area" />
+          <parameter type="GtkWidget*" name="widget" />
+          <parameter type="const-gchar*" name="detail" />
+          <parameter type="gint" name="x" />
+          <parameter type="gint" name="y" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
+        </parameters>
+      </method>
       <method name="PaintSlider" cname="gtk_paint_slider" shared="true">
         <return-type type="void" />
         <parameters>
@@ -6652,7 +6652,7 @@
           <parameter type="guint" name="ypadding" />
         </parameters>
       </method>
-      <method name="Attach" cname="gtk_table_attach_defaults">
+      <method cname="gtk_table_attach_defaults" name="Attach">
         <return-type type="void" />
         <parameters>
           <parameter type="GtkWidget*" name="widget" />
@@ -6853,7 +6853,7 @@
           <parameter type="const-GtkTextIter*" name="end" />
         </parameters>
       </method>
-      <method name="ApplyTag" cname="gtk_text_buffer_apply_tag_by_name">
+      <method cname="gtk_text_buffer_apply_tag_by_name" name="ApplyTag">
         <return-type type="void" />
         <parameters>
           <parameter type="const-gchar*" name="name" />
@@ -6920,7 +6920,7 @@
           <parameter type="GtkTextMark*" name="mark" />
         </parameters>
       </method>
-      <method name="DeleteMark" cname="gtk_text_buffer_delete_mark_by_name">
+      <method cname="gtk_text_buffer_delete_mark_by_name" name="DeleteMark">
         <return-type type="void" />
         <parameters>
           <parameter type="const-gchar*" name="name" />
@@ -7139,7 +7139,7 @@
           <parameter type="const-GtkTextIter*" name="where" />
         </parameters>
       </method>
-      <method name="MoveMark" cname="gtk_text_buffer_move_mark_by_name">
+      <method cname="gtk_text_buffer_move_mark_by_name" name="MoveMark">
         <return-type type="void" />
         <parameters>
           <parameter type="const-gchar*" name="name" />
@@ -7186,7 +7186,7 @@
           <parameter type="const-GtkTextIter*" name="end" />
         </parameters>
       </method>
-      <method name="RemoveTag" cname="gtk_text_buffer_remove_tag_by_name">
+      <method cname="gtk_text_buffer_remove_tag_by_name" name="RemoveTag">
         <return-type type="void" />
         <parameters>
           <parameter type="const-gchar*" name="name" />
diff --git a/sources/Gtk.metadata b/sources/Gtk.metadata
deleted file mode 100644
index 7550fc0c8..000000000
--- a/sources/Gtk.metadata
+++ /dev/null
@@ -1,697 +0,0 @@
-<?xml version="1.0"?>
-<metadata>
-
-<!-- hidden classes -->
-<rule>
-  <class name="GtkBindingArg"/>
-  <class name="GtkBindingEntry"/>
-  <class name="GtkBindingSignal"/>
-  <class name="GtkBindingSet"/>
-  <class name="GtkBorder"/>
-  <class name="GtkBoxChild"/>
-  <class name="GtkDebugFlag"/>
-  <class name="GtkDestDefaults"/>
-  <class name="GtkExpanderStyle"/>
-  <class name="GtkFixedChild"/>
-  <class name="GtkIdle_"/>
-  <class name="GtkItemFactoryItem"/>
-  <class name="GtkKeyHash"/>
-  <class name="GtkLabelSelectionInfo"/>
-  <class name="GtkObjectFlags"/>
-  <class name="GtkPathPriorityType"/>
-  <class name="GtkPathType"/>
-  <class name="GtkProgress"/>
-  <class name="GtkProgressClass"/>
-  <class name="GtkRangeLayout"/>
-  <class name="GtkRangeStepTimer"/>
-  <class name="GtkRBNodeColor"/>
-  <class name="GtkRcContext"/>
-  <class name="GtkRcFlags"/>
-  <class name="GtkReadyEvent"/>
-  <class name="GtkTableChild"/>
-  <class name="GtkTableRowCol"/>
-  <class name="GtkToolbarChild"/>
-  <class name="GtkToolbarSpaceStyle"/>
-  <class name="GtkWidgetAuxInfo"/>
-  <class name="GtkWidgetFlags"/>
-  <class name="GtkWidgetShapeInfo"/>
-  <class name="GtkWindowGeometryInfo"/>
-  <data>
-    <attribute target="class">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-
-<!-- hidden methods -->
-<rule>
-  <class name="GtkArrow">
-    <method>Set</method>
-   </class>
-  <class name="GtkColorSelection">
-    <method>GetPreviousColor</method>
-    <method>PaletteFromString</method>
-    <method>PaletteToString</method>
-    <method>SetChangePaletteWithScreenHook</method>
-    <method>SetChangePaletteHook</method>
-    <method>SetPreviousColor</method>
-  </class>
-  <class name="GtkFileSelection">
-    <method>GetSelections</method>
-  </class>
-  <class name="GtkFrame">
-    <method>GetLabelAlign</method>
-    <method>SetLabelAlign</method>
-   </class>
-  <class name="GtkIconSet">
-    <method>GetSizes</method>
-  </class>
-  <class name="GtkRcStyle">
-    <method>Ref</method>
-    <method>Unref</method>
-  </class>
-  <class name="GtkSelectionData">
-    <method>GetText</method>
-    <method>SetText</method>
-    <method>Set</method>
-  </class>
-  <class name="GtkTable">
-    <method>SetColSpacings</method>
-    <method>SetRowSpacings</method>
-   </class>
-  <class name="GtkTreePath">
-    <method>GetIndices</method>
-  </class>
-  <class name="GtkTreeView">
-    <method>GetPathAtPos</method>
-    <method>GetSearchEqualFunc</method>
-  </class>
-  <class name="GtkWidget">
-    <method>Destroyed</method>
-    <method>ListAccelClosures</method>
-    <method>Ref</method>
-    <method>Unref</method>
-  </class>
-   <data>
-    <attribute target="method">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-   </data>
-</rule>
-
-<!-- hidden properties -->
-<rule>
-  <class name="GtkHandleBox">
-    <property>ShadowType</property>
-  </class>
-  <class name="GtkRadioButton">
-    <property>Group</property>
-  </class>
-  <data>
-    <attribute target="property">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-
-<!-- overloads -->
-<rule>
-  <class name="GtkBox">
-    <method>PackStartDefaults</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>PackStart</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkBox">
-    <method>PackEndDefaults</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>PackEnd</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTable">
-    <method>AttachDefaults</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>Attach</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextBuffer">
-    <method>MoveMarkByName</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>MoveMark</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextBuffer">
-    <method>DeleteMarkByName</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>DeleteMark</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextBuffer">
-    <method>ApplyTagByName</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>ApplyTag</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextBuffer">
-    <method>RemoveTagByName</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>RemoveTag</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkItemFactory">
-    <method>GetItemByAction</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>GetItem</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkItemFactory">
-    <method>GetWidgetByAction</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>GetWidget</value>
-    </attribute>
-  </data>
-</rule>
-
-<!-- disable default constructor -->
-<rule>
-  <class name="GtkScrolledWindow"/>
-  <class name="GtkViewport"/>
-  <class name="GtkFrame"/>
-  <data>
-    <attribute target="class">
-      <name>disabledefaultconstructor</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-
-<!-- null args -->
-<rule>
-  <class name="GtkDialog">
-    <constructor>gtk_dialog_new_with_buttons</constructor>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkWindow*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkHScale">
-    <constructor>gtk_hscale_new</constructor>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkAdjustment*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkHScrollbar">
-    <constructor>gtk_hscrollbar_new</constructor>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkAdjustment*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkImage">
-    <method>SetFromPixmap</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GdkBitmap*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkItemFactory">
-    <constructor>gtk_item_factory_new</constructor>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkAccelGroup*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkLayout">
-    <constructor>gtk_layout_new</constructor>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkAdjustment*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkLayout">
-    <method>SetHadjustment</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkAdjustment*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkLayout">
-    <method>SetVadjustment</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkAdjustment*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkMessageDialog">
-    <constructor>gtk_message_dialog_new</constructor>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkWindow*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkPixmap">
-    <constructor>gtk_pixmap_new</constructor>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GdkBitmap*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkPixmap">
-    <method>Set</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GdkBitmap*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeView">
-    <method>ScrollToCell</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkTreeViewColumn*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-    <attribute target="param">
-      <filter level="type">GtkTreePath*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkProgressBar">
-    <constructor>gtk_progress_bar_new_with_adjustment</constructor>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkAdjustment*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkScrolledWindow">
-    <constructor>gtk_scrolled_window_new</constructor>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkAdjustment*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkSpinButton">
-    <method>Configure</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkAdjustment*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkSpinButton">
-    <constructor>gtk_spin_button_new</constructor>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkAdjustment*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextBuffer">
-    <constructor>gtk_text_buffer_new</constructor>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkTextTagTable*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextIter">
-    <method>ForwardToTagToggle</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkTextTag*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextIter">
-    <method>BackwardToTagToggle</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkTextTag*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextIter">
-    <method>ForwardSearch</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkTextIter*</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTextIter">
-    <method>BackwardSearch</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkTextIter*</filter>
-      <name>pass_as</name>
-      <value>out</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkToolbar">
-    <method>AppendItem</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">gpointer</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeView">
-    <constructor>gtk_tree_view_new_with_model</constructor>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkTreeModel*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkTreeView">
-    <method>SetModel</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkTreeModel*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkViewport">
-    <constructor>gtk_viewport_new</constructor>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkAdjustment*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkViewport">
-    <method>SetHadjustment</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkAdjustment*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkViewport">
-    <method>SetVadjustment</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkAdjustment*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkVScale">
-    <constructor>gtk_vscale_new</constructor>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkAdjustment*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkVScrollbar">
-    <constructor>gtk_vscrollbar_new</constructor>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkAdjustment*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <method>SetScrollAdjustments</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkAdjustment*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkWidget">
-    <method>SetStyle</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkStyle*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkMenuItem">
-    <method>SetSubmenu</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkWidget*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkRadioMenuItem">
-    <constructor>gtk_radio_menu_item_new_with_label</constructor>
-  </class>
-  <data>
-   <attribute target="param">
-    <filter level="type">GSList*</filter>
-    <name>null_ok</name>
-    <value>1</value>
-   </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkRadioButton">
-    <constructor>gtk_radio_button_new</constructor>
-  </class>
-  <data>
-   <attribute target="param">
-    <filter level="type">GSList*</filter>
-    <name>null_ok</name>
-    <value>1</value>
-   </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkRadioButton">
-    <constructor>gtk_radio_button_new_with_label</constructor>
-  </class>
-  <data>
-   <attribute target="param">
-    <filter level="type">GSList*</filter>
-    <name>null_ok</name>
-    <value>1</value>
-   </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkRadioButton">
-    <constructor>gtk_radio_button_new_with_mnemonic</constructor>
-  </class>
-  <data>
-   <attribute target="param">
-    <filter level="type">GSList*</filter>
-    <name>null_ok</name>
-    <value>1</value>
-   </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkMenu">
-    <method>Popup</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkWidget*</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-<rule>
-  <class name="GtkMenu">
-    <method>Popup</method>
-  </class>
-  <data>
-    <attribute target="param">
-      <filter level="type">GtkMenuPositionFunc</filter>
-      <name>null_ok</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-
-</metadata>