[Pkg-cli-apps-commits] [banshee] 01/07: Fix up dbus# 2.0 patch

Chow Loong Jin hyperair at debian.org
Sat Dec 7 05:14:43 UTC 2013


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

hyperair pushed a commit to branch experimental
in repository banshee.

commit 26fa59b65938c5089d2a428c3c2c87bc6da8f773
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Mon Nov 25 02:04:53 2013 +0800

    Fix up dbus# 2.0 patch
    
    Git-Dch: Ignore
---
 debian/patches/Use-dbus-2.patch | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/debian/patches/Use-dbus-2.patch b/debian/patches/Use-dbus-2.patch
index 83905c4..07531d9 100644
--- a/debian/patches/Use-dbus-2.patch
+++ b/debian/patches/Use-dbus-2.patch
@@ -3,8 +3,9 @@ Date: Mon, 25 Nov 2013 01:18:19 +0800
 Subject: Use dbus# 2
 
 ---
- build/m4/banshee/dbus.m4 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ build/m4/banshee/dbus.m4                                             | 4 ++--
+ src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs | 5 +----
+ 2 files changed, 3 insertions(+), 6 deletions(-)
 
 diff --git a/build/m4/banshee/dbus.m4 b/build/m4/banshee/dbus.m4
 index 3b8579e..f76ff8c 100644
@@ -22,3 +23,19 @@ index 3b8579e..f76ff8c 100644
  	AC_SUBST(DBUS_SHARP_LIBS)
  ])
  
+diff --git a/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs b/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs
+index 698cf02..96e3996 100644
+--- a/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs
++++ b/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs
+@@ -135,10 +135,7 @@ namespace Banshee.ServiceStack
+                 string bus_name = DBusConnection.MakeBusName (serviceName);
+ 
+                 Log.DebugFormat ("Registering remote object {0} ({1}) on {2}", path, o.GetType (), bus_name);
+-
+-                #pragma warning disable 0618
+-                Bus.Session.Register (bus_name, path, o);
+-                #pragma warning restore 0618
++                Bus.Session.Register (path, o);
+             }
+ 
+             return path;

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



More information about the Pkg-cli-apps-commits mailing list