Adapt to libsoup-2.42 dropping gnome USE and splitting (#463702), drop old.

(Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

8 files changed, 10 insertions, 448 deletions

diff --git a/media-sound/banshee/ChangeLog b/media-sound/banshee/ChangeLog
index 2ae3cab853b8..698d4c05109c 100644
--- a/media-sound/banshee/ChangeLog
+++ b/media-sound/banshee/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/banshee
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.162 2013/02/24 11:28:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/ChangeLog,v 1.163 2013/03/31 18:59:18 pacho Exp $
+
+  31 Mar 2013; Pacho Ramos <pacho@gentoo.org> -banshee-2.2.1.ebuild,
+  -banshee-2.4.1.ebuild, -files/banshee-1.7.4-make-webkit-optional.patch,
+  -files/banshee-2.2.0-fix-equalizer-values.patch,
+  -files/banshee-2.4.0-libgpod-082.patch, -files/banshee-2.4.0-upnp-crash.patch,
+  banshee-2.6.0.ebuild:
+  Adapt to libsoup-2.42 dropping gnome USE and splitting (#463702), drop old.
 
   24 Feb 2013; Agostino Sarubbo <ago@gentoo.org> banshee-2.6.0.ebuild:
   Stable for amd64, wrt bug #458494
diff --git a/media-sound/banshee/banshee-2.2.1.ebuild b/media-sound/banshee/banshee-2.2.1.ebuild
deleted file mode 100644
index 3e8922362822..000000000000
--- a/media-sound/banshee/banshee-2.2.1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-2.2.1.ebuild,v 1.6 2012/12/02 17:07:48 eva Exp $
-
-EAPI="4"
-
-inherit eutils autotools mono gnome2-utils fdo-mime versionator gnome.org
-
-DESCRIPTION="Import, organize, play, and share your music using a simple and powerful interface."
-HOMEPAGE="http://banshee.fm/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+aac +cdda +bpm boo daap doc +encode ios karma mtp test udev +web youtube"
-
-RDEPEND=">=dev-lang/mono-2.4.3
-	gnome-base/gnome-settings-daemon
-	x11-themes/gnome-icon-theme
-	sys-apps/dbus
-	>=dev-dotnet/gtk-sharp-2.12:2
-	>=dev-dotnet/gconf-sharp-2.24.0:2
-	>=dev-dotnet/notify-sharp-0.4.0_pre20080912-r1
-	>=media-libs/gstreamer-0.10.21-r3:0.10
-	>=media-libs/gst-plugins-base-0.10.25.2:0.10
-	media-libs/gst-plugins-bad:0.10
-	media-libs/gst-plugins-good:0.10
-	media-libs/gst-plugins-ugly:0.10
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
-	media-plugins/gst-plugins-gio:0.10
-	media-plugins/gst-plugins-gconf:0.10
-	cdda? (
-		|| (
-			media-plugins/gst-plugins-cdparanoia:0.10
-			media-plugins/gst-plugins-cdio:0.10
-		)
-	)
-	media-libs/musicbrainz:1
-	dev-dotnet/dbus-sharp
-	dev-dotnet/dbus-sharp-glib
-	>=dev-dotnet/mono-addins-0.4[gtk]
-	>=dev-dotnet/taglib-sharp-2.0.3.7
-	>=dev-db/sqlite-3.4:3
-	karma? ( >=media-libs/libkarma-0.1.0-r1 )
-	aac? ( media-plugins/gst-plugins-faad:0.10 )
-	boo? ( >=dev-lang/boo-0.8.1 )
-	bpm? ( media-plugins/gst-plugins-soundtouch:0.10 )
-	daap? (	>=dev-dotnet/mono-zeroconf-0.8.0-r1 )
-	doc? (
-		virtual/monodoc
-		>=app-text/gnome-doc-utils-0.17.3
-	)
-	encode? (
-		media-plugins/gst-plugins-lame:0.10
-		media-plugins/gst-plugins-taglib:0.10
-	)
-	ios? (
-		>=media-libs/libgpod-0.7.95[mono]
-		gnome-base/gvfs[ios]
-	)
-	mtp? (
-		>=media-libs/libmtp-0.3.0
-	)
-	web? (
-		>=net-libs/webkit-gtk-1.2.2:2
-		>=net-libs/libsoup-2.26:2.4
-		>=net-libs/libsoup-gnome-2.26:2.4
-	)
-	youtube? (
-		>=dev-dotnet/google-gdata-sharp-1.4
-	)
-	udev? (
-		dev-dotnet/gudev-sharp
-		dev-dotnet/gkeyfile-sharp
-		dev-dotnet/gtk-sharp-beans
-		dev-dotnet/gio-sharp
-	)"
-
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-src_prepare () {
-	# Don't build BPM extension when not wanted
-	if ! use bpm; then
-		sed -i -e 's:Banshee.Bpm:$(NULL):g' src/Extensions/Makefile.am || die
-	fi
-
-	# EqualizerManager: Update values for the Smiley Face preset (bgo#661224)
-	epatch "${FILESDIR}/${PN}-2.2.0-fix-equalizer-values.patch"
-
-	epatch "${FILESDIR}/${PN}-1.7.4-make-webkit-optional.patch" # upstream bug 628518
-	AT_M4DIR="-I build/m4/banshee -I build/m4/shamrock -I build/m4/shave" \
-		eautoreconf
-}
-
-src_configure() {
-	# soundmenu needs a properly maintained and updated indicate-sharp
-	local myconf="--disable-dependency-tracking
-		--disable-static
-		--disable-maintainer-mode
-		--enable-gnome
-		--enable-schemas-install
-		--with-gconf-schema-file-dir=/etc/gconf/schemas
-		--with-vendor-build-id=Gentoo/${PN}/${PVR}
-		--enable-gapless-playback
-		--disable-gst-sharp
-		--disable-torrent
-		--disable-shave
-		--disable-ubuntuone
-		--disable-soundmenu"
-
-	econf \
-		$(use_enable doc docs) \
-		$(use_enable doc user-help) \
-		$(use_enable boo) \
-		$(use_enable mtp) \
-		$(use_enable daap) \
-		$(use_enable ios appledevice) \
-		$(use_enable karma) \
-		$(use_enable web webkit) \
-		$(use_enable youtube) \
-		$(use_enable udev gio) \
-		$(use_enable udev gio_hardware) \
-		${myconf}
-}
-
-src_compile() {
-	emake MCS=/usr/bin/gmcs
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If ${PN} doesn't play some format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/banshee/banshee-2.4.1.ebuild b/media-sound/banshee/banshee-2.4.1.ebuild
deleted file mode 100644
index 6c7be03a54ed..000000000000
--- a/media-sound/banshee/banshee-2.4.1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-2.4.1.ebuild,v 1.4 2012/12/07 05:02:38 phajdan.jr Exp $
-
-EAPI="4"
-
-inherit eutils autotools mono gnome2-utils fdo-mime versionator gnome.org
-
-DESCRIPTION="Import, organize, play, and share your music using a simple and powerful interface."
-HOMEPAGE="http://banshee.fm/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+aac +cdda +bpm boo daap doc +encode ipod karma mtp test udev +web youtube"
-
-RDEPEND=">=dev-lang/mono-2.4.3
-	gnome-base/gnome-settings-daemon
-	x11-themes/gnome-icon-theme
-	sys-apps/dbus
-	>=dev-dotnet/gtk-sharp-2.12:2
-	>=dev-dotnet/notify-sharp-0.4.0_pre20080912-r1
-	>=media-libs/gstreamer-0.10.21-r3:0.10
-	>=media-libs/gst-plugins-base-0.10.25.2:0.10
-	media-libs/gst-plugins-bad:0.10
-	media-libs/gst-plugins-good:0.10
-	media-libs/gst-plugins-ugly:0.10
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
-	media-plugins/gst-plugins-gio:0.10
-	>=dev-dotnet/gconf-sharp-2.24.0:2
-	media-plugins/gst-plugins-gconf:0.10
-	cdda? (
-		|| (
-			media-plugins/gst-plugins-cdparanoia:0.10
-			media-plugins/gst-plugins-cdio:0.10
-		)
-	)
-	media-libs/musicbrainz:3
-	dev-dotnet/dbus-sharp
-	dev-dotnet/dbus-sharp-glib
-	>=dev-dotnet/mono-addins-0.6.2[gtk]
-	>=dev-dotnet/taglib-sharp-2.0.3.7
-	>=dev-db/sqlite-3.4:3
-	karma? ( >=media-libs/libkarma-0.1.0-r1 )
-	aac? ( media-plugins/gst-plugins-faad:0.10 )
-	boo? ( >=dev-lang/boo-0.8.1 )
-	bpm? ( media-plugins/gst-plugins-soundtouch:0.10 )
-	daap? (	>=dev-dotnet/mono-zeroconf-0.8.0-r1 )
-	doc? (
-		virtual/monodoc
-		>=app-text/gnome-doc-utils-0.17.3
-	)
-	encode? (
-		media-plugins/gst-plugins-lame:0.10
-		media-plugins/gst-plugins-taglib:0.10
-	)
-	ipod? ( >=media-libs/libgpod-0.8.2[mono] )
-	mtp? (
-		>=media-libs/libmtp-0.3.0
-	)
-	web? (
-		>=net-libs/webkit-gtk-1.2.2:2
-		>=net-libs/libsoup-2.26:2.4
-		>=net-libs/libsoup-gnome-2.26:2.4
-	)
-	youtube? (
-		>=dev-dotnet/google-gdata-sharp-1.4
-	)
-	udev? (
-		app-misc/media-player-info
-		dev-dotnet/gudev-sharp
-		dev-dotnet/gkeyfile-sharp
-		dev-dotnet/gtk-sharp-beans
-		dev-dotnet/gio-sharp
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-src_prepare () {
-	# Fix build against libgpod-sharp 0.8.2
-	epatch "${FILESDIR}/${PN}-2.4.0-libgpod-082.patch"
-
-	# Don't build BPM extension when not wanted
-	if ! use bpm; then
-		sed -i -e 's:Banshee.Bpm:$(NULL):g' src/Extensions/Makefile.am || die
-		AT_M4DIR="-I build/m4/banshee -I build/m4/shamrock -I build/m4/shave" \
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	# soundmenu needs a properly maintained and updated indicate-sharp
-	local myconf="--disable-dependency-tracking
-		--disable-static
-		--disable-maintainer-mode
-		--enable-gnome
-		--enable-schemas-install
-		--with-gconf-schema-file-dir=/etc/gconf/schemas
-		--with-vendor-build-id=Gentoo/${PN}/${PVR}
-		--enable-gapless-playback
-		--disable-gst-sharp
-		--disable-torrent
-		--disable-shave
-		--disable-ubuntuone
-		--disable-soundmenu
-		--disable-upnp"
-
-	econf \
-		$(use_enable doc docs) \
-		$(use_enable doc user-help) \
-		$(use_enable boo) \
-		$(use_enable mtp) \
-		$(use_enable daap) \
-		$(use_enable ipod appledevice) \
-		$(use_enable karma) \
-		$(use_enable web webkit) \
-		$(use_enable youtube) \
-		$(use_enable udev gio) \
-		$(use_enable udev gio_hardware) \
-		${myconf}
-}
-
-src_compile() {
-	emake MCS=/usr/bin/gmcs
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/banshee/banshee-2.6.0.ebuild b/media-sound/banshee/banshee-2.6.0.ebuild
index 336662f324a5..d9033ff3e7bc 100644
--- a/media-sound/banshee/banshee-2.6.0.ebuild
+++ b/media-sound/banshee/banshee-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-2.6.0.ebuild,v 1.5 2013/02/24 11:28:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/banshee/banshee-2.6.0.ebuild,v 1.6 2013/03/31 18:59:18 pacho Exp $
 
 EAPI="4"
 
@@ -59,8 +59,7 @@ RDEPEND=">=dev-lang/mono-2.4.3
 	)
 	web? (
 		>=net-libs/webkit-gtk-1.2.2:2
-		>=net-libs/libsoup-2.26:2.4
-		>=net-libs/libsoup-gnome-2.26:2.4
+		|| ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.26:2.4 )
 	)
 	youtube? (
 		>=dev-dotnet/google-gdata-sharp-1.4
diff --git a/media-sound/banshee/files/banshee-1.7.4-make-webkit-optional.patch b/media-sound/banshee/files/banshee-1.7.4-make-webkit-optional.patch
deleted file mode 100644
index 562b61de5693..000000000000
--- a/media-sound/banshee/files/banshee-1.7.4-make-webkit-optional.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -urNp banshee-1-1.7.4.orig/build/m4/banshee/libwebkit.m4 banshee-1-1.7.4/build/m4/banshee/libwebkit.m4
---- banshee-1-1.7.4.orig/build/m4/banshee/libwebkit.m4	2010-08-29 02:24:28.598617103 +0530
-+++ banshee-1-1.7.4/build/m4/banshee/libwebkit.m4	2010-08-29 12:06:20.117617111 +0530
-@@ -4,24 +4,33 @@ AC_DEFUN([BANSHEE_CHECK_LIBWEBKIT],
- 	SOUP_MIN_VERSION=2.26
- 	SOUP_GNOME_MIN_VERSION=2.26
- 
--	have_libwebkit=no
--	PKG_CHECK_MODULES(LIBWEBKIT,
--		webkit-1.0 >= $WEBKIT_MIN_VERSION
--		libsoup-2.4 >= $SOUP_MIN_VERSION,
--		have_libwebkit=yes, have_libwebkit=no)
--	AC_SUBST(LIBWEBKIT_LIBS)
--	AC_SUBST(LIBWEBKIT_CFLAGS)
--	AM_CONDITIONAL(HAVE_LIBWEBKIT, [test x$have_libwebkit = xyes])
-+	AC_ARG_ENABLE(webkit, AC_HELP_STRING([--disable-webkit], [Disable extensions which require WebKit]), , enable_webkit="yes")
- 
--	have_libsoup_gnome=no
--	PKG_CHECK_MODULES(LIBSOUP_GNOME,
--		libsoup-gnome-2.4 >= $SOUP_GNOME_MIN_VERSION,
--		have_libsoup_gnome=$have_libwebkit, have_libsoup_gnome=no)
--	AC_SUBST(LIBSOUP_GNOME_LIBS)
--	AC_SUBST(LIBSOUP_GNOME_CFLAGS)
--	AM_CONDITIONAL(HAVE_LIBSOUP_GNOME, [test x$have_libsoup_gnome = xyes])
--	if test x$have_libsoup_gnome = xyes; then
--		AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [libsoup-gnome-2.4 detected])
-+	if test "x$enable_webkit" = "xyes"; then
-+		have_libwebkit=no
-+		PKG_CHECK_MODULES(LIBWEBKIT,
-+			webkit-1.0 >= $WEBKIT_MIN_VERSION
-+			libsoup-2.4 >= $SOUP_MIN_VERSION,
-+			have_libwebkit=yes, have_libwebkit=no)
-+		AC_SUBST(LIBWEBKIT_LIBS)
-+		AC_SUBST(LIBWEBKIT_CFLAGS)
-+		AM_CONDITIONAL(HAVE_LIBWEBKIT, [test x$have_libwebkit = xyes])
-+
-+		have_libsoup_gnome=no
-+		PKG_CHECK_MODULES(LIBSOUP_GNOME,
-+			libsoup-gnome-2.4 >= $SOUP_GNOME_MIN_VERSION,
-+			have_libsoup_gnome=$have_libwebkit, have_libsoup_gnome=no)
-+		AC_SUBST(LIBSOUP_GNOME_LIBS)
-+		AC_SUBST(LIBSOUP_GNOME_CFLAGS)
-+		AM_CONDITIONAL(HAVE_LIBSOUP_GNOME, [test x$have_libsoup_gnome = xyes])
-+		if test x$have_libsoup_gnome = xyes; then
-+			AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [libsoup-gnome-2.4 detected])
-+		fi
-+	else
-+		have_libwebkit=no
-+		have_libsoup_gnome=no
-+		AM_CONDITIONAL(HAVE_LIBWEBKIT, false)
-+		AM_CONDITIONAL(HAVE_LIBSOUP_GNOME, false)
- 	fi
- ])
- 
diff --git a/media-sound/banshee/files/banshee-2.2.0-fix-equalizer-values.patch b/media-sound/banshee/files/banshee-2.2.0-fix-equalizer-values.patch
deleted file mode 100644
index 074163768a41..000000000000
--- a/media-sound/banshee/files/banshee-2.2.0-fix-equalizer-values.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 705b1767b5767c7c734cb69cfdea468553978935 Mon Sep 17 00:00:00 2001
-From: Pacho Ramos <pacho@condmat1.ciencias.uniovi.es>
-Date: Sun, 09 Oct 2011 09:12:27 +0000
-Subject: EqualizerManager: Update values for the Smiley Face preset (bgo#661224)
-
-Signed-off-by: Bertrand Lorentz <bertrand.lorentz@gmail.com>
----
-diff --git a/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs b/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs
-index b379f5b..9effe5a 100644
---- a/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs
-+++ b/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs
-@@ -291,8 +291,8 @@ namespace Banshee.Equalizer
-             yield return new EqualizerSetting (this, Catalog.GetString ("Ska"), -1.1, new [] {
-                 -2.4, -4.8, -4, -1.1, 4, 5.6, 8.8, 9.6, 11.2, 9.6
-             });
--            yield return new EqualizerSetting (this, Catalog.GetString ("Smiley Face Curve"), -7.1, new [] {
--                11.9, 8.1, 6.2, 3.1, 0.7, -0.1, 3, 5.7, 8.4, 11.9
-+            yield return new EqualizerSetting (this, Catalog.GetString ("Smiley Face Curve"), -7, new [] {
-+                12, 8, 6, 3, 0.0, 0.0, 3, 6, 8, 12
-             });
-             yield return new EqualizerSetting (this, Catalog.GetString ("Soft"), -1.1, new [] {
-                 4.8, 1.6, -1.1, -2.4, -1.1, 4, 8, 9.6, 11.2, 12,
---
-cgit v0.9.0.2
diff --git a/media-sound/banshee/files/banshee-2.4.0-libgpod-082.patch b/media-sound/banshee/files/banshee-2.4.0-libgpod-082.patch
deleted file mode 100644
index 1eed55ba13e4..000000000000
--- a/media-sound/banshee/files/banshee-2.4.0-libgpod-082.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 623695e51ffd7faf3ff5b12754f4e3547d066f34 Mon Sep 17 00:00:00 2001
-From: Bertrand Lorentz <bertrand.lorentz@gmail.com>
-Date: Sat, 24 Mar 2012 15:38:18 +0000
-Subject: AppleDeviceTrackInfo: Fix build against libgpod-sharp 0.8.2
-
-In libgpod 0.8.2, released in July 2011, the type of the Track.Size
-field was changed, so it is reflected in the C# bindings and breaks the
-API.
-
-We have currently no way of checking which version of the libgpod-sharp
-bindings are available, so this breaks compilation against older version
-of libgpod-sharp. But people shipping Banshee 2.5.x and later should
-really ship libgpod-sharp 0.8.2.
-
-See this bug for details and attempts to fix this correctly:
-https://bugzilla.gnome.org/show_bug.cgi?id=655660
----
-diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-index 178266d..b8549f7 100644
---- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-+++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-@@ -215,7 +215,7 @@ namespace Banshee.Dap.AppleDevice
-             track.CDs = DiscCount;
-             track.CDNumber = DiscNumber;
-             track.TrackLength = (int) Duration.TotalMilliseconds;
--            track.Size = (int)FileSize;
-+            track.Size = (uint)FileSize;
-             track.Grouping = Grouping;
-             try {
-                 track.TimePlayed = LastPlayed;
---
-cgit v0.9.0.2
diff --git a/media-sound/banshee/files/banshee-2.4.0-upnp-crash.patch b/media-sound/banshee/files/banshee-2.4.0-upnp-crash.patch
deleted file mode 100644
index fa48a878ce97..000000000000
--- a/media-sound/banshee/files/banshee-2.4.0-upnp-crash.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b627217e3841ca7d0b8af1ed8f916436e5088cee Mon Sep 17 00:00:00 2001
-From: Bertrand Lorentz <bertrand.lorentz@gmail.com>
-Date: Sat, 24 Mar 2012 11:27:06 +0000
-Subject: UPnPServerSource: Fix crash when getting the root object (bgo#672744)
-
-Move the GetRootObject () call inside the try/catch block, so that
-exceptions from Mono.Upnp don't cause a crash.
----
-diff --git a/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPServerSource.cs b/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPServerSource.cs
-index 04a743a..5412663 100644
---- a/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPServerSource.cs
-+++ b/src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPServerSource.cs
-@@ -124,10 +124,11 @@ namespace Banshee.UPnPClient
-         {
-             RemoteContentDirectory remote_dir = new RemoteContentDirectory (content_directory);
-             DateTime begin = DateTime.Now;
--            Container root = remote_dir.GetRootObject ();
-             bool recursive_browse = !content_directory.CanSearch;
- 
-             try {
-+                Container root = remote_dir.GetRootObject ();
-+
-                 if (!recursive_browse) {
-                     try {
-                         Log.Debug ("Content directory is searchable, let's search");
---
-cgit v0.9.0.2