Ubuntu One for Rhythmbox

Merge lp:~dobey/rhythmbox-ubuntuone/fix-disable into lp:rhythmbox-ubuntuone

  1. fix-disable
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 113
Merged at revision: 113
Proposed branch: lp:~dobey/rhythmbox-ubuntuone/fix-disable
Merge into: lp:rhythmbox-ubuntuone
Diff against target: 26 lines (+5/-4)
1 file modified
ubuntuone/MusicStoreWidget.py (+5/-4)
To merge this branch: bzr merge lp:~dobey/rhythmbox-ubuntuone/fix-disable
Reviewer Review Type Date Requested Status
Eric Casteleijn (community) Approve
Roberto Alsina (community) Approve
Review via email: mp+97747@code.launchpad.net

Commit message

Ensure we are removed/added correctly when disabled and re-enabled

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) wrote :

+1

review: Approve
Revision history for this message
Eric Casteleijn (thisfred) wrote :

good good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/MusicStoreWidget.py'
2--- ubuntuone/MusicStoreWidget.py 2012-03-06 20:51:27 +0000
3+++ ubuntuone/MusicStoreWidget.py 2012-03-15 20:19:21 +0000
4@@ -92,9 +92,7 @@
5 def deactivate(self, shell):
6 """Plugin shutdown."""
7 # remove source
8- # FIXME?: This API changed, but doesn't seem entirely necessary.
9- # It's not entirely clear which API to use for this now.
10- #self.source.delete_thyself()
11+ self.source.delete_thyself()
12 # delete held references
13 del self.db
14 del self.source
15@@ -248,7 +246,10 @@
16 def add_music_store_widget(self):
17 """Display the music store widget in Rhythmbox."""
18 # pylint: disable=E1101
19- self.add(self.browser)
20+ if self.browser.get_property('parent') is None:
21+ self.add(self.browser)
22+ else:
23+ self.browser.reparent(self)
24 self.browser.show()
25 self.show()
26 self.browser.set_property("visible", True)

Subscribers

People subscribed via source and target branches