[rhythmbox] Remove gnome-vfs support in artdisplay plugin



commit 3dce1f2b420f3fcb6709310cf4ed1787b37fa7a7
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Dec 10 16:17:22 2009 +0000

    Remove gnome-vfs support in artdisplay plugin
    
    https://bugzilla.gnome.org/show_bug.cgi?id=604186

 plugins/artdisplay/artdisplay/CoverArtDatabase.py  |   10 +-
 .../artdisplay/artdisplay/LocalCoverArtSearch.py   |  187 --------------------
 plugins/artdisplay/artdisplay/Makefile.am          |    1 -
 3 files changed, 2 insertions(+), 196 deletions(-)
---
diff --git a/plugins/artdisplay/artdisplay/CoverArtDatabase.py b/plugins/artdisplay/artdisplay/CoverArtDatabase.py
index 219fe9c..08125c6 100644
--- a/plugins/artdisplay/artdisplay/CoverArtDatabase.py
+++ b/plugins/artdisplay/artdisplay/CoverArtDatabase.py
@@ -38,14 +38,8 @@ from EmbeddedCoverArtSearch import EmbeddedCoverArtSearch
 
 from urllib import unquote
 
-try:
-	# try to use the gio implementation, fall back to gnome-vfs if that
-	# isn't available.
-	import gio
-	if gio.pygio_version > (2,15,2):	# probably
-		from LocalCoverArtSearchGIO import LocalCoverArtSearch
-except:
-	from LocalCoverArtSearch import LocalCoverArtSearch
+import gio
+from LocalCoverArtSearchGIO import LocalCoverArtSearch
 
 ART_SEARCHES_LOCAL = [LocalCoverArtSearch, EmbeddedCoverArtSearch]
 ART_SEARCHES_REMOTE = [PodcastCoverArtSearch, MusicBrainzCoverArtSearch, DiscogsCoverArtSearch]
diff --git a/plugins/artdisplay/artdisplay/Makefile.am b/plugins/artdisplay/artdisplay/Makefile.am
index c3b3c7f..0faaf5b 100644
--- a/plugins/artdisplay/artdisplay/Makefile.am
+++ b/plugins/artdisplay/artdisplay/Makefile.am
@@ -4,7 +4,6 @@ plugindir = $(PLUGINDIR)/artdisplay
 plugin_PYTHON = 			\
 	EmbeddedCoverArtSearch.py	\
 	PodcastCoverArtSearch.py	\
-	LocalCoverArtSearch.py		\
 	LocalCoverArtSearchGIO.py	\
 	CoverArtDatabase.py		\
 	DiscogsCoverArtSearch.py	\



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