banshee r4812 - in trunk/banshee: . build/m4/banshee src/Extensions/Banshee.Torrent src/Extensions/Banshee.Torrent/Banshee.Torrent

[gburt svn gnome org]

Author: gburt
Date: Sun Nov  9 02:44:21 2008
New Revision: 4812
URL: http://svn.gnome.org/viewvc/banshee?rev=4812&view=rev

Log:
2008-11-08  Gabriel Burt  <gabriel burt gmail com>

	* src/Extensions/Banshee.Torrent/Banshee.Torrent/TorrentService.cs: Add
	explicit private.

	* src/Extensions/Banshee.Torrent/Makefile.am:
	* build/m4/banshee/torrent.m4: Install and uninstall the MonoTorrent
	assemblies.



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/build/m4/banshee/torrent.m4
   trunk/banshee/src/Extensions/Banshee.Torrent/Banshee.Torrent/TorrentService.cs
   trunk/banshee/src/Extensions/Banshee.Torrent/Makefile.am

Modified: trunk/banshee/build/m4/banshee/torrent.m4
==============================================================================
--- trunk/banshee/build/m4/banshee/torrent.m4	(original)
+++ trunk/banshee/build/m4/banshee/torrent.m4	Sun Nov  9 02:44:21 2008
@@ -4,7 +4,12 @@
 
 	if test "x$enable_torrent" = "xyes"; then
         PKG_CHECK_MODULES(MONOTORRENT_DBUS, monotorrent-dbus >= 0.1);
+		asms="`$PKG_CONFIG --variable=Libraries monotorrent` `$PKG_CONFIG --variable=Libraries monotorrent-dbus`"
+		for asm in $asms; do
+			MONOTORRENT_ASSEMBLIES="$MONOTORRENT_ASSEMBLIES $asm $asm.mdb"
+		done
         AC_SUBST(MONOTORRENT_DBUS_LIBS)
+		AC_SUBST(MONOTORRENT_ASSEMBLIES)
         AM_CONDITIONAL(HAVE_MONOTORRENT_DBUS, true)
 	else
 		AM_CONDITIONAL(HAVE_MONOTORRENT_DBUS, false)

Modified: trunk/banshee/src/Extensions/Banshee.Torrent/Banshee.Torrent/TorrentService.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Torrent/Banshee.Torrent/TorrentService.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.Torrent/Banshee.Torrent/TorrentService.cs	Sun Nov  9 02:44:21 2008
@@ -41,7 +41,7 @@
 {
     public class TorrentService : IExtensionService, IDelayedInitializeService
     {
-        static bool RegisteredInMigo = false;
+        private static bool RegisteredInMigo = false;
         public static readonly string BusName = "org.monotorrent.dbus";
         public static readonly string EngineName = "banshee";
         public static readonly ObjectPath ServicePath = new ObjectPath ("/org/monotorrent/service");

Modified: trunk/banshee/src/Extensions/Banshee.Torrent/Makefile.am
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Torrent/Makefile.am	(original)
+++ trunk/banshee/src/Extensions/Banshee.Torrent/Makefile.am	Sun Nov  9 02:44:21 2008
@@ -9,8 +9,20 @@
 
 RESOURCES = Banshee.Torrent.addin.xml
 
+EXTRA_BUNDLE = $(MONOTORRENT_ASSEMBLIES)
+
 if HAVE_MONOTORRENT_DBUS
 include $(top_srcdir)/build/build.mk
+
+install-data-hook:
+	for ASM in $(MONOTORRENT_ASSEMBLIES); do \
+		$(INSTALL) -m 0755 $$ASM $(DESTDIR)$(moduledir); \
+	done;
+
+uninstall-hook:
+	for ASM in $(MONOTORRENT_ASSEMBLIES); do \
+		rm -f $(DESTDIR)$(moduledir)/`basename $$ASM`; \
+	done;
 else
 EXTRA_DIST = $(SOURCES) $(RESOURCES)
 endif