[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 fc0f127019fb9acf352d8045e1dddbfe4b252652
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sun Oct 23 16:20:42 2011 +0800

    Fix Banshee hanging when not connected to Internet
    
    U1MS which loaded the initial u1ms store URL at startup would lock Banshee up if
    not connected to Internet.
    
    LP: #875632

diff --git a/debian/patches/0001-u1ms-Do-a-null-check-to-prevent-NRE.patch b/debian/patches/0001-u1ms-Do-a-null-check-to-prevent-NRE.patch
new file mode 100644
index 0000000..b21ba29
--- /dev/null
+++ b/debian/patches/0001-u1ms-Do-a-null-check-to-prevent-NRE.patch
@@ -0,0 +1,34 @@
+From 906735bb5b80c0456f014d189a6914ff6fe3fe57 Mon Sep 17 00:00:00 2001
+From: "Andres G. Aragoneses" <knocte at gmail.com>
+Date: Wed, 19 Oct 2011 13:08:03 +0100
+Subject: [PATCH 1/2] u1ms: Do a null check to prevent NRE
+
+This easy null check may prevent critical bgo#660818
+from happening. Rather than waiting for feedback
+on BGO, I'm pushing this harmless change as it may
+eventually be faster to know if this works thanks
+to the daily PPA, and then we can backport it to
+the stable branch later.
+---
+ .../UbuntuOneMusicStoreSource.cs                   |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
+index b2703a1..d8e8656 100644
+--- a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
++++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
+@@ -85,6 +85,11 @@ namespace Banshee.UbuntuOneMusicStore
+ 
+         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.
+-- 
+1.7.5.4
+
diff --git a/debian/patches/series b/debian/patches/series
index ccc9aa0..1ed9721 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,4 +12,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
 99_ltmain_as-needed.patch

-- 
banshee