Ubuntu One for Rhythmbox

Merge lp:~sil/rhythmbox-ubuntuone/use-libu1-udf-location into lp:~sil/rhythmbox-ubuntuone/trunk

Proposed by Stuart Langridge on 2010-03-23

Status:

Merged

Approved by:

Stuart Langridge on 2010-03-23

Approved revision:

Merged at revision:

not available

Proposed branch:

Merge into:

Diff against target:

1 file modified

umusicstore/__init__.py (+3/-2)

To merge this branch:

bzr merge lp:~sil/rhythmbox-ubuntuone/use-libu1-udf-location

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Guillermo Gonzalez (community)			Approve on 2010-03-23
Tim Cole (community)			Approve on 2010-03-23
Stuart Langridge			Pending
Review via email: mp+21923@code.launchpad.net

Get the library path from libu1

Revision history for this message

Tim Cole (tcole) on 2010-03-23:

review: Approve

Revision history for this message

Guillermo Gonzalez (verterok) on 2010-03-23:

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'umusicstore/__init__.py'
2	--- umusicstore/__init__.py 2010-03-11 16:21:50 +0000
3	+++ umusicstore/__init__.py 2010-03-23 11:21:32 +0000
4	@@ -32,7 +32,8 @@
5	gettext.bindtextdomain("rhythmbox-ubuntuone-music-store", "/usr/share/locale")
6	gettext.textdomain("rhythmbox-ubuntuone-music-store")
7
8	-U1LIBRARYPATH = os.path.expanduser("~/.ubuntuone/Purchased from Ubuntu One")
9	+MUSIC_STORE_WIDGET = U1MusicStore() # keep this around for later
10	+U1LIBRARYPATH = MUSIC_STORE_WIDGET.get_library_location()
11	RB_LIBRARY_LOCATIONS = "/apps/rhythmbox/library_locations"
12
13	class U1MusicStorePlugin (rb.Plugin):
14	@@ -347,7 +348,7 @@
15
16	def add_music_store_widget(self):
17	"""Display the music store widget in Rhythmbox."""
18	- self.browser = U1MusicStore()
19	+ self.browser = MUSIC_STORE_WIDGET
20	self.add(self.browser)
21	self.show_all()
22	self.browser.set_no_show_all(True)