From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 4 Oct 2011 19:39:00 +0000 (+0200)
Subject: mx-1.0: Fix regression about Draggable and Droppable virtual methods
X-Git-Tag: 0.14.1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5143263701818f09e9aa429cc2a66b12ecd6f986;p=thirdparty%2Fvala.git

mx-1.0: Fix regression about Draggable and Droppable virtual methods

The regression was introduced by the mx-1.0 switch to GIR.

Fixes bug 633902.
---

diff --git a/vapi/metadata/Mx-1.0.metadata b/vapi/metadata/Mx-1.0.metadata
index 3ea193829..0e44bd3a3 100644
--- a/vapi/metadata/Mx-1.0.metadata
+++ b/vapi/metadata/Mx-1.0.metadata
@@ -2,6 +2,13 @@ Application.new.argv unowned
 BoxLayout
 	.add_actor name="add_child"
 	.add_actor_with_properties skip=false
+Draggable
+	.disable#virtual_method virtual
+	.enable#virtual_method virtual
+Droppable
+	.accept_drop#virtual_method virtual
+	.disable#virtual_method virtual
+	.enable#virtual_method virtual
 Padding struct
 Style.* skip=false
 Stylable.get skip=false
diff --git a/vapi/mx-1.0.vapi b/vapi/mx-1.0.vapi
index d4f8a73cd..9565d1da1 100644
--- a/vapi/mx-1.0.vapi
+++ b/vapi/mx-1.0.vapi
@@ -1089,8 +1089,8 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h", type_id = "mx_draggable_get_type ()")]
 	public interface Draggable : Clutter.Actor {
-		public abstract void disable ();
-		public abstract void enable ();
+		public virtual void disable ();
+		public virtual void enable ();
 		public Mx.DragAxis get_axis ();
 		public unowned Clutter.Actor get_drag_actor ();
 		public uint get_drag_threshold ();
@@ -1112,9 +1112,9 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h", type_id = "mx_droppable_get_type ()")]
 	public interface Droppable : Clutter.Actor {
-		public abstract bool accept_drop (Mx.Draggable draggable);
-		public abstract void disable ();
-		public abstract void enable ();
+		public virtual bool accept_drop (Mx.Draggable draggable);
+		public virtual void disable ();
+		public virtual void enable ();
 		public bool is_enabled ();
 		[NoAccessorMethod]
 		public abstract bool drop_enabled { get; set; }