[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/oneiric, updated. debian/2.2.0-1ubuntu2-2-g2e157b7

[Chow Loong Jin]

The following commit has been merged in the ubuntu/oneiric branch:
commit 2e157b75afe7edd0998a03971d416f3034aac01b
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sun Oct 23 16:23:45 2011 +0800

    Don't wait for default URL loading upon startup
    
    LP: #872972

diff --git a/debian/patches/0002-Don-t-wait-for-the-default-URL-loading-any-more.patch b/debian/patches/0002-Don-t-wait-for-the-default-URL-loading-any-more.patch
new file mode 100644
index 0000000..c9de25a
--- /dev/null
+++ b/debian/patches/0002-Don-t-wait-for-the-default-URL-loading-any-more.patch
@@ -0,0 +1,66 @@
+From 16473cd9def9d706892439c71013e05558f69101 Mon Sep 17 00:00:00 2001
+From: Rodney Dawes <rodney.dawes at canonical.com>
+Date: Thu, 20 Oct 2011 15:19:46 -0400
+Subject: [PATCH 2/2] Don't wait for the default URL loading any more
+
+Remove the callback for default URL being loaded
+Just load u1ms:// URLs straight away from startup
+
+Fixes https://bugs.launchpad.net/ubuntu/+source/banshee/+bug/872972
+Fixes https://bugzilla.gnome.org/show_bug.cgi?id=660818
+---
+ .../UbuntuOneMusicStoreSource.cs                   |   20 +-------------------
+ 1 files changed, 1 insertions(+), 19 deletions(-)
+
+diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
+index d8e8656..6cedff0 100644
+--- a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
++++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
+@@ -47,7 +47,6 @@ namespace Banshee.UbuntuOneMusicStore
+         // In the sources TreeView, sets the order value for this source, small on top
+         const int sort_order = 190;
+         CustomView custom_view;
+-        string cached_startup_uri;
+ 
+         public UbuntuOneMusicStoreSource () : base (
+             Catalog.GetString ("Ubuntu One Music Store"),
+@@ -62,12 +61,11 @@ namespace Banshee.UbuntuOneMusicStore
+ 
+             // So we can handle u1ms:// URIs
+             ServiceManager.Get<DBusCommandService> ().ArgumentPushed += OnCommandLineArgument;
+-            custom_view.store.UrlLoaded += OnDefaultStoreUrlLoaded;
+ 
+             // make sure that the u1ms uri gets handled on banshee startup
+             foreach (string uri in ApplicationContext.CommandLine.Files) {
+                 if (IsU1msUri (uri)) {
+-                    cached_startup_uri = uri;
++                    LoadU1msUri (uri);
+                     break;
+                 }
+             }
+@@ -83,22 +81,6 @@ namespace Banshee.UbuntuOneMusicStore
+             get { return 0; }
+         }
+ 
+-        private void OnDefaultStoreUrlLoaded (object o, UbuntuOne.UrlLoadedArgs args)
+-        {
+-            if (args == null || args.Url == null) {
+-                //may happen when there is no internet connection
+-                return;
+-            }
+-
+-            if (args.Url.StartsWith( "http://stores.7digital.com/default")) {
+-                // we just do this the first time we load the default store view
+-                // so that we can switch to the passed u1ms uri and not have it switch out on us.
+-                custom_view.store.UrlLoaded -= OnDefaultStoreUrlLoaded;
+-                if (!string.IsNullOrEmpty (cached_startup_uri))
+-                    LoadU1msUri (cached_startup_uri);
+-            }
+-        }
+-
+         private void OnCommandLineArgument (string uri, object value, bool isFile)
+         {
+             if (!isFile || String.IsNullOrEmpty (uri)) {
+-- 
+1.7.5.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 1ed9721..0ecedff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,4 +13,5 @@ workaround-clideps-winmm.patch
 workaround-clideps-meego.patch
 0001-U1MS-Ensure-that-u1ms-uris-passed-to-Banshee-at-star.patch
 0001-u1ms-Do-a-null-check-to-prevent-NRE.patch
+0002-Don-t-wait-for-the-default-URL-loading-any-more.patch
 99_ltmain_as-needed.patch

-- 
banshee