Merge lp:~dobey/ubuntu/natty/banshee/u1ms-links into lp:ubuntu/natty/banshee

[dobey]

* 0001-Add-support-for-u1ms-links.patch:
  - Handle u1ms:// links in the U1 Music Store (LP: #723960)

=== modified file 'data/desktop-files/banshee-1.desktop.mime'
--- data/desktop-files/banshee-1.desktop.mime	2011-02-26 22:05:24 +0000
+++ data/desktop-files/banshee-1.desktop.mime	2011-03-02 23:22:54 +0000
@@ -135,3 +135,4 @@
 video/x-theora
 video/x-theora+ogg
 x-scheme-handler/lastfm
+x-scheme-handler/u1ms

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-26 22:05:24 +0000
+++ debian/changelog	2011-03-02 23:22:54 +0000
@@ -1,3 +1,10 @@
+banshee (1.9.4-1ubuntu2) natty; urgency=low
+
+  * 0001-Add-support-for-u1ms-links.patch:
+    - Handle u1ms:// links in the U1 Music Store (LP: #723960)
+
+ -- Rodney Dawes <[e-mail]>  Mon, 28 Feb 2011 14:06:16 -0500
+
 banshee (1.9.4-1ubuntu1) natty; urgency=low
 
   * Merge from Debian Experimental, remaining changes:

=== added file 'debian/patches/0001-Add-support-for-u1ms-links.patch'
--- debian/patches/0001-Add-support-for-u1ms-links.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0001-Add-support-for-u1ms-links.patch	2011-03-02 23:22:54 +0000
@@ -0,0 +1,83 @@
+diff --git a/data/desktop-files/banshee-1.desktop.mime b/data/desktop-files/banshee-1.desktop.mime
+index 0f26d00..653c099 100644
+--- a/data/desktop-files/banshee-1.desktop.mime
++++ b/data/desktop-files/banshee-1.desktop.mime
+@@ -135,3 +135,4 @@ video/x-ogm+ogg
+ video/x-theora
+ video/x-theora+ogg
+ x-scheme-handler/lastfm
++x-scheme-handler/u1ms
+diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml
+index 89bd3f5..8d4c911 100644
+--- a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml
++++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml
+@@ -9,7 +9,7 @@
+     description="This extension grants access to the Ubuntu One Music Store, powered by 7digital."
+     author="Jo Shields"
+     url="http://one.ubuntu.com/"
+-    defaultEnabled="false">
++    defaultEnabled="true">
+ 
+   <Dependencies>
+     <Addin id="Banshee.Services" version="1.0"/>
+diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
+index 260c384..4a9a4c6 100644
+--- a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
++++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
+@@ -3,8 +3,10 @@
+ //
+ // Authors:
+ //   Jo Shields <[e-mail]>
++//   Rodney Dawes <[e-mail]>
+ //
+ // Copyright (C) 2010 Jo Shields
++// Copyright (C) 2011 Canonical, Ltd.
+ //
+ // Permission is hereby granted, free of charge, to any person obtaining
+ // a copy of this software and associated documentation files (the
+@@ -28,6 +30,7 @@
+ 
+ using Mono.Unix;
+ using Gdk;
++using System;
+ 
+ using Hyena;
+ 
+@@ -51,6 +54,29 @@ namespace Banshee.UbuntuOneMusicStore
+             sort_order, "ubuntu-one-music-store")
+         {
+             Properties.SetString ("Icon.Name", "ubuntuone");
++
++            // So we can handle u1ms:// URIs
++            ServiceManager.Get<DBusCommandService> ().ArgumentPushed += OnCommandLineArgument;
++        }
++
++        ~UbuntuOneMusicStoreSource ()
++        {
++            ServiceManager.Get<DBusCommandService> ().ArgumentPushed -= OnCommandLineArgument;
++        }
++
++        private void OnCommandLineArgument (string uri, object value, bool isFile)
++        {
++            if (!isFile || String.IsNullOrEmpty (uri)) {
++                return;
++            }
++
++            Log.Debug ("U1MS: URI requested: ", uri);
++            // Handle u1ms:// URIs
++            if (uri.StartsWith ("u1ms://")) {
++                string http_url = uri.Replace ("u1ms://", "http://");
++                custom_view.Store.LoadStoreLink (http_url);
++                ServiceManager.SourceManager.SetActiveSource (this);
++            }
+         }
+ 
+         // A count of 0 will be hidden in the source TreeView
+@@ -127,6 +152,7 @@ namespace Banshee.UbuntuOneMusicStore
+             public void ResetSource () { }
+             public Gtk.Widget Widget { get { return store; } }
+             public ISource Source { get { return null; } }
++            public UbuntuOne.U1MusicStore Store { get { return store; } }
+         }
+     }
+ }

