From: Evan Nemerson <evan@coeus-group.com>
Date: Wed, 4 Aug 2010 18:58:47 +0000 (-0700)
Subject: clutter-1.0: Move Stage.event to avoid conflict with inherited signal
X-Git-Tag: 0.9.5~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2cc85cce11bdc03f17700c8ff31426802b69e9f;p=thirdparty%2Fvala.git

clutter-1.0: Move Stage.event to avoid conflict with inherited signal

Fixes bug 624988.
---

diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi
index f9e58bf3a..6282a17c8 100644
--- a/vapi/clutter-1.0.vapi
+++ b/vapi/clutter-1.0.vapi
@@ -969,10 +969,11 @@ namespace Clutter {
 	public class Stage : Clutter.Group, Clutter.Scriptable, Clutter.Container {
 		[CCode (type = "ClutterActor*", has_construct_function = false)]
 		public Stage ();
+		[CCode (cname = "clutter_stage_event")]
+		public bool emit_event (Clutter.Event event);
 		public void ensure_current ();
 		public void ensure_redraw ();
 		public void ensure_viewport ();
-		public bool event (Clutter.Event event);
 		public unowned Clutter.Actor get_actor_at_pos (Clutter.PickMode pick_mode, int x, int y);
 		public static unowned Clutter.Stage get_default ();
 		public bool get_fullscreen ();
diff --git a/vapi/packages/clutter-1.0/clutter-1.0.metadata b/vapi/packages/clutter-1.0/clutter-1.0.metadata
index d4a4695b9..741d4004c 100644
--- a/vapi/packages/clutter-1.0/clutter-1.0.metadata
+++ b/vapi/packages/clutter-1.0/clutter-1.0.metadata
@@ -326,6 +326,7 @@ ClutterStage:fullscreen hidden="1"
 ClutterStage:perspective accessor_method="0"
 ClutterStage::fullscreen has_emitter="1"
 ClutterStage::unfullscreen has_emitter="1"
+clutter_stage_event name="emit_event"
 clutter_stage_get_color hidden="1"
 clutter_stage_get_default type_name="Stage"
 clutter_stage_get_fog hidden="1"