From 139191f537d18942a007dde9f1d64ab19155fd6d Mon Sep 17 00:00:00 2001
From: Bertrand Lorentz <bertrand.lorentz@gmail.com>
Date: Fri, 8 Jul 2011 19:50:12 +0200
Subject: [PATCH] Fix naming collisions created by the interface parsing fix

The previous commit added several new signals in Gio.ActionGroup and
Gtk.GtkCellEditable that collide with method names. Do some rename
to fix this.
---
 gio/Gio.metadata | 4 ++++
 gtk/Gtk.metadata | 1 +
 2 files changed, 5 insertions(+)

diff --git a/gio/Gio.metadata b/gio/Gio.metadata
index e74f57b67..b96485d15 100644
--- a/gio/Gio.metadata
+++ b/gio/Gio.metadata
@@ -5,6 +5,10 @@
   <attr path="/api/namespace/boxed[@cname='GFileAttributeInfoList']/field" name="access">private</attr>
   <attr path="/api/namespace/boxed[@cname='GFileAttributeInfoList']/field[@name='Infos']" name="array">1</attr>
   <attr path="/api/namespace/class[@name='Global']" name="name">GioGlobal</attr>
+  <attr path="/api/namespace/interface[@cname='GActionGroup']/method[@name='ActionAdded']" name="name">EmitActionAdded</attr>
+  <attr path="/api/namespace/interface[@cname='GActionGroup']/method[@name='ActionEnabledChanged']" name="name">EmitActionEnabledChanged</attr>
+  <attr path="/api/namespace/interface[@cname='GActionGroup']/method[@name='ActionRemoved']" name="name">EmitActionRemoved</attr>
+  <attr path="/api/namespace/interface[@cname='GActionGroup']/method[@name='ActionStateChanged']" name="name">EmitActionStateChanged</attr>
   <attr path="/api/namespace/interface[@cname='GAppInfo']" name="consume_only">1</attr>
   <attr path="/api/namespace/interface[@cname='GAppInfo']/method[@name='CanRemoveSupportsType']" name="name">GetCanRemoveSupportsType</attr>
   <attr path="/api/namespace/interface[@cname='GAppInfo']/method[@name='GetAll']" name="hidden">1</attr>
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index e819d8e5c..0c666255f 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -109,6 +109,7 @@
   <attr path="/api/namespace/enum[@cname='GtkWin32EmbedMessageType']" 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>
   <attr path="/api/namespace/interface[@cname='GtkCellLayout']/*[@name='GetCells']/return-type" name="element_type">GtkCellRenderer*</attr> 
   <attr path="/api/namespace/interface[@cname='GtkCellLayout']/*[@name='GetCells']/return-type" name="owned">true</attr> 
   <attr path="/api/namespace/interface[@cname='GtkCellLayout']/method[@name='SetAttributes']" name="hidden">1</attr>