Merge lp:~dobey/ubuntu/oneiric/banshee/faster-u1ms-loading into lp:ubuntu/oneiric/banshee

[dobey]

[Michael Terry (mterry)]

I looked into this. After this and the libubuntuone patch [1], starting banshee with a u1ms url doesn't switch to the music store after startup. dobey is looking into it.

[1] https://code.launchpad.net/~dobey/ubuntu/oneiric/libubuntuone/faster-u1ms/+merge/80260

[dobey (dobey)]

This seems to be a race condition internal to banshee as best I can tell. When attempting to debug using banshee from git, the problem went away, and I can no longer replicate it. I'm not sure how to further debug that specific issue, either, as it appears to be a Heisenbug. :-/

[lp:~dobey/ubuntu/oneiric/banshee/faster-u1ms-loading]

130. By dobey on 2011-10-27

Backport patch to avoid race condition using idle handler (LP: #882732)

[dobey (dobey)]

Just pushed up with a new patch to also fix bug #872972 (the race) as well.

[dobey (dobey)]

Sorry, bug #882732 is the race. Not 872972.

[Michael Terry (mterry)]

Awesome, works great now. Pushed to oneiric-proposed.

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-23 12:03:29 +0000
+++ debian/changelog	2011-10-27 19:59:25 +0000
@@ -1,3 +1,12 @@
+banshee (2.2.0-1ubuntu3) oneiric-proposed; urgency=low
+
+  * Backport patch to allow opeing u1ms:// links faster (LP: #872972)
+    - Also removes code which could cause freeze/crash (LP: #875632)
+    - Require new version of libubuntuone for faster u1ms loading
+  * Backport patch to avoid race condition using idle handler (LP: #882732)
+
+ -- Rodney Dawes <[e-mail]>  Thu, 27 Oct 2011 15:54:52 -0400
+
 banshee (2.2.0-1ubuntu2) oneiric; urgency=low
 
   * [cd59790] Backport patch to add U1MS URI support (LP: #856542)

=== modified file 'debian/control'
--- debian/control	2011-09-21 13:54:50 +0000
+++ debian/control	2011-10-27 19:59:25 +0000
@@ -26,7 +26,7 @@
                libgtk-sharp-beans2.0-cil-dev (>= 2.8),
                libgpod-cil-dev (>= 0.7.95),
                libgpod-cil-dev (<< 0.8.2),
-               libubuntuone1.0-cil-dev (>= 0.9.2),
+               libubuntuone1.0-cil-dev (>= 0.11.0-0ubuntu3),
                libwebkitgtk-dev (>= 1.2.2) | libwebkit-dev (>= 1.2.2),
                libsoup2.4-dev (>= 2.26),
                libsoup-gnome2.4-dev (>= 2.26),
@@ -102,7 +102,7 @@
          ${cli:Depends},
          ${shlibs:Depends},
          ${misc:Depends},
-         libubuntuone1.0-cil (>= 0.9.2)
+         libubuntuone1.0-cil (>= 0.11.0-0ubuntu3)
 Enhances: banshee
 Description: Media Management and Playback application - U1MS extension
  Banshee is a media management and playback application for the GNOME

=== added file 'debian/patches/91_u1ms_switch_faster.patch'
--- debian/patches/91_u1ms_switch_faster.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/91_u1ms_switch_faster.patch	2011-10-27 19:59:25 +0000
@@ -0,0 +1,54 @@
+From 16473cd9def9d706892439c71013e05558f69101 Mon Sep 17 00:00:00 2001
+From: Rodney Dawes <[e-mail]>
+Date: Thu, 20 Oct 2011 19:19:46 +0000
+Subject: 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
+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,17 +81,6 @@ namespace Banshee.UbuntuOneMusicStore
+             get { return 0; }
+         }
+ 
+-        private void OnDefaultStoreUrlLoaded (object o, UbuntuOne.UrlLoadedArgs args)
+-        {
+-            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)) {

=== added file 'debian/patches/92_avoid_source_race.patch'
--- debian/patches/92_avoid_source_race.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/92_avoid_source_race.patch	2011-10-27 19:59:25 +0000
@@ -0,0 +1,24 @@
+From 9323f7b5c056ce52128dd4dfdf5b16abff8fb6e9 Mon Sep 17 00:00:00 2001
+From: Rodney Dawes <[e-mail]>
+Date: Thu, 27 Oct 2011 19:09:22 +0000
+Subject: Call the notify handler from a GLib idle delegate
+
+Uses a delegate in a glib idle callback to call the nofity handler.
+We need to do this to avoid racing on startup with other activities
+which can block the main loop, causing the handler to only work
+sometimes, or only partially.
+
+Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=662883
+diff --git a/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs b/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs
+index d0878bd..289f954 100644
+--- a/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs
++++ b/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs
+@@ -411,7 +411,7 @@ namespace Banshee.Sources
+             if(handler != null) {
+                 SourceEventArgs args = new SourceEventArgs();
+                 args.Source = active_source;
+-                handler(args);
++                GLib.Idle.Add (delegate { handler(args); return false; });
+             }
+ 
+             source.Activate();

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-09-23 12:03:29 +0000
+++ debian/patches/series	2011-10-27 19:59:25 +0000
@@ -12,4 +12,6 @@
 workaround-clideps-winmm.patch
 workaround-clideps-meego.patch
 0001-U1MS-Ensure-that-u1ms-uris-passed-to-Banshee-at-star.patch
+91_u1ms_switch_faster.patch
+92_avoid_source_race.patch
 99_ltmain_as-needed.patch