[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/oneiric, updated. debian/2.2.1-1ubuntu3

[Chow Loong Jin]

The following commit has been merged in the ubuntu/oneiric branch:
commit 87799656b2a8b46eb7d7fd4b30708891e550d912
Author: Rodney Dawes <rodney.dawes at ubuntu.com>
Date:   Tue Nov 22 23:31:50 2011 +0800

    Set as active source in an idle callback
    
    LP: #882732

diff --git a/debian/changelog b/debian/changelog
index 4852cf3..0c1908e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+banshee (2.2.1-1ubuntu3) oneiric-proposed; urgency=low
+
+  * debian/patches/90_u1ms_idle_activate.patch:
+    - Set as active source in an idle callback (LP: #882732)
+
+ -- Rodney Dawes <rodney.dawes at ubuntu.com>  Mon, 21 Nov 2011 15:51:37 -0500
+
 banshee (2.2.1-1ubuntu2) oneiric-proposed; urgency=low
 
   * [8217e74] Add workaround for set_Height exceptions in Hyena.
diff --git a/debian/patches/90_u1ms_idle_activate.patch b/debian/patches/90_u1ms_idle_activate.patch
new file mode 100644
index 0000000..cce6e56
--- /dev/null
+++ b/debian/patches/90_u1ms_idle_activate.patch
@@ -0,0 +1,21 @@
+From faaecad57861d8209bdc9d2610ba6f176e80fccf Mon Sep 17 00:00:00 2001
+From: Rodney Dawes <rodney.dawes at canonical.com>
+Date: Mon, 21 Nov 2011 20:33:48 +0000
+Subject: Set as active source in an idle callback
+
+Fixes https://bugzilla.gnome.org/show_bug.cgi?id=662883
+---
+diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
+index b3e332c..8b06017 100644
+--- a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
++++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
+@@ -103,7 +103,8 @@ namespace Banshee.UbuntuOneMusicStore
+             if (IsU1msUri (uri)) {
+                 string http_url = uri.Replace ("u1ms://", "http://");
+                 custom_view.Store.LoadStoreLink (http_url);
+-                ServiceManager.SourceManager.SetActiveSource (this);
++                GLib.Idle.Add (delegate { ServiceManager.SourceManager.SetActiveSource (this); return false; });
++                    
+             }
+         }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index aa0a1e7..2a8de4b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +9,7 @@
 08_remove_unrelevant_media.patch
 0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
 90_amazon_url.patch
+90_u1ms_idle_activate.patch
 workaround-clideps-winmm.patch
 workaround-clideps-meego.patch
 0001-libbanshee-Remove-unused-wanted_size-variable.patch

-- 
banshee