[banshee/gtk3] SoundMenu: Remove optional dependency on indicate-sharp



commit 17a45eaf3d8af8f9d634a0f9b4c6963991d8588c
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Mon Aug 1 21:13:51 2011 +0200

    SoundMenu: Remove optional dependency on indicate-sharp
    
    Indicate-sharp was only useful on Ubuntu 10.10 to register with the
    sound menu. It is not needed in more recent versions, so we can drop it.

 build/build.environment.mk                         |    2 +-
 build/m4/banshee/soundmenu.m4                      |   10 ----------
 .../Banshee.SoundMenu/SoundMenuProxy.cs            |   13 -------------
 src/Extensions/Banshee.SoundMenu/Makefile.am       |    4 ----
 4 files changed, 1 insertions(+), 28 deletions(-)
---
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 06c8897..4b97dec 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -148,7 +148,7 @@ REF_EXTENSION_PLAYQUEUE = $(LINK_BANSHEE_THICKCLIENT_DEPS)
 LINK_EXTENSION_PLAYQUEUE = -r:$(DIR_BIN)/Banshee.PlayQueue.dll
 LINK_EXTENSION_PLAYQUEUE_DEPS = $(REF_EXTENSION_PLAYQUEUE) \
 	$(LINK_EXTENSION_PLAYQUEUE)
-REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_INDICATESHARP)
+REF_EXTENSION_SOUNDMENU = $(LINK_BANSHEE_THICKCLIENT_DEPS)
 REF_EXTENSION_LASTFM = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI)
 LINK_EXTENSION_LASTFM = -r:$(DIR_BIN)/Banshee.Lastfm.dll
 REF_EXTENSION_LASTFM_STREAMING = $(LINK_BANSHEE_THICKCLIENT_DEPS) $(LINK_MONO_MEDIA) $(LINK_LASTFM) $(LINK_LASTFM_GUI) $(LINK_EXTENSION_LASTFM)
diff --git a/build/m4/banshee/soundmenu.m4 b/build/m4/banshee/soundmenu.m4
index 9522feb..612f229 100644
--- a/build/m4/banshee/soundmenu.m4
+++ b/build/m4/banshee/soundmenu.m4
@@ -1,20 +1,10 @@
 AC_DEFUN([BANSHEE_CHECK_SOUNDMENU],
 [
-	LIBINDICATESHARP_REQUIRED=0.4.1
-
 	AC_ARG_ENABLE([soundmenu],
 		AS_HELP_STRING([--enable-soundmenu], [Enable sound menu support]),
 		enable_soundmenu=$enableval, enable_soundmenu=no
 	)
 
-	if test "x$enable_soundmenu" = "xyes"; then
-		has_indicatesharp=no
-		PKG_CHECK_MODULES(INDICATESHARP,
-			indicate-sharp-0.1 >= $LIBINDICATESHARP_REQUIRED,
-			has_indicatesharp=yes, has_indicatesharp=no)
-	fi
-
-	AM_CONDITIONAL(HAVE_INDICATESHARP, test "x$has_indicatesharp" = "xyes")
 	AM_CONDITIONAL(ENABLE_SOUNDMENU, test "x$enable_soundmenu" = "xyes")
 ])
 
diff --git a/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs b/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs
index 381d4c5..762be28 100644
--- a/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs
+++ b/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs
@@ -76,15 +76,6 @@ namespace Banshee.SoundMenu
 
         public void Register (bool startup)
         {
-#if HAVE_INDICATESHARP
-            Log.Debug ("Registering with sound indicator through libindicate");
-            var server = Indicate.Server.RefDefault ();
-            server.SetType ("music.banshee");
-            string desktop_file = Paths.Combine (Paths.InstalledApplicationDataRoot,
-                                                 "applications", desktop_name + ".desktop");
-            server.DesktopFile (desktop_file);
-            server.Show ();
-#endif
             if (SoundMenu != null && !startup) {
                 // We don't have to do anything to register on startup
                 try {
@@ -98,10 +89,6 @@ namespace Banshee.SoundMenu
 
         public void Unregister ()
         {
-#if HAVE_INDICATESHARP
-            var server = Indicate.Server.RefDefault ();
-            server.Hide ();
-#endif
             if (SoundMenu != null) {
                 try {
                     SoundMenu.BlacklistMediaPlayer (desktop_name, true);
diff --git a/src/Extensions/Banshee.SoundMenu/Makefile.am b/src/Extensions/Banshee.SoundMenu/Makefile.am
index cbe504c..0c4e157 100644
--- a/src/Extensions/Banshee.SoundMenu/Makefile.am
+++ b/src/Extensions/Banshee.SoundMenu/Makefile.am
@@ -5,10 +5,6 @@ GMCS_FLAGS+="-define:INTERNAL_NOTIFY_SHARP"
 NOTIFY_SHARP_LIBS = 
 endif
 
-if HAVE_INDICATESHARP
-GMCS_FLAGS+= "-define:HAVE_INDICATESHARP"
-endif
-
 ASSEMBLY = Banshee.SoundMenu
 TARGET = library
 LINK = $(REF_EXTENSION_SOUNDMENU) $(NOTIFY_SHARP_LIBS)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]