Merge lp:~sil/rhythmbox-ubuntuone/fix-mp3-install into lp:~sil/rhythmbox-ubuntuone/trunk

[Stuart Langridge]

[Stuart Langridge (sil)]

Fix the mp3-codec installer, which I broke, doh.

[Guillermo Gonzalez (verterok)]

works

review: Approve

=== modified file 'umusicstore/__init__.py'
--- umusicstore/__init__.py	2010-02-22 16:23:36 +0000
+++ umusicstore/__init__.py	2010-03-02 16:17:15 +0000
@@ -150,9 +150,6 @@
         """Source startup."""
         if self.__activated: return
         self.__activated = True
-        self.body = gtk.EventBox()
-        self.pack_start(self.body)
-        self.body.show_all()
         self.test_can_play_mp3()
         rb.Source.do_impl_activate (self)
 
@@ -210,7 +207,7 @@
         self.install_vbox.pack_start(self.install_hbtn, expand=False)
         self.install_box.add(self.install_vbox)
         self.install_box.show_all()
-        self.body.add_with_viewport(self.install_box)
+        self.add(self.install_box)
 
     def _start_mp3_install(self, btn):
         ac = aptdaemon.client.AptClient()
@@ -233,7 +230,7 @@
     def _finished(self, trans, exit_code):
         """Aptdaemon package installation finished; show music store."""
         if exit_code == 0:
-            self.body.remove(self.install_box.get_parent())
+            self.remove(self.install_box)
             gst.update_registry()
             self.add_music_store_widget()
         else:
@@ -255,8 +252,8 @@
     def add_music_store_widget(self):
         """Display the music store widget in Rhythmbox."""
         self.browser = U1MusicStore()
-        self.body.add(self.browser)
-        self.body.show_all()
+        self.add(self.browser)
+        self.show_all()
         self.browser.set_no_show_all(True)
         self.browser.set_property("visible", True)
         self.browser.connect("preview-mp3", self.re_emit_preview)