Merge lp:~dobey/rhythmbox-ubuntuone/url-handler into lp:rhythmbox-ubuntuone

[dobey]

Add a .desktop file for registering rhythmbox as the u1ms:// url handler when rhythmbox-ubuntuone is installed
Fix the url handling API inside the plug-in to align with new Rhythmbox API

This depends on https://code.launchpad.net/~dobey/libubuntuone/u1ms-load-fixes/+merge/96046 landing, to fully work correctly.

[Natalia Bidart (nataliabidart)]

Shouldn't this be at the same level than the "if callback is not None" guard?

76 + if destroy_data is not None:
77 + destroy_data(callback_data)

review: Needs Information

[dobey (dobey)]

Natlia, I don't think so, as passing in destroy_data nd callback_data arguments without a callback makes no sense.

From the documentation:

 * @callback: a callback function to call when complete
 * @data: data to pass to the callback
 * @destroy_data: function to call to destroy the callback data

[Eric Casteleijn (thisfred)]

review: Approve

[Natalia Bidart (nataliabidart)]

Thanks!

review: Approve

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2012-02-02 19:27:36 +0000
+++ MANIFEST.in	2012-03-06 03:33:18 +0000
@@ -1,4 +1,5 @@
 include COPYING COPYING.LIB MANIFEST.in README
 include run-tests
+include rhythmbox-ubuntuone.desktop.in
 recursive-include po *.po POTFILES.in
 recursive-include ubuntuone *.py *.in

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-01-14 01:59:34 +0000
+++ po/POTFILES.in	2012-03-06 03:33:18 +0000
@@ -1,3 +1,4 @@
+rhythmbox-ubuntuone.desktop.in
 ubuntuone/ubuntuone.py
 ubuntuone/MusicStoreWidget.py
 [type: gettext/ini]ubuntuone/ubuntuone.plugin.in

=== added file 'rhythmbox-ubuntuone.desktop.in'
--- rhythmbox-ubuntuone.desktop.in	1970-01-01 00:00:00 +0000
+++ rhythmbox-ubuntuone.desktop.in	2012-03-06 03:33:18 +0000
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Ubuntu One Music Store
+_Comment=Purchase musc on Ubuntu One in Rhythmbox
+Exec=rhythmbox %U
+Terminal=false
+Type=Application
+Icon=rhythmbox
+Categories=GNOME;GTK;AudioVideo;
+MimeType=x-scheme-handler/u1ms
+StartupNotify=true
+X-Ubuntu-Gettext-Domain=rhythmbox-ubuntuone
+NoDisplay=true

=== modified file 'setup.cfg'
--- setup.cfg	2012-01-14 01:59:34 +0000
+++ setup.cfg	2012-03-06 03:33:18 +0000
@@ -1,2 +1,2 @@
 [build_i18n]
-desktop_files=[("lib/rhythmbox/plugins/ubuntuone", ("ubuntuone/ubuntuone.plugin.in",))]
+desktop_files=[("lib/rhythmbox/plugins/ubuntuone", ("ubuntuone/ubuntuone.plugin.in",)), ("share/applications", ("rhythmbox-ubuntuone.desktop.in",))]

=== modified file 'ubuntuone/MusicStoreWidget.py'
--- ubuntuone/MusicStoreWidget.py	2012-01-31 15:04:32 +0000
+++ ubuntuone/MusicStoreWidget.py	2012-03-06 03:33:18 +0000
@@ -99,7 +99,6 @@
 
     def url_loaded(self, source, url):
         """A URL is loaded in the plugin"""
-        print "URL loaded:", url
         if urlparse.urlparse(url)[2] == "https":
             pass
         else:
@@ -233,17 +232,20 @@
             return 100
         return 0
 
-    def do_impl_add_uri(self, uri, title, genre):
+    def do_impl_add_uri(self, uri, title, genre, callback=None,
+                        callback_data=None, destroy_data=None):
         """Handle a u1ms URL"""
         if not uri.startswith("u1ms://"):
-            return False
+            return
         uri_to_use = uri.replace("u1ms://", "http://")
-        print "Calling u1musicstore plugin with %s" % uri_to_use
         # pylint: disable=E1101
         shell = self.get_property("shell")
         shell.props.display_page_tree.select(self)
         self.browser.load_store_link(uri_to_use)
-        return True
+        if callback is not None:
+            callback(callback_data)
+            if destroy_data is not None:
+                destroy_data(callback_data)
 
     def add_music_store_widget(self):
         """Display the music store widget in Rhythmbox."""