From 9b1a957aa66e7b86d76e5a86272a3e0f79822d96 Mon Sep 17 00:00:00 2001
From: Pavol Babincak <scroolik@gmail.com>
Date: Sun, 09 Oct 2011 23:48:25 +0000
Subject: data: Added rtmp URI scheme

Real Time Messaging Protocol (RTMP) is available in
gst-plugins-bad, just as mms, which is already in the list.

https://bugzilla.gnome.org/show_bug.cgi?id=661346
---
diff --git a/data/uri-schemes-list.txt b/data/uri-schemes-list.txt
index 68ec833..56ea8ff 100644
--- a/data/uri-schemes-list.txt
+++ b/data/uri-schemes-list.txt
@@ -2,6 +2,7 @@ pnm
 mms
 net
 rtp
+rtmp
 rtsp
 mmsh
 uvox
--
cgit v0.9.0.2
From 4632553c1e76e356876140ddc6973129048eeb91 Mon Sep 17 00:00:00 2001
From: Philip Withnall <philip@tecnocode.co.uk>
Date: Sat, 22 Oct 2011 23:15:37 +0000
Subject: 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
---
diff --git a/configure.in b/configure.in
index 61bd151..2f934c3 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 5a98a67..8ecfcd0 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 d7430a7..df568ed 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");
--
cgit v0.9.0.2
From 0eacdd766bb7ee504a486872458679dd8c8df191 Mon Sep 17 00:00:00 2001
From: Philip Withnall <philip@tecnocode.co.uk>
Date: Mon, 24 Oct 2011 20:18:11 +0000
Subject: build: Bump our Vala dependency to 0.14.0.22-0743

We require the fix to bgo#658006 to be able to compile the rotation and
sample-vala plugins.

Closes: bgo#662148 (again)
---
diff --git a/configure.in b/configure.in
index 2f934c3..ae8f324 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.14.0
+VALA_REQS=0.14.0.22-0743
 PEAS_REQS=1.1.0
 PYTHON_REQS=2.3
 PYGOBJECT_REQS=2.90.3
--
cgit v0.9.0.2