[rhythmbox/gobject-introspection: 25/34] fix various gi port bits

[Jonathan Matthew <jmatthew src gnome org>]

commit 53a91c81e6577159bfded1861b3166fd0890f799
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue Jul 13 15:51:07 2010 +1000

    fix various gi port bits

 plugins/artdisplay/artdisplay/__init__.py |    2 +-
 plugins/jamendo/jamendo/__init__.py       |    2 +-
 plugins/magnatune/magnatune/__init__.py   |    4 ++--
 plugins/rb/URLCache.py                    |    3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/plugins/artdisplay/artdisplay/__init__.py b/plugins/artdisplay/artdisplay/__init__.py
index 885d397..57e03f5 100644
--- a/plugins/artdisplay/artdisplay/__init__.py
+++ b/plugins/artdisplay/artdisplay/__init__.py
@@ -355,7 +355,7 @@ gobject.type_register (ArtDisplayWidget)
 
 class ArtDisplayPlugin (RB.Plugin):
 	def __init__ (self):
-		rb.Plugin.__init__ (self)
+		RB.Plugin.__init__ (self)
 
 	def activate (self, shell):
 		self.shell = shell
diff --git a/plugins/jamendo/jamendo/__init__.py b/plugins/jamendo/jamendo/__init__.py
index 1fee0b3..6e273f7 100644
--- a/plugins/jamendo/jamendo/__init__.py
+++ b/plugins/jamendo/jamendo/__init__.py
@@ -71,7 +71,7 @@ class Jamendo(RB.Plugin):
 		self.entry_type.sync_metadata = None
 
 		theme = Gtk.icon_theme_get_default()
-		RB.append_plugin_source_path(theme, "/icons/")
+		rb.append_plugin_source_path(theme, "/icons/")
 
 		width, height = Gtk.icon_size_lookup(Gtk.IconSize.LARGE_TOOLBAR)
 		icon = RB.try_load_icon(theme, "jamendo", width, 0)
diff --git a/plugins/magnatune/magnatune/__init__.py b/plugins/magnatune/magnatune/__init__.py
index 4c72769..564d4ba 100644
--- a/plugins/magnatune/magnatune/__init__.py
+++ b/plugins/magnatune/magnatune/__init__.py
@@ -57,7 +57,7 @@ popup_ui = """
 </ui>
 """
 
-class Magnatune(rb.Plugin):
+class Magnatune(RB.Plugin):
 	client = GConf.Client.get_default()
 
 	format_list = ['ogg', 'flac', 'wav', 'mp3-vbr', 'mp3-cbr']
@@ -91,7 +91,7 @@ class Magnatune(rb.Plugin):
 		rb.append_plugin_source_path(theme, "/icons")
 
 		width, height = Gtk.icon_size_lookup(Gtk.IconSize.LARGE_TOOLBAR)
-		icon = rb.try_load_icon(theme, "magnatune", width, 0)
+		icon = RB.try_load_icon(theme, "magnatune", width, 0)
 
 		group = RB.rb_source_group_get_by_name("stores")
 		self.source = gobject.new(MagnatuneSource,
diff --git a/plugins/rb/URLCache.py b/plugins/rb/URLCache.py
index e304dbf..462882e 100644
--- a/plugins/rb/URLCache.py
+++ b/plugins/rb/URLCache.py
@@ -30,6 +30,7 @@ import time
 import errno
 
 import rb
+from gi.repository import RB
 
 SECS_PER_DAY = 86400
 
@@ -49,7 +50,7 @@ class URLCache(object):
         if path.startswith("/"):
             self.path = path
         else:
-            self.path = os.path.join(rb.user_cache_dir(), path)
+            self.path = os.path.join(RB.user_cache_dir(), path)
 
         self.refresh = refresh
         self.discard = discard