=== removed file 'debian/patches/07_enable-u1ms-by-default.patch'
--- debian/patches/07_enable-u1ms-by-default.patch	2011-01-24 22:17:31 +0000
+++ debian/patches/07_enable-u1ms-by-default.patch	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-Index: banshee/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml
-===================================================================
---- banshee.orig/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml	2011-01-13 18:05:17.677167517 +0800
-+++ banshee/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml	2011-01-13 18:05:25.210458516 +0800
-@@ -9,7 +9,7 @@
-     description="This extension grants access to the Ubuntu One Music Store, powered by 7digital."
-     author="Jo Shields"
-     url="http://one.ubuntu.com/"
--    defaultEnabled="false">
-+    defaultEnabled="true">
- 
-   <Dependencies>
-     <Addin id="Banshee.Services" version="1.0"/>

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-02-26 22:05:24 +0000
+++ debian/patches/series	2011-03-02 23:22:54 +0000
@@ -8,7 +8,7 @@
 07_enable-mpris-by-default.patch
 07_disable-notification-area-by-default.patch
 07_enable-soundmenu-by-default.patch
-07_enable-u1ms-by-default.patch
 08_remove_unrelevant_media.patch
 0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
+0001-Add-support-for-u1ms-links.patch
 99_ltmain_as-needed.patch

=== modified file 'src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs'
--- src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs	2011-02-20 14:48:54 +0000
+++ src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs	2011-03-02 23:22:54 +0000
@@ -3,8 +3,10 @@
 //
 // Authors:
 //   Jo Shields <[e-mail]>
+//   Rodney Dawes <[e-mail]>
 //
 // Copyright (C) 2010 Jo Shields
+// Copyright (C) 2011 Canonical, Ltd.
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -28,6 +30,7 @@
 
 using Mono.Unix;
 using Gdk;
+using System;
 
 using Hyena;
 
@@ -51,6 +54,29 @@
             sort_order, "ubuntu-one-music-store")
         {
             Properties.SetString ("Icon.Name", "ubuntuone");
+
+            // So we can handle u1ms:// URIs
+            ServiceManager.Get<DBusCommandService> ().ArgumentPushed += OnCommandLineArgument;
+        }
+
+        ~UbuntuOneMusicStoreSource ()
+        {
+            ServiceManager.Get<DBusCommandService> ().ArgumentPushed -= OnCommandLineArgument;
+        }
+
+        private void OnCommandLineArgument (string uri, object value, bool isFile)
+        {
+            if (!isFile || String.IsNullOrEmpty (uri)) {
+                return;
+            }
+
+            Log.Debug ("U1MS: URI requested: ", uri);
+            // Handle u1ms:// URIs
+            if (uri.StartsWith ("u1ms://")) {
+                string http_url = uri.Replace ("u1ms://", "http://");
+                custom_view.Store.LoadStoreLink (http_url);
+                ServiceManager.SourceManager.SetActiveSource (this);
+            }
         }
 
         // A count of 0 will be hidden in the source TreeView
@@ -127,6 +153,7 @@
             public void ResetSource () { }
             public Gtk.Widget Widget { get { return store; } }
             public ISource Source { get { return null; } }
+            public UbuntuOne.U1MusicStore Store { get { return store; } }
         }
     }
 }