Merge lp:~dobey/rhythmbox-ubuntuone/update-from-trunk into lp:rhythmbox-ubuntuone/stable-3-0

[dobey]

Add ourselves to the libraries list as an escaped URI
Remove the old non-uri and unescaped uri path entries

[Eric Casteleijn (thisfred)]

Will the kludges to remove the non-uri/unescaped uri be there forever? If not, I'd like to see XXX/TODO comments there, preferably with a bug number.

review: Approve

[dobey (dobey)]

Probably. I don't see any particular reason to remove them in the next 5 years, and that's close enough to forever that it might as well be marriage. :)

=== modified file 'ubuntuone/ubuntuone.py'
--- ubuntuone/ubuntuone.py	2012-03-20 20:26:40 +0000
+++ ubuntuone/ubuntuone.py	2012-04-03 18:21:17 +0000
@@ -41,8 +41,18 @@
     def _locations_changed(self, *args, **kwargs):
         """Handle the locations setting being changed."""
         libraries = self.rdbconf.get_strv('locations')
-        if U1LIBRARYPATH not in libraries:
-            libraries.append(U1LIBRARYPATH)
+        library_uri = Gio.File.new_for_path(U1LIBRARYPATH).get_uri()
+        if library_uri not in libraries:
+            libraries.append(library_uri)
+            self.rdbconf.set_strv('locations', libraries)
+        # Remove the non-uri path if it exists
+        if U1LIBRARYPATH in libraries:
+            libraries.remove(U1LIBRARYPATH)
+            self.rdbconf.set_strv('locations', libraries)
+        # Remove the unescaped uri path if it exists
+        unescaped_path = u'file://{0}'.format(U1LIBRARYPATH)
+        if unescaped_path in libraries:
+            libraries.remove(unescaped_path)
             self.rdbconf.set_strv('locations', libraries)
 
     def do_activate(self):