summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Withnall <philip@tecnocode.co.uk>2011-10-23 00:15:37 +0100
committerPhilip Withnall <philip@tecnocode.co.uk>2011-10-23 00:15:37 +0100
commit4632553c1e76e356876140ddc6973129048eeb91 (patch)
tree21f8c0b72e5a5d6a2cbaa8e113be5b160b26915e
parent9b1a957aa66e7b86d76e5a86272a3e0f79822d96 (diff)
downloadtotem-4632553c1e76e356876140ddc6973129048eeb91.tar.gz
plugins: Fix Vala plugins for valac 0.14.0
The Vala plugins were using incorrect overrides of an abstract property of Peas.Activatable which was causing compilation to fail with valac 0.14.0. This fixes that, and bumps our Vala dependency to 0.14.0 (since some quick testing with valac 0.12.x didn't work due to GIR parsing problems). Closes: bgo#662148
-rw-r--r--configure.in2
-rw-r--r--src/plugins/rotation/totem-rotation-plugin.vala2
-rw-r--r--src/plugins/sample-vala/totem-sample-vala-plugin.vala2
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index 61bd1514b..2f934c323 100644
--- a/configure.in
+++ b/configure.in
@@ -47,7 +47,7 @@ GTK_REQS=2.99.3
TOTEM_PLPARSER_REQS=2.32.4
GNOMEICON_REQS=2.15.90
DBUS_REQS=0.82
-VALA_REQS=0.12.1
+VALA_REQS=0.14.0
PEAS_REQS=1.1.0
PYTHON_REQS=2.3
PYGOBJECT_REQS=2.90.3
diff --git a/src/plugins/rotation/totem-rotation-plugin.vala b/src/plugins/rotation/totem-rotation-plugin.vala
index 5a98a67ad..8ecfcd02d 100644
--- a/src/plugins/rotation/totem-rotation-plugin.vala
+++ b/src/plugins/rotation/totem-rotation-plugin.vala
@@ -34,7 +34,7 @@ class RotationPlugin: GLib.Object, Peas.Activatable
_90L = 3
}
private const int STATE_COUNT = 4;
- public weak GLib.Object object { get; construct; }
+ public GLib.Object object { owned get; construct; }
private weak Clutter.Actor video = null;
private uint ui_id;
private Gtk.ActionGroup action_group;
diff --git a/src/plugins/sample-vala/totem-sample-vala-plugin.vala b/src/plugins/sample-vala/totem-sample-vala-plugin.vala
index d7430a7b4..df568ed59 100644
--- a/src/plugins/sample-vala/totem-sample-vala-plugin.vala
+++ b/src/plugins/sample-vala/totem-sample-vala-plugin.vala
@@ -2,7 +2,7 @@ using GLib;
using Totem;
class SampleValaPlugin: GLib.Object, Peas.Activatable {
- public Totem.Object object {get; set;}
+ public GLib.Object object { owned get; construct; }
public void activate () {
print ("Hello world\n");