[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/natty, updated. debian/1.9.4-1ubuntu1-1-g11e5748

[Chow Loong Jin]

The following commit has been merged in the ubuntu/natty branch:
commit 11e5748fd136d11c9b919f479ba766f57a08c1d0
Author: Rodney Dawes <rodney.dawes at ubuntu.com>
Date:   Mon Feb 28 14:06:16 2011 -0500

    Imported Debian patch 1.9.4-1ubuntu2

diff --git a/debian/changelog b/debian/changelog
index 296e188..481e523 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <rodney.dawes at ubuntu.com>  Mon, 28 Feb 2011 14:06:16 -0500
+
 banshee (1.9.4-1ubuntu1) natty; urgency=low
 
   * Merge from Debian Experimental, remaining changes:
diff --git a/debian/patches/0001-Add-support-for-u1ms-links.patch b/debian/patches/0001-Add-support-for-u1ms-links.patch
new file mode 100644
index 0000000..4787de2
--- /dev/null
+++ b/debian/patches/0001-Add-support-for-u1ms-links.patch
@@ -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 <directhex at apebox.org>
++//   Rodney Dawes <rodney.dawes at canonical.com>
+ //
+ // 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; } }
+         }
+     }
+ }
diff --git a/debian/patches/07_enable-u1ms-by-default.patch b/debian/patches/07_enable-u1ms-by-default.patch
deleted file mode 100644
index 6b943a4..0000000
--- a/debian/patches/07_enable-u1ms-by-default.patch
+++ /dev/null
@@ -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"/>
diff --git a/debian/patches/series b/debian/patches/series
index d83f0a2..90f6f0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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

-- 
banshee