[rhythmbox] Remove mention of GIO implementations, it's the only one
- From: Bastien Nocera <hadess src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [rhythmbox] Remove mention of GIO implementations, it's the only one
- Date: Fri, 11 Dec 2009 01:53:44 +0000 (UTC)
commit 1dd71b5a5680e2f67b7554baff0f7fb430ffbe90
Author: Bastien Nocera <hadess hadess net>
Date: Fri Dec 11 01:51:53 2009 +0000
Remove mention of GIO implementations, it's the only one
plugins/artdisplay/artdisplay/CoverArtDatabase.py | 5 ++---
...CoverArtSearchGIO.py => LocalCoverArtSearch.py} | 0
plugins/rb/Loader.py | 18 ++++--------------
3 files changed, 6 insertions(+), 17 deletions(-)
---
diff --git a/plugins/artdisplay/artdisplay/CoverArtDatabase.py b/plugins/artdisplay/artdisplay/CoverArtDatabase.py
index 08125c6..595e6cf 100644
--- a/plugins/artdisplay/artdisplay/CoverArtDatabase.py
+++ b/plugins/artdisplay/artdisplay/CoverArtDatabase.py
@@ -28,6 +28,7 @@
import rhythmdb, rb
import os
import gtk
+import gio
import itertools
import gobject
@@ -35,12 +36,10 @@ from PodcastCoverArtSearch import PodcastCoverArtSearch
from DiscogsCoverArtSearch import DiscogsCoverArtSearch
from MusicBrainzCoverArtSearch import MusicBrainzCoverArtSearch
from EmbeddedCoverArtSearch import EmbeddedCoverArtSearch
+from LocalCoverArtSearch import LocalCoverArtSearch
from urllib import unquote
-import gio
-from LocalCoverArtSearchGIO import LocalCoverArtSearch
-
ART_SEARCHES_LOCAL = [LocalCoverArtSearch, EmbeddedCoverArtSearch]
ART_SEARCHES_REMOTE = [PodcastCoverArtSearch, MusicBrainzCoverArtSearch, DiscogsCoverArtSearch]
OLD_ART_FOLDER = '~/.gnome2/rhythmbox/covers'
diff --git a/plugins/artdisplay/artdisplay/LocalCoverArtSearchGIO.py b/plugins/artdisplay/artdisplay/LocalCoverArtSearch.py
similarity index 100%
rename from plugins/artdisplay/artdisplay/LocalCoverArtSearchGIO.py
rename to plugins/artdisplay/artdisplay/LocalCoverArtSearch.py
diff --git a/plugins/rb/Loader.py b/plugins/rb/Loader.py
index 4ac9c9a..0ed46b3 100644
--- a/plugins/rb/Loader.py
+++ b/plugins/rb/Loader.py
@@ -27,6 +27,7 @@
import gobject
import gtk
import sys
+import gio
def callback_with_gdk_lock(callback, data, args):
gtk.gdk.threads_enter()
@@ -40,7 +41,7 @@ def callback_with_gdk_lock(callback, data, args):
gtk.gdk.threads_leave()
-class GioLoader(object):
+class Loader(object):
def __init__ (self):
self._cancel = gio.Cancellable()
@@ -67,7 +68,7 @@ class GioLoader(object):
self._cancel.cancel()
-class GioChunkLoader(object):
+class ChunkLoader(object):
def __init__ (self):
self._cancel = gio.Cancellable()
@@ -150,7 +151,7 @@ class GioChunkLoader(object):
self._cancel.cancel()
-class GioUpdateCheck(object):
+class UpdateCheck(object):
def __init__ (self):
self._cancel = gio.Cancellable()
@@ -184,14 +185,3 @@ class GioUpdateCheck(object):
def cancel (self):
self._cancel.cancel()
-
-
-
-# now figure out which set of implementations to use
-
-import gio
-
-Loader = GioLoader
-ChunkLoader = GioChunkLoader
-UpdateCheck = GioUpdateCheck
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]