[Pkg-cli-apps-commits] [gnome-do-plugins] 01/01: Cherry-pick upstream fix for DBus-using plugins.

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to branch master
in repository gnome-do-plugins.

commit 7a55ca5c6acfc0ec2628604c78fd41387a14a9fa
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date:   Mon Sep 12 09:05:33 2016 +1000

    Cherry-pick upstream fix for DBus-using plugins.
    
    This prevented the Banshee and GNOME-Session plugins from working.
    
    LP: 1615307
---
 debian/patches/fix-dbus-interfaces.patch | 113 +++++++++++++++++++++++++++++++
 debian/patches/series                    |   1 +
 2 files changed, 114 insertions(+)

diff --git a/debian/patches/fix-dbus-interfaces.patch b/debian/patches/fix-dbus-interfaces.patch
new file mode 100644
index 0000000..be3629b
--- /dev/null
+++ b/debian/patches/fix-dbus-interfaces.patch
@@ -0,0 +1,113 @@
+commit 8491a84edcb32345eda0950d33d4a77d28ad39db
+Author: Christopher James Halse Rogers <raof at ubuntu.com>
+Date:   Sat Jun 11 14:26:47 2016 -0400
+
+    Fix DBus interaction in Banshee and GNOME-Session plugins.
+    
+    These plugins had non-public [Interface()]-annotated interface declarations for DBus objects.
+    DBus# works by generating implementations of these annotated interfaces at runtime in a dynamic DBus.Proxies
+    assembly, which would fail because the proxies were attempting to implement a non-public interface.
+    
+    I'm not sure why this ever worked; presumably Mono is now more correctly implementing the spec.
+    
+    This fixes all the actions from GNOME-Session and Banshee which relied on making DBus calls, such as
+    Suspend, Shutdown, and so on.
+
+diff --git a/Banshee/src/BansheeDBus.cs b/Banshee/src/BansheeDBus.cs
+index 54e83d5..107acdb 100644
+--- a/Banshee/src/BansheeDBus.cs
++++ b/Banshee/src/BansheeDBus.cs
+@@ -37,19 +37,19 @@ namespace Banshee
+ {
+ 
+ 	[Interface ("org.bansheeproject.Banshee.PlayerEngine")]
+-	interface IBansheePlayer {
++	public interface IBansheePlayer {
+ 		void Play ();
+ 		void Pause ();
+ 		string CurrentState { get; }
+ 	}
+ 	
+ 	[Interface ("org.bansheeproject.Banshee.PlayQueue")]
+-	interface IBansheePlayQueue {
++	public interface IBansheePlayQueue {
+ 		void EnqueueUri (string uri, bool prepend);
+ 	}
+ 	
+ 	[Interface ("org.bansheeproject.Banshee.PlaybackController")]
+-	interface IBansheeController
++	public interface IBansheeController
+ 	{
+ 		void First ();
+ 		void Next (bool restart);
+diff --git a/GNOME-Session/src/PowerManagement.cs b/GNOME-Session/src/PowerManagement.cs
+index 867a50e..d5b47c0 100644
+--- a/GNOME-Session/src/PowerManagement.cs
++++ b/GNOME-Session/src/PowerManagement.cs
+@@ -36,28 +36,28 @@ namespace GNOME
+ 	class PowerManagement
+ 	{
+ 		[Interface ("org.freedesktop.login1.Manager")]
+-		interface ILogind
++		public interface ILogind
+ 		{
+ 			void Hibernate (bool interactive);
+ 			void Suspend (bool interactive);
+ 		}
+ 
+ 		[Interface (DeviceKitPowerName)]
+-		interface IDeviceKitPower
++		public interface IDeviceKitPower
+ 		{
+ 			void Hibernate ();
+ 			void Suspend ();
+ 		}
+ 
+ 		[Interface (PowerManagementName)]
+-		interface IPowerManagement
++		public interface IPowerManagement
+ 		{
+ 			void Hibernate ();
+ 			void Suspend ();
+ 		}
+ 		
+ 		[Interface (UPowerName)]
+-		interface IUPower : org.freedesktop.DBus.Properties
++		public interface IUPower : org.freedesktop.DBus.Properties
+ 		{
+ 			void Hibernate ();
+ 			void Suspend ();
+diff --git a/GNOME-Session/src/ScreenSaver.cs b/GNOME-Session/src/ScreenSaver.cs
+index 7d22d71..6e9b1e7 100644
+--- a/GNOME-Session/src/ScreenSaver.cs
++++ b/GNOME-Session/src/ScreenSaver.cs
+@@ -40,7 +40,7 @@ namespace GNOME
+ 		private const string BusName = "org.gnome.ScreenSaver";
+ 
+ 		[Interface ("org.gnome.ScreenSaver")]
+-		interface IScreenSaver
++		public interface IScreenSaver
+ 		{
+ 			void Lock ();
+ 			void SetActive (bool value);
+diff --git a/GNOME-Session/src/SystemManagement.cs b/GNOME-Session/src/SystemManagement.cs
+index 4c88bbe..e5deb3c 100644
+--- a/GNOME-Session/src/SystemManagement.cs
++++ b/GNOME-Session/src/SystemManagement.cs
+@@ -36,14 +36,14 @@ namespace GNOME
+ 	class SystemManagement
+ 	{
+ 		[Interface ("org.freedesktop.login1.Manager")]
+-		interface ILogind
++		public interface ILogind
+ 		{
+ 			void PowerOff (bool interactive);
+ 			void Reboot (bool interactive);
+ 		}
+ 
+ 		[Interface ("org.freedesktop.ConsoleKit.Manager")]
+-		interface IConsoleKit
++		public interface IConsoleKit
+ 		{
+ 			void Stop ();
+ 			void Restart ();
diff --git a/debian/patches/series b/debian/patches/series
index db3781e..6d9539e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 use_dbussharp_2.patch
 Drop-outdated-urls.patch
 drop-mandatory-gnome-desktop-sharp-dependency.patch
+fix-dbus-interfaces.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/gnome-do-plugins.git