From 9e5e8e5491a6b611c88fffaf9a6c30c3775c6663 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@novell.com>
Date: Thu, 21 Apr 2011 10:49:39 -0500
Subject: [PATCH] StyleContenxt and GdkRGBA property cleanup

* gtk/Gtk.metadata: properties of type GdkRGBA get converted to
   type="GdkRgba" by the parser name mangling.  Manual fix those
   and clean up the lists, ellipsis, and out param API in the new
   StyleContext object.
---
 gtk/Gtk.metadata | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index 345e9caf0..45ab4b2df 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -7,7 +7,6 @@
   <attr path="/api/namespace/struct[@cname='GtkActionEntry']" name="hidden">1</attr>
   <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="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>
@@ -246,11 +245,15 @@
   <attr path="/api/namespace/object[@cname='GtkCellArea']/signal[@name='ApplyAttributes']" name="name">AttributesApplied</attr>
   <attr path="/api/namespace/object[@cname='GtkCellRenderer']/method[@name='StartEditing']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkCellRenderer']/method[@name='GetSize']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkCellRenderer']/property[@name='CellBackgroundRgba']" name="type">GdkRGBA</attr>
   <attr path="/api/namespace/object[@cname='GtkCellRenderer']/virtual_method[@cname='get_size']/*/*[@name='cell_area']" name="pass_as">ref</attr>
   <attr path="/api/namespace/object[@cname='GtkCellRenderer']/virtual_method[@cname='get_size']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkCellRendererPixbuf']/property[@cname='gicon']" name="name">Icon</attr>
   <attr path="/api/namespace/object[@cname='GtkCellRendererProgress']/property[@name='TextXalign']" name="name">TextXAlign</attr>
   <attr path="/api/namespace/object[@cname='GtkCellRendererProgress']/property[@name='TextYalign']" name="name">TextYAlign</attr>
+  <attr path="/api/namespace/object[@cname='GtkCellRendererText']/property[@name='BackgroundRgba']" name="type">GdkRGBA</attr>
+  <attr path="/api/namespace/object[@cname='GtkCellRendererText']/property[@name='ForegroundRgba']" name="type">GdkRGBA</attr>
+  <attr path="/api/namespace/object[@cname='GtkCellView']/property[@name='BackgroundRgba']" name="type">GdkRGBA</attr>
   <attr path="/api/namespace/object[@cname='GtkCheckButton']/constructor[@cname='gtk_check_button_new_with_mnemonic']" name="preferred">1</attr>
   <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>
@@ -266,12 +269,14 @@
   <attr path="/api/namespace/object[@cname='GtkClipboard']/method[@name='RequestRichText']" name="hidden">1</attr>
   <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='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>
   <attr path="/api/namespace/object[@cname='GtkColorSelection']/method[@name='PaletteToString']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkColorSelection']/method[@name='SetChangePaletteWithScreenHook']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GtkColorSelection']/method[@name='SetPreviousColor']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkColorSelection']/property[@name='CurrentRgba']" name="type">GdkRGBA</attr>
   <attr path="/api/namespace/object[@cname='GtkColorSelectionDialog']/method[@name='GetColorSelection']/return-type" name="type">GtkColorSelection*</attr>
   <attr path="/api/namespace/object[@cname='GtkColorSelectionDialog']/property[@name='OkButton']" name="type">GtkButton*</attr>
   <attr path="/api/namespace/object[@cname='GtkColorSelectionDialog']/property[@name='CancelButton']" name="type">GtkButton*</attr>
@@ -503,6 +508,19 @@
   <attr path="/api/namespace/object[@cname='GtkStatusIcon']/method[@name='GetGicon']" name="name">GetIcon</attr>
   <attr path="/api/namespace/object[@cname='GtkStatusIcon']/property[@cname='gicon']" name="name">Icon</attr>
   <attr path="/api/namespace/object[@cname='GtkStyle']/method[@name='LookupColor']/*/*[@name='color']" name="pass_as">out</attr>
+  <attr path="/api/namespace/object[@cname='GtkStyleContext']/method[@name='Get']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkStyleContext']/method[@name='GetBackgroundColor']/*/parameter[@name='color']" name="pass_as">out</attr>
+  <attr path="/api/namespace/object[@cname='GtkStyleContext']/method[@name='GetBorderColor']/*/parameter[@name='color']" name="pass_as">out</attr>
+  <attr path="/api/namespace/object[@cname='GtkStyleContext']/method[@name='GetColor']/*/parameter[@name='color']" name="pass_as">out</attr>
+  <attr path="/api/namespace/object[@cname='GtkStyleContext']/method[@name='GetStyle']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkStyleContext']/method[@name='GetStyleProperty']/*/parameter[@name='value']" name="pass_as">out</attr>
+  <attr path="/api/namespace/object[@cname='GtkStyleContext']/method[@name='GetStyleValist']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkStyleContext']/method[@name='GetValist']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkStyleContext']/method[@name='ListClasses']/return-type" name="element_type">const-gchar*</attr>
+  <attr path="/api/namespace/object[@cname='GtkStyleContext']/method[@name='ListClasses']/return-type" name="owned">true</attr>
+  <attr path="/api/namespace/object[@cname='GtkStyleContext']/method[@name='ListRegions']/return-type" name="element_type">const-gchar*</attr>
+  <attr path="/api/namespace/object[@cname='GtkStyleContext']/method[@name='ListRegions']/return-type" name="owned">true</attr>
+  <attr path="/api/namespace/object[@cname='GtkStyleContext']/method[@name='LookupColor']/*/parameter[@name='color']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkTable']/constructor[@cname='gtk_table_new']/*/*[@name='columns']" name="property_name">n_columns</attr>
   <attr path="/api/namespace/object[@cname='GtkTable']/constructor[@cname='gtk_table_new']/*/*[@name='rows']" name="property_name">n_rows</attr>
   <attr path="/api/namespace/object[@cname='GtkTable']/method[@name='AttachDefaults']" name="name">Attach</attr>
@@ -684,6 +702,7 @@
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetParentWindow']" name="needs_ref">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetPath']" name="name">GetWidgetPath</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetRealized']" name="name">GetIsRealized</attr>
+  <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetRequisition']/*/parameter[@name='requisition']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetStyle']" name="needs_ref">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetVisual']" name="needs_ref">1</attr>
   <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='HasDefault']" name="name">GetHasDefault</attr>
@@ -769,8 +788,6 @@
   <attr path="/api/namespace/struct[@cname='GtkTextLogAttrCache']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GtkWidgetAuxInfo']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GtkWindowGeometryInfo']" name="hidden">1</attr>
-  <attr path="/api/namespace/object[@cname='GtkStyleContext']/method[@name='GetBackgroundColor']/*/parameter[@name='color']" name="pass_as">out</attr>
-  <attr path="/api/namespace/object[@cname='GtkWidget']/method[@name='GetRequisition']/*/parameter[@name='requisition']" name="pass_as">out</attr>
   <move-node path="/api/namespace/class[@cname='GtkBindings_']/method[@name='BindingsActivate']">/api/namespace/class[@cname='GtkGlobal']</move-node>
   <move-node path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintArrow']">/api/namespace/object[@cname='GtkStyle']</move-node>
   <move-node path="/api/namespace/class[@cname='GtkGlobal']/method[@name='PaintBoxGap']">/api/namespace/object[@cname='GtkStyle']</move-node>