Merge lp:~sil/rhythmbox-ubuntuone/remove-old-library into lp:~sil/rhythmbox-ubuntuone/trunk

[Stuart Langridge]

[Stuart Langridge (sil)]

remove old library UDF

[Martin Albisetti (beuno)]

review: Approve

=== modified file 'umusicstore/__init__.py'
--- umusicstore/__init__.py	2010-02-19 12:22:35 +0000
+++ umusicstore/__init__.py	2010-02-21 11:45:26 +0000
@@ -113,6 +113,7 @@
         """Add the U1 library if not listed in RB and re-add if changed."""
         client = gconf.client_get_default()
         self._add_u1_library_if_not_present(client)
+        self._remove_old_u1_library_if_present(client)
         # Watch for changes to the gconf key and re-add the library
         client.notify_add(RB_LIBRARY_LOCATIONS, 
             self._add_u1_library_if_not_present)
@@ -124,6 +125,14 @@
             libraries.append(U1LIBRARYPATH)
             client.set_list(RB_LIBRARY_LOCATIONS, gconf.VALUE_STRING, libraries)
 
+    def _remove_old_u1_library_if_present(self, client, *args, **kwargs):
+        """Check for the old U1 library and remove it from libraries list."""
+        libraries = client.get_list(RB_LIBRARY_LOCATIONS, gconf.VALUE_STRING)
+        old_path = "file://%s" % os.path.expanduser("~/.ubuntuone/musicstore")
+        if old_path in libraries:
+            libraries.remove(old_path)
+            client.set_list(RB_LIBRARY_LOCATIONS, gconf.VALUE_STRING, libraries)
+
 class U1Source(rb.Source):
     """A Rhythmbox source widget for the U1 Music Store."""
     # gproperties required so that rb.Source is instantiable