banshee/trunk/Remove-IDBusExportable-inheritance-from-exported-int.patch

   1 From: Chow Loong Jin <hyperair@debian.org>
   2 Date: Sat, 1 Mar 2014 15:52:39 +0800
   3 Subject: Remove IDBusExportable inheritance from exported interfaces
   4
   5 This fixes the crashes when attempting to control an existing instance of
   6 Banshee using the command-line interface.
   7
   8 Bug-Debian: #731978
   9 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=725446
  10 ---
  11  src/Core/Banshee.Services/Banshee.MediaEngine/IPlayerEngineService.cs | 2 +-
  12  src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs  | 2 +-
  13  .../Banshee.PlaybackController/IPlaybackControllerService.cs          | 2 +-
  14  .../Banshee.PlaybackController/PlaybackControllerService.cs           | 4 ++--
  15  src/Core/Banshee.Services/Banshee.Sources/ISourceManager.cs           | 2 +-
  16  src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs             | 2 +-
  17  src/Core/Banshee.ThickClient/Banshee.Gui/IClientWindow.cs             | 2 +-
  18  src/Core/Banshee.ThickClient/Banshee.Gui/IGlobalUIActions.cs          | 4 ++--
  19  8 files changed, 10 insertions(+), 10 deletions(-)
  20
  21 diff --git a/src/Core/Banshee.Services/Banshee.MediaEngine/IPlayerEngineService.cs b/src/Core/Banshee.Services/Banshee.MediaEngine/IPlayerEngineService.cs
  22 index fc935ac..f29cfa5 100644
  23 --- a/src/Core/Banshee.Services/Banshee.MediaEngine/IPlayerEngineService.cs
  24 +++ b/src/Core/Banshee.Services/Banshee.MediaEngine/IPlayerEngineService.cs
  25 @@ -35,7 +35,7 @@ using Banshee.ServiceStack;
  26  namespace Banshee.MediaEngine
  27  {
  28      [Interface("org.bansheeproject.Banshee.PlayerEngine")]
  29 -    public interface IPlayerEngineService : IDBusExportable
  30 +    public interface IPlayerEngineService
  31      {
  32          event DBusPlayerEventHandler EventChanged;
  33          event DBusPlayerStateHandler StateChanged;
  34 diff --git a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
  35 index 793b9cd..83cbe67 100644
  36 --- a/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
  37 +++ b/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
  38 @@ -51,7 +51,7 @@ namespace Banshee.MediaEngine
  39      public delegate bool TrackInterceptHandler (TrackInfo track);
  40
  41      public class PlayerEngineService : IInitializeService, IDelayedInitializeService,
  42 -        IRequiredService, IPlayerEngineService, IDisposable
  43 +        IRequiredService, IPlayerEngineService, IDBusExportable, IDisposable
  44      {
  45          private List<PlayerEngine> engines = new List<PlayerEngine> ();
  46          private PlayerEngine active_engine;
  47 diff --git a/src/Core/Banshee.Services/Banshee.PlaybackController/IPlaybackControllerService.cs b/src/Core/Banshee.Services/Banshee.PlaybackController/IPlaybackControllerService.cs
  48 index deb1feb..a764272 100644
  49 --- a/src/Core/Banshee.Services/Banshee.PlaybackController/IPlaybackControllerService.cs
  50 +++ b/src/Core/Banshee.Services/Banshee.PlaybackController/IPlaybackControllerService.cs
  51 @@ -36,7 +36,7 @@ namespace Banshee.PlaybackController
  52      public delegate void PlaybackControllerStoppedHandler ();
  53
  54      [Interface ("org.bansheeproject.Banshee.PlaybackController")]
  55 -    public interface IPlaybackControllerService : IDBusExportable
  56 +    public interface IPlaybackControllerService
  57      {
  58          // FIXME: IPlaybackControllerExportable : IPlaybackController
  59          // but DBus-Sharp has a design flaw where it only exports
  60 diff --git a/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs b/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs
  61 index 1b8020f..af700a6 100644
  62 --- a/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs
  63 +++ b/src/Core/Banshee.Services/Banshee.PlaybackController/PlaybackControllerService.cs
  64 @@ -38,8 +38,8 @@ using Banshee.MediaEngine;
  65
  66  namespace Banshee.PlaybackController
  67  {
  68 -    public class PlaybackControllerService : IRequiredService, ICanonicalPlaybackController,
  69 -        IPlaybackController, IPlaybackControllerService
  70 +    public class PlaybackControllerService : IDBusExportable, IRequiredService,
  71 +        ICanonicalPlaybackController, IPlaybackController, IPlaybackControllerService
  72      {
  73          private enum Direction
  74          {
  75 diff --git a/src/Core/Banshee.Services/Banshee.Sources/ISourceManager.cs b/src/Core/Banshee.Services/Banshee.Sources/ISourceManager.cs
  76 index 18203c7..4cfc697 100644
  77 --- a/src/Core/Banshee.Services/Banshee.Sources/ISourceManager.cs
  78 +++ b/src/Core/Banshee.Services/Banshee.Sources/ISourceManager.cs
  79 @@ -36,7 +36,7 @@ using Banshee.ServiceStack;
  80  namespace Banshee.Sources
  81  {
  82      [Interface("org.bansheeproject.Banshee.SourceManager")]
  83 -    public interface ISourceManager : IDBusExportable
  84 +    public interface ISourceManager
  85      {
  86          //event SourceEventHandler SourceUpdated;
  87          ISource ActiveSource { get; set; }
  88 diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs
  89 index 48d10bc..1a33a2b 100644
  90 --- a/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs
  91 +++ b/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs
  92 @@ -40,7 +40,7 @@ using Banshee.Playlist;
  93
  94  namespace Banshee.Gui
  95  {
  96 -    public class GlobalActions : BansheeActionGroup, IGlobalUIActions
  97 +    public class GlobalActions : BansheeActionGroup, IGlobalUIActions, IDBusExportable
  98      {
  99          public GlobalActions () : base ("Global")
 100          {
 101 diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/IClientWindow.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/IClientWindow.cs
 102 index 1d693b1..77604f7 100644
 103 --- a/src/Core/Banshee.ThickClient/Banshee.Gui/IClientWindow.cs
 104 +++ b/src/Core/Banshee.ThickClient/Banshee.Gui/IClientWindow.cs
 105 @@ -34,7 +34,7 @@ using Banshee.ServiceStack;
 106  namespace Banshee.Gui
 107  {
 108      [Interface ("org.bansheeproject.Banshee.ClientWindow")]
 109 -    public interface IClientWindow : IDBusExportable
 110 +    public interface IClientWindow
 111      {
 112          void Present ();
 113          void Hide ();
 114 diff --git a/src/Core/Banshee.ThickClient/Banshee.Gui/IGlobalUIActions.cs b/src/Core/Banshee.ThickClient/Banshee.Gui/IGlobalUIActions.cs
 115 index 34124c5..e9a53d0 100644
 116 --- a/src/Core/Banshee.ThickClient/Banshee.Gui/IGlobalUIActions.cs
 117 +++ b/src/Core/Banshee.ThickClient/Banshee.Gui/IGlobalUIActions.cs
 118 @@ -32,11 +32,11 @@ using Banshee.ServiceStack;
 119  namespace Banshee.Gui
 120  {
 121      [Interface ("org.bansheeproject.Banshee.GlobalUIActions")]
 122 -    public interface IGlobalUIActions : IDBusExportable
 123 +    public interface IGlobalUIActions
 124      {
 125          void ShowImportDialog ();
 126          void ShowAboutDialog ();
 127          void ShowOpenLocationDialog ();
 128          void ShowPreferencesDialog ();
 129      }
 130 -}
 131 \ No newline at end of file
 132 +}