[rhythmbox] magnatune: Fix two small bugs in the plugin.

[Adam Zimmerman <adamz src gnome org>]

commit e345c010aa68fbd59c351c6ae320ab9ef5fb3a50
Author: Uri Sivan <tartif gmail com>
Date:   Sat Mar 20 19:42:17 2010 -0700

    magnatune: Fix two small bugs in the plugin.
    
    - for streaming, use stream.magnatune.com for streaming memberships, and
      download.magnatune.com for download memberships
    - fix variable naming in __move_data_files()

 plugins/magnatune/magnatune/MagnatuneSource.py  |   12 ++++++------
 plugins/magnatune/magnatune/TrackListHandler.py |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/plugins/magnatune/magnatune/MagnatuneSource.py b/plugins/magnatune/magnatune/MagnatuneSource.py
index 2ed99ad..44e6b51 100644
--- a/plugins/magnatune/magnatune/MagnatuneSource.py
+++ b/plugins/magnatune/magnatune/MagnatuneSource.py
@@ -569,13 +569,13 @@ class MagnatuneSource(rb.BrowserSource):
 
 	def __move_data_files(self):
 		# create cache and data directories
-		magnatune_in_progress_dir = magnatune_in_progress_dir.get_path()
-		magnatune_cache_dir = magnatune_cache_dir.get_path()
+		magnatune_in_progress_path = magnatune_in_progress_dir.get_path()
+		magnatune_cache_path = magnatune_cache_dir.get_path()
 
 		# (we know they don't already exist, and we know the parent dirs do)
-		os.mkdir(magnatune_in_progress_dir, 0700)
-		if os.path.exists(magnatune_cache_dir) is False:
-			os.mkdir(magnatune_cache_dir, 0700)
+		os.mkdir(magnatune_in_progress_path, 0700)
+		if os.path.exists(magnatune_cache_path) is False:
+			os.mkdir(magnatune_cache_path, 0700)
 
 		# move song info to cache dir
 		old_magnatune_dir = os.path.join(rb.dot_dir(), 'magnatune')
@@ -595,7 +595,7 @@ class MagnatuneSource(rb.BrowserSource):
 		for f in otherfiles:
 			print "moving file %s to new in-progress dir" % f
 			os.rename(os.path.join(old_magnatune_dir, f),
-				  os.path.join(magnatune_in_progress_dir, f))
+				  os.path.join(magnatune_in_progress_path, f))
 
 
 gobject.type_register(MagnatuneSource)
diff --git a/plugins/magnatune/magnatune/TrackListHandler.py b/plugins/magnatune/magnatune/TrackListHandler.py
index 14bc9b6..fe9c75a 100644
--- a/plugins/magnatune/magnatune/TrackListHandler.py
+++ b/plugins/magnatune/magnatune/TrackListHandler.py
@@ -49,7 +49,7 @@ class TrackListHandler(xml.sax.handler.ContentHandler):
 		self.__text = ""
 
 	def fix_trackurl(self, trackurl):
-		trackurl = self.__URIre.sub("http://%s:%s stream magnatune com/" % (self.__user, self.__pw), trackurl)
+		trackurl = self.__URIre.sub("http://%s:%s %s magnatune com/" % (self.__user, self.__pw, self.__account_type), trackurl)
 		trackurl = self.__nsre.sub(r"_nospeech.\1", trackurl)
 		return trackurl