Merge lp:~ubuntu-branches/ubuntu/natty/banshee/natty-201103250238 into lp:ubuntu/natty/banshee

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/banshee now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/banshee/natty-201103250238. A merge should be performed if necessary.

Unmerged revisions

112. By Ken VanDine on 2011-03-03

releasing version 1.9.4-1ubuntu2

111. By Ken VanDine on 2011-03-03

unapplied quilt patches and removed the .pc dir from the bzr tree

110. By Ken VanDine on 2011-03-03

* 0001-Add-support-for-u1ms-links.patch:
  - Handle u1ms:// links in the U1 Music Store (LP: #723960)

=== removed file '.pc/.version'
--- .pc/.version	2011-02-20 14:48:54 +0000
+++ .pc/.version	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== removed directory '.pc/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch'
=== removed directory '.pc/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch/src'
=== removed directory '.pc/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch/src/Core'
=== removed directory '.pc/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch/src/Core/Banshee.ThickClient'
=== removed directory '.pc/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch/src/Core/Banshee.ThickClient/Banshee.Collection.Gui'
=== removed file '.pc/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs'
--- .pc/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs	2011-02-20 14:48:54 +0000
+++ .pc/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs	1970-01-01 00:00:00 +0000
@@ -1,465 +0,0 @@
-//
-// ArtworkManager.cs
-//
-// Author:
-//   Aaron Bockover <[e-mail]>
-//
-// Copyright (C) 2007-2008 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-
-using Mono.Unix;
-
-using Gdk;
-
-using Hyena;
-using Hyena.Gui;
-using Hyena.Collections;
-using Hyena.Data.Sqlite;
-
-using Banshee.Base;
-using Banshee.IO;
-using Banshee.ServiceStack;
-
-namespace Banshee.Collection.Gui
-{
-    public class ArtworkManager : IService
-    {
-        private Dictionary<int, SurfaceCache> scale_caches  = new Dictionary<int, SurfaceCache> ();
-        private HashSet<int> cacheable_cover_sizes = new HashSet<int> ();
-        private HashSet<string> null_artwork_ids = new HashSet<string> ();
-
-        private class SurfaceCache : LruCache<string, Cairo.ImageSurface>
-        {
-            public SurfaceCache (int max_items) : base (max_items)
-            {
-            }
-
-            protected override void ExpireItem (Cairo.ImageSurface item)
-            {
-                if (item != null) {
-                    ((IDisposable)item).Dispose ();
-                }
-            }
-        }
-
-        public ArtworkManager ()
-        {
-            AddCachedSize (36);
-            AddCachedSize (40);
-            AddCachedSize (42);
-            AddCachedSize (48);
-            AddCachedSize (64);
-            AddCachedSize (90);
-            AddCachedSize (300);
-
-            try {
-                MigrateCacheDir ();
-            } catch (Exception e) {
-                Log.Exception ("Could not migrate album artwork cache directory", e);
-            }
-
-            Banshee.Metadata.MetadataService.Instance.ArtworkUpdated += OnArtworkUpdated;
-        }
-
-        public void Dispose ()
-        {
-            Banshee.Metadata.MetadataService.Instance.ArtworkUpdated -= OnArtworkUpdated;
-        }
-
-        private void OnArtworkUpdated (IBasicTrackInfo track)
-        {
-            ClearCacheFor (track.ArtworkId, true);
-        }
-
-        public Cairo.ImageSurface LookupSurface (string id)
-        {
-            return LookupScaleSurface (id, 0);
-        }
-
-        public Cairo.ImageSurface LookupScaleSurface (string id, int size)
-        {
-            return LookupScaleSurface (id, size, false);
-        }
-
-        public Cairo.ImageSurface LookupScaleSurface (string id, int size, bool useCache)
-        {
-            SurfaceCache cache = null;
-            Cairo.ImageSurface surface = null;
-
-            if (id == null) {
-                return null;
-            }
-
-            if (useCache && scale_caches.TryGetValue (size, out cache) && cache.TryGetValue (id, out surface)) {
-                return surface;
-            }
-
-            if (null_artwork_ids.Contains (id)) {
-                return null;
-            }
-
-            Pixbuf pixbuf = LookupScalePixbuf (id, size);
-            if (pixbuf == null || pixbuf.Handle == IntPtr.Zero) {
-                null_artwork_ids.Add (id);
-                return null;
-            }
-
-            try {
-                surface = PixbufImageSurface.Create (pixbuf);
-                if (surface == null) {
-                    return null;
-                }
-
-                if (!useCache) {
-                    return surface;
-                }
-
-                if (cache == null) {
-                    int bytes = 4 * size * size;
-                    int max = (1 << 20) / bytes;
-
-                    ChangeCacheSize (size, max);
-                    cache = scale_caches[size];
-                }
-
-                cache.Add (id, surface);
-                return surface;
-            } finally {
-                DisposePixbuf (pixbuf);
-            }
-        }
-
-        public Pixbuf LookupPixbuf (string id)
-        {
-            return LookupScalePixbuf (id, 0);
-        }
-
-        public Pixbuf LookupScalePixbuf (string id, int size)
-        {
-            if (id == null || (size != 0 && size < 10)) {
-                return null;
-            }
-
-            if (null_artwork_ids.Contains (id)) {
-                return null;
-            }
-
-            // Find the scaled, cached file
-            string path = CoverArtSpec.GetPathForSize (id, size);
-            if (File.Exists (new SafeUri (path))) {
-                try {
-                    return new Pixbuf (path);
-                } catch {
-                    null_artwork_ids.Add (id);
-                    return null;
-                }
-            }
-
-            string orig_path = CoverArtSpec.GetPathForSize (id, 0);
-            bool orig_exists = File.Exists (new SafeUri (orig_path));
-
-            if (!orig_exists) {
-                // It's possible there is an image with extension .cover that's waiting
-                // to be converted into a jpeg
-                string unconverted_path = System.IO.Path.ChangeExtension (orig_path, "cover");
-                if (File.Exists (new SafeUri (unconverted_path))) {
-                    try {
-                        Pixbuf pixbuf = new Pixbuf (unconverted_path);
-                        if (pixbuf.Width < 50 || pixbuf.Height < 50) {
-                            Hyena.Log.DebugFormat ("Ignoring cover art {0} because less than 50x50", unconverted_path);
-                            null_artwork_ids.Add (id);
-                            return null;
-                        }
-
-                        pixbuf.Save (orig_path, "jpeg");
-                        orig_exists = true;
-                    } catch {
-                    } finally {
-                        File.Delete (new SafeUri (unconverted_path));
-                    }
-                }
-            }
-
-            if (orig_exists && size >= 10) {
-                try {
-                    Pixbuf pixbuf = new Pixbuf (orig_path);
-
-                    // Make it square if width and height difference is within 20%
-                    const double max_ratio = 1.2;
-                    double ratio = (double)pixbuf.Height / pixbuf.Width;
-                    int width = size, height = size;
-                    if (ratio > max_ratio) {
-                        width = (int)Math.Round (size / ratio);
-                    }else if (ratio < 1d / max_ratio) {
-                        height = (int)Math.Round (size * ratio);
-                    }
-
-                    Pixbuf scaled_pixbuf = pixbuf.ScaleSimple (width, height, Gdk.InterpType.Bilinear);
-
-                    if (IsCachedSize (size)) {
-                        Directory.Create (System.IO.Path.GetDirectoryName (path));
-                        scaled_pixbuf.Save (path, "jpeg");
-                    } else {
-                        Log.InformationFormat ("Uncached artwork size {0} requested", size);
-                    }
-
-                    DisposePixbuf (pixbuf);
-                    return scaled_pixbuf;
-                } catch {}
-            }
-
-            null_artwork_ids.Add (id);
-            return null;
-        }
-
-        public void ClearCacheFor (string id)
-        {
-            ClearCacheFor (id, false);
-        }
-
-        public void ClearCacheFor (string id, bool inMemoryCacheOnly)
-        {
-            if (String.IsNullOrEmpty (id)) {
-                return;
-            }
-
-            // Clear from the in-memory cache
-            foreach (int size in scale_caches.Keys) {
-                scale_caches[size].Remove (id);
-            }
-
-            null_artwork_ids.Remove (id);
-
-            if (inMemoryCacheOnly) {
-                return;
-            }
-
-            // And delete from disk
-            foreach (int size in CachedSizes ()) {
-                var uri = new SafeUri (CoverArtSpec.GetPathForSize (id, size));
-                if (File.Exists (uri)) {
-                    File.Delete (uri);
-                }
-            }
-        }
-
-        public void AddCachedSize (int size)
-        {
-            cacheable_cover_sizes.Add (size);
-        }
-
-        public bool IsCachedSize (int size)
-        {
-            return cacheable_cover_sizes.Contains (size);
-        }
-
-        public IEnumerable<int> CachedSizes ()
-        {
-            return cacheable_cover_sizes;
-        }
-
-        public void ChangeCacheSize (int size, int max_count)
-        {
-            SurfaceCache cache;
-            if (scale_caches.TryGetValue (size, out cache)) {
-                if (max_count > cache.MaxCount) {
-                    Log.DebugFormat (
-                        "Growing surface cache for {0}px images to {1:0.00} MiB ({2} items)",
-                        size, 4 * size * size * max_count / 1048576d, max_count);
-                    cache.MaxCount = max_count;
-                }
-            } else {
-                Log.DebugFormat (
-                    "Creating new surface cache for {0}px images, capped at {1:0.00} MiB ({2} items)",
-                    size, 4 * size * size * max_count / 1048576d, max_count);
-                scale_caches.Add (size, new SurfaceCache (max_count));
-            }
-        }
-
-        private static int dispose_count = 0;
-        public static void DisposePixbuf (Pixbuf pixbuf)
-        {
-            if (pixbuf != null && pixbuf.Handle != IntPtr.Zero) {
-                pixbuf.Dispose ();
-                pixbuf = null;
-
-                // There is an issue with disposing Pixbufs where we need to explicitly
-                // call the GC otherwise it doesn't get done in a timely way.  But if we
-                // do it every time, it slows things down a lot; so only do it every 100th.
-                if (++dispose_count % 100 == 0) {
-                    System.GC.Collect ();
-                    dispose_count = 0;
-                }
-            }
-        }
-
-        string IService.ServiceName {
-            get { return "ArtworkManager"; }
-        }
-
-#region Cache Directory Versioning/Migration
-
-        private const int CUR_VERSION = 3;
-        private void MigrateCacheDir ()
-        {
-            int version = CacheVersion;
-            if (version == CUR_VERSION) {
-                return;
-            }
-
-            var legacy_root_path = CoverArtSpec.LegacyRootPath;
-
-            if (version < 1) {
-                string legacy_artwork_path = Paths.Combine (LegacyPaths.ApplicationData, "covers");
-
-                if (!Directory.Exists (legacy_root_path)) {
-                    Directory.Create (legacy_root_path);
-
-                    if (Directory.Exists (legacy_artwork_path)) {
-                        Directory.Move (new SafeUri (legacy_artwork_path), new SafeUri (legacy_root_path));
-                    }
-                }
-
-                if (Directory.Exists (legacy_artwork_path)) {
-                    Log.InformationFormat ("Deleting old (Banshee < 1.0) artwork cache directory {0}", legacy_artwork_path);
-                    Directory.Delete (legacy_artwork_path, true);
-                }
-            }
-
-            if (version < 2) {
-                int deleted = 0;
-                foreach (string dir in Directory.GetDirectories (legacy_root_path)) {
-                    int size;
-                    string dirname = System.IO.Path.GetFileName (dir);
-                    if (Int32.TryParse (dirname, out size) && !IsCachedSize (size)) {
-                        Directory.Delete (dir, true);
-                        deleted++;
-                    }
-                }
-
-                if (deleted > 0) {
-                    Log.InformationFormat ("Deleted {0} extraneous album-art cache directories", deleted);
-                }
-            }
-
-            if (version < 3) {
-                Log.Information ("Migrating album-art cache directory");
-                var started = DateTime.Now;
-                int count = 0;
-
-                var root_path = CoverArtSpec.RootPath;
-                if (!Directory.Exists (root_path)) {
-                    Directory.Create (root_path);
-                }
-
-                string sql = "SELECT Title, ArtistName FROM CoreAlbums";
-                using (var reader = new HyenaDataReader (ServiceManager.DbConnection.Query (sql))) {
-                    while (reader.Read ()) {
-                        var album = reader.Get<string>(0);
-                        var artist = reader.Get<string>(1);
-                        var old_file = CoverArtSpec.CreateLegacyArtistAlbumId (artist, album);
-                        var new_file = CoverArtSpec.CreateArtistAlbumId (artist, album);
-
-                        if (String.IsNullOrEmpty (old_file) || String.IsNullOrEmpty (new_file)) {
-                            continue;
-                        }
-
-                        old_file = String.Format ("{0}.jpg", old_file);
-                        new_file = String.Format ("{0}.jpg", new_file);
-
-                        var old_path = new SafeUri (Paths.Combine (legacy_root_path, old_file));
-                        var new_path = new SafeUri (Paths.Combine (root_path, new_file));
-
-                        if (Banshee.IO.File.Exists (old_path) && !Banshee.IO.File.Exists (new_path)) {
-                            Banshee.IO.File.Move (old_path, new_path);
-                            count++;
-                        }
-                    }
-                }
-
-                if (ServiceManager.DbConnection.TableExists ("PodcastSyndications")) {
-                    sql = "SELECT Title FROM PodcastSyndications";
-                    foreach (var title in ServiceManager.DbConnection.QueryEnumerable<string> (sql)) {
-                        var old_digest = CoverArtSpec.LegacyEscapePart (title);
-                        var new_digest = CoverArtSpec.Digest (title);
-
-                        if (String.IsNullOrEmpty (old_digest) || String.IsNullOrEmpty (new_digest)) {
-                            continue;
-                        }
-
-                        var old_file = String.Format ("podcast-{0}.jpg", old_digest);
-                        var new_file = String.Format ("podcast-{0}.jpg", new_digest);
-
-                        var old_path = new SafeUri (Paths.Combine (legacy_root_path, old_file));
-                        var new_path = new SafeUri (Paths.Combine (root_path, new_file));
-
-                        if (Banshee.IO.File.Exists (old_path) && !Banshee.IO.File.Exists (new_path)) {
-                            Banshee.IO.File.Move (old_path, new_path);
-                            count++;
-                        }
-                    }
-                }
-
-                Directory.Delete (legacy_root_path, true);
-                Log.InformationFormat ("Migrated {0} files in {1}s", count, DateTime.Now.Subtract(started).TotalSeconds);
-            }
-
-            CacheVersion = CUR_VERSION;
-        }
-
-        private static SafeUri cache_version_file = new SafeUri (Paths.Combine (CoverArtSpec.RootPath, ".cache_version"));
-        private static int CacheVersion {
-            get {
-                var file = cache_version_file;
-                if (!Banshee.IO.File.Exists (file)) {
-                    file = new SafeUri (Paths.Combine (CoverArtSpec.LegacyRootPath, ".cache_version"));
-                    if (!Banshee.IO.File.Exists (file)) {
-                        file = null;
-                    }
-                }
-
-                if (file != null) {
-                    using (var reader = new System.IO.StreamReader (Banshee.IO.File.OpenRead (file))) {
-                        int version;
-                        if (Int32.TryParse (reader.ReadLine (), out version)) {
-                            return version;
-                        }
-                    }
-                }
-
-                return 0;
-            }
-            set {
-                using (var writer = new System.IO.StreamWriter (Banshee.IO.File.OpenWrite (cache_version_file, true))) {
-                    writer.Write (value.ToString ());
-                }
-            }
-        }
-
-#endregion
-
-    }
-}

=== removed directory '.pc/01_Debranch-netbook-interface.patch'
=== removed directory '.pc/01_Debranch-netbook-interface.patch/src'
=== removed directory '.pc/01_Debranch-netbook-interface.patch/src/Extensions'
=== removed directory '.pc/01_Debranch-netbook-interface.patch/src/Extensions/Banshee.MeeGo'
=== removed directory '.pc/01_Debranch-netbook-interface.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo'
=== removed file '.pc/01_Debranch-netbook-interface.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs'
--- .pc/01_Debranch-netbook-interface.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs	2011-02-20 14:48:54 +0000
+++ .pc/01_Debranch-netbook-interface.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs	1970-01-01 00:00:00 +0000
@@ -1,113 +0,0 @@
-//
-// MeeGoPanel.cs
-//
-// Author:
-//   Aaron Bockover <[e-mail]>
-//
-// Copyright 2009-2010 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using Mono.Unix;
-
-using Gtk;
-using MeeGo.Panel;
-
-using Hyena;
-using Banshee.Base;
-using Banshee.ServiceStack;
-
-namespace Banshee.MeeGo
-{
-    public class MeeGoPanel : IDisposable
-    {
-        public static MeeGoPanel Instance { get; private set; }
-
-        private PanelGtk embedded_panel;
-        private Window window_panel;
-
-        public MediaPanelContents Contents { get; private set; }
-
-        public MeeGoPanel ()
-        {
-            if (Instance != null) {
-                throw new InvalidOperationException ("Only one MeeGoPanel instance should exist");
-            }
-
-            Instance = this;
-
-            var timer = Log.DebugTimerStart ();
-
-            try {
-                Log.Debug ("Attempting to create MeeGo toolbar panel");
-                embedded_panel = new PanelGtk ("banshee", Catalog.GetString ("media"),
-                    null, "media-button", true);
-                embedded_panel.ShowBeginEvent += (o, e) => {
-                    ServiceManager.SourceManager.SetActiveSource (ServiceManager.SourceManager.MusicLibrary);
-                    if (Contents != null) {
-                        Contents.SyncSearchEntry ();
-                    }
-                };
-                while (Gtk.Application.EventsPending ()) {
-                    Gtk.Application.RunIteration ();
-                }
-            } catch (Exception e) {
-                if (!(e is DllNotFoundException)) {
-                    Log.Exception ("Could not bind to MeeGo panel", e);
-                }
-                window_panel = new Gtk.Window ("MeeGo Media Panel");
-            }
-
-            Log.DebugTimerPrint (timer, "MeeGo panel created: {0}");
-        }
-
-        public void Dispose ()
-        {
-        }
-
-        public void BuildContents ()
-        {
-            var timer = Log.DebugTimerStart ();
-            Contents = new MediaPanelContents ();
-            Contents.ShowAll ();
-            Log.DebugTimerPrint (timer, "MeeGo panel contents created: {0}");
-
-            if (embedded_panel != null) {
-                embedded_panel.SetChild (Contents);
-            } else if (window_panel != null) {
-                window_panel.Add (Contents);
-                window_panel.SetDefaultSize (1000, 500);
-                window_panel.WindowPosition = WindowPosition.Center;
-                window_panel.Show ();
-                GLib.Timeout.Add (1000, () => {
-                    window_panel.Present ();
-                    return false;
-                });
-            }
-        }
-
-        public void Hide ()
-        {
-            if (embedded_panel != null) {
-                embedded_panel.Hide ();
-            }
-        }
-    }
-}

=== removed file '.pc/01_Debranch-netbook-interface.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs'
--- .pc/01_Debranch-netbook-interface.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs	2011-02-20 14:48:54 +0000
+++ .pc/01_Debranch-netbook-interface.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs	1970-01-01 00:00:00 +0000
@@ -1,145 +0,0 @@
-//
-// MeeGoService.cs
-//
-// Authors:
-//   Aaron Bockover <[e-mail]>
-//
-// Copyright 2009-2010 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Gtk;
-using MeeGo.Panel;
-
-using Hyena;
-
-using Banshee.Base;
-using Banshee.Collection;
-using Banshee.Sources;
-using Banshee.ServiceStack;
-using Banshee.MediaEngine;
-using Banshee.Gui;
-
-namespace Banshee.MeeGo
-{
-    public class MeeGoService : IExtensionService
-    {
-        private GtkElementsService elements_service;
-        private InterfaceActionService interface_action_service;
-        private SourceManager source_manager;
-        private PlayerEngineService player;
-        private MeeGoPanel panel;
-
-        void IExtensionService.Initialize ()
-        {
-            elements_service = ServiceManager.Get<GtkElementsService> ();
-            interface_action_service = ServiceManager.Get<InterfaceActionService> ();
-            source_manager = ServiceManager.SourceManager;
-            player = ServiceManager.PlayerEngine;
-
-            if (!ServiceStartup ()) {
-                ServiceManager.ServiceStarted += OnServiceStarted;
-            }
-        }
-
-        private void OnServiceStarted (ServiceStartedArgs args)
-        {
-            if (args.Service is Banshee.Gui.InterfaceActionService) {
-                interface_action_service = (InterfaceActionService)args.Service;
-            } else if (args.Service is GtkElementsService) {
-                elements_service = (GtkElementsService)args.Service;
-            } else if (args.Service is SourceManager) {
-                source_manager = ServiceManager.SourceManager;
-            } else if (args.Service is PlayerEngineService) {
-                player = ServiceManager.PlayerEngine;
-            }
-
-            ServiceStartup ();
-        }
-
-        private bool ServiceStartup ()
-        {
-            if (elements_service == null || interface_action_service == null ||
-                source_manager == null || player == null) {
-                return false;
-            }
-
-            Initialize ();
-
-            ServiceManager.ServiceStarted -= OnServiceStarted;
-
-            return true;
-        }
-
-        private void Initialize ()
-        {
-            // If Banshee is running from the MeeGo client entry assembly,
-            // the MeeGoPanel will have already been created. If not, we
-            // assume we're probably not really running in a MeeGo environment,
-            // so we just create the panel here (which is likely to just be
-            // a separate top-level window for testing).
-            panel = MeeGoPanel.Instance ?? new MeeGoPanel ();
-
-            if (panel == null) {
-                Log.Warning ("MeeGo extension initialized without a panel");
-                return;
-            }
-
-            panel.BuildContents ();
-
-            elements_service.PrimaryWindowClose = () => {
-                elements_service.PrimaryWindow.Hide ();
-                return true;
-            };
-
-            // Since the Panel is running, we don't actually ever want to quit!
-            Banshee.ServiceStack.Application.ShutdownRequested += () => {
-                elements_service.PrimaryWindow.Hide ();
-                return false;
-            };
-        }
-
-        public void PresentPrimaryInterface ()
-        {
-            elements_service.PrimaryWindow.Maximize ();
-            elements_service.PrimaryWindow.Present ();
-            if (panel != null) {
-                panel.Hide ();
-            }
-        }
-
-        public void Dispose ()
-        {
-            if (panel != null) {
-                panel.Dispose ();
-                panel = null;
-            }
-
-            interface_action_service = null;
-            elements_service = null;
-        }
-
-        string IService.ServiceName {
-            get { return "MeeGoService"; }
-        }
-    }
-}

=== removed directory '.pc/02_only-show-netbook-panel-on-request.patch'
=== removed directory '.pc/02_only-show-netbook-panel-on-request.patch/src'
=== removed directory '.pc/02_only-show-netbook-panel-on-request.patch/src/Extensions'
=== removed directory '.pc/02_only-show-netbook-panel-on-request.patch/src/Extensions/Banshee.MeeGo'
=== removed directory '.pc/02_only-show-netbook-panel-on-request.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo'
=== removed file '.pc/02_only-show-netbook-panel-on-request.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs'
--- .pc/02_only-show-netbook-panel-on-request.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs	2011-02-20 14:48:54 +0000
+++ .pc/02_only-show-netbook-panel-on-request.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs	1970-01-01 00:00:00 +0000
@@ -1,145 +0,0 @@
-//
-// MeeGoService.cs
-//
-// Authors:
-//   Aaron Bockover <[e-mail]>
-//
-// Copyright 2009-2010 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Gtk;
-using MeeGo.Panel;
-
-using Hyena;
-
-using Banshee.Base;
-using Banshee.Collection;
-using Banshee.Sources;
-using Banshee.ServiceStack;
-using Banshee.MediaEngine;
-using Banshee.Gui;
-
-namespace Banshee.MeeGo
-{
-    public class MeeGoService : IExtensionService
-    {
-        private GtkElementsService elements_service;
-        private InterfaceActionService interface_action_service;
-        private SourceManager source_manager;
-        private PlayerEngineService player;
-        private MeeGoPanel panel;
-
-        void IExtensionService.Initialize ()
-        {
-            elements_service = ServiceManager.Get<GtkElementsService> ();
-            interface_action_service = ServiceManager.Get<InterfaceActionService> ();
-            source_manager = ServiceManager.SourceManager;
-            player = ServiceManager.PlayerEngine;
-
-            if (!ServiceStartup ()) {
-                ServiceManager.ServiceStarted += OnServiceStarted;
-            }
-        }
-
-        private void OnServiceStarted (ServiceStartedArgs args)
-        {
-            if (args.Service is Banshee.Gui.InterfaceActionService) {
-                interface_action_service = (InterfaceActionService)args.Service;
-            } else if (args.Service is GtkElementsService) {
-                elements_service = (GtkElementsService)args.Service;
-            } else if (args.Service is SourceManager) {
-                source_manager = ServiceManager.SourceManager;
-            } else if (args.Service is PlayerEngineService) {
-                player = ServiceManager.PlayerEngine;
-            }
-
-            ServiceStartup ();
-        }
-
-        private bool ServiceStartup ()
-        {
-            if (elements_service == null || interface_action_service == null ||
-                source_manager == null || player == null) {
-                return false;
-            }
-
-            Initialize ();
-
-            ServiceManager.ServiceStarted -= OnServiceStarted;
-
-            return true;
-        }
-
-        private void Initialize ()
-        {
-            // If Banshee is running from the MeeGo client entry assembly,
-            // the MeeGoPanel will have already been created. If not, we
-            // assume we're probably not really running in a MeeGo environment,
-            // so we just create the panel here (which is likely to just be
-            // a separate top-level window for testing).
-            panel = MeeGoPanel.Instance ?? new MeeGoPanel ();
-
-            if (panel == null) {
-                Log.Warning ("Netbook extension initialized without a panel");
-                return;
-            }
-
-            panel.BuildContents ();
-
-            elements_service.PrimaryWindowClose = () => {
-                elements_service.PrimaryWindow.Hide ();
-                return true;
-            };
-
-            // Since the Panel is running, we don't actually ever want to quit!
-            Banshee.ServiceStack.Application.ShutdownRequested += () => {
-                elements_service.PrimaryWindow.Hide ();
-                return false;
-            };
-        }
-
-        public void PresentPrimaryInterface ()
-        {
-            elements_service.PrimaryWindow.Maximize ();
-            elements_service.PrimaryWindow.Present ();
-            if (panel != null) {
-                panel.Hide ();
-            }
-        }
-
-        public void Dispose ()
-        {
-            if (panel != null) {
-                panel.Dispose ();
-                panel = null;
-            }
-
-            interface_action_service = null;
-            elements_service = null;
-        }
-
-        string IService.ServiceName {
-            get { return "MeeGoService"; }
-        }
-    }
-}

=== removed directory '.pc/03_quit-only-on-explicit-shutdown-request.patch'
=== removed directory '.pc/03_quit-only-on-explicit-shutdown-request.patch/src'
=== removed directory '.pc/03_quit-only-on-explicit-shutdown-request.patch/src/Extensions'
=== removed directory '.pc/03_quit-only-on-explicit-shutdown-request.patch/src/Extensions/Banshee.MeeGo'
=== removed directory '.pc/03_quit-only-on-explicit-shutdown-request.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo'
=== removed file '.pc/03_quit-only-on-explicit-shutdown-request.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs'
--- .pc/03_quit-only-on-explicit-shutdown-request.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs	2011-02-20 14:48:54 +0000
+++ .pc/03_quit-only-on-explicit-shutdown-request.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs	1970-01-01 00:00:00 +0000
@@ -1,147 +0,0 @@
-//
-// MeeGoService.cs
-//
-// Authors:
-//   Aaron Bockover <[e-mail]>
-//
-// Copyright 2009-2010 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Gtk;
-using MeeGo.Panel;
-
-using Hyena;
-
-using Banshee.Base;
-using Banshee.Collection;
-using Banshee.Sources;
-using Banshee.ServiceStack;
-using Banshee.MediaEngine;
-using Banshee.Gui;
-
-namespace Banshee.MeeGo
-{
-    public class MeeGoService : IExtensionService
-    {
-        private GtkElementsService elements_service;
-        private InterfaceActionService interface_action_service;
-        private SourceManager source_manager;
-        private PlayerEngineService player;
-        private MeeGoPanel panel;
-
-        void IExtensionService.Initialize ()
-        {
-            elements_service = ServiceManager.Get<GtkElementsService> ();
-            interface_action_service = ServiceManager.Get<InterfaceActionService> ();
-            source_manager = ServiceManager.SourceManager;
-            player = ServiceManager.PlayerEngine;
-
-            if (!ServiceStartup ()) {
-                ServiceManager.ServiceStarted += OnServiceStarted;
-            }
-        }
-
-        private void OnServiceStarted (ServiceStartedArgs args)
-        {
-            if (args.Service is Banshee.Gui.InterfaceActionService) {
-                interface_action_service = (InterfaceActionService)args.Service;
-            } else if (args.Service is GtkElementsService) {
-                elements_service = (GtkElementsService)args.Service;
-            } else if (args.Service is SourceManager) {
-                source_manager = ServiceManager.SourceManager;
-            } else if (args.Service is PlayerEngineService) {
-                player = ServiceManager.PlayerEngine;
-            }
-
-            ServiceStartup ();
-        }
-
-        private bool ServiceStartup ()
-        {
-            if (elements_service == null || interface_action_service == null ||
-                source_manager == null || player == null) {
-                return false;
-            }
-
-            Initialize ();
-
-            ServiceManager.ServiceStarted -= OnServiceStarted;
-
-            return true;
-        }
-
-        private void Initialize ()
-        {
-            // If Banshee is running from the MeeGo client entry assembly,
-            // the MeeGoPanel will have already been created. If not, we
-            // assume we're probably not really running in a MeeGo environment,
-            // so we just create the panel here (which is likely to just be
-            // a separate top-level window for testing).
-            panel = MeeGoPanel.Instance;
-
-            if (panel == null) {
-                Log.Warning ("Netbook extension initialized without a panel");
-                return;
-            } else {
-                elements_service.PrimaryWindow.Hide ();
-            }
-
-            panel.BuildContents ();
-
-            elements_service.PrimaryWindowClose = () => {
-                elements_service.PrimaryWindow.Hide ();
-                return true;
-            };
-
-            // Since the Panel is running, we don't actually ever want to quit!
-            Banshee.ServiceStack.Application.ShutdownRequested += () => {
-                elements_service.PrimaryWindow.Hide ();
-                return false;
-            };
-        }
-
-        public void PresentPrimaryInterface ()
-        {
-            elements_service.PrimaryWindow.Maximize ();
-            elements_service.PrimaryWindow.Present ();
-            if (panel != null) {
-                panel.Hide ();
-            }
-        }
-
-        public void Dispose ()
-        {
-            if (panel != null) {
-                panel.Dispose ();
-                panel = null;
-            }
-
-            interface_action_service = null;
-            elements_service = null;
-        }
-
-        string IService.ServiceName {
-            get { return "MeeGoService"; }
-        }
-    }
-}

=== removed directory '.pc/04_enable-switching-between-the-2-interfaces.patch'
=== removed directory '.pc/04_enable-switching-between-the-2-interfaces.patch/src'
=== removed directory '.pc/04_enable-switching-between-the-2-interfaces.patch/src/Core'
=== removed directory '.pc/04_enable-switching-between-the-2-interfaces.patch/src/Core/Banshee.ThickClient'
=== removed directory '.pc/04_enable-switching-between-the-2-interfaces.patch/src/Core/Banshee.ThickClient/Resources'
=== removed file '.pc/04_enable-switching-between-the-2-interfaces.patch/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml'
--- .pc/04_enable-switching-between-the-2-interfaces.patch/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml	2011-02-20 14:48:54 +0000
+++ .pc/04_enable-switching-between-the-2-interfaces.patch/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml	1970-01-01 00:00:00 +0000
@@ -1,237 +0,0 @@
-<ui>
-  <toolbar name="HeaderToolbar">
-    <toolitem action="PreviousAction"/>
-    <toolitem action="PlayPauseAction"/>
-    <placeholder name="NextArrowButton"/>
-    <placeholder name="SeekSlider"/>
-    <placeholder name="TrackInfoDisplay"/>
-    <placeholder name="SourceActions">
-        <toolitem name="RefreshSmartPlaylist" action="RefreshSmartPlaylistAction"/>
-    </placeholder>
-    <placeholder name="SearchEntry"/>
-    <placeholder name="VolumeButton"/>
-    <placeholder name="ToolbarMenuPlaceholder"/>
-    <placeholder name="ClosePlaceholder"/>
-  </toolbar>
-  <toolbar name="FooterToolbar">
-    <placeholder name="TaskStatus"/>
-    <placeholder name="StatusBar"/>
-    <placeholder name="Extensions"/>
-    <placeholder name="RepeatButton"/>
-  </toolbar>
-
-  <popup name="ToolbarMenu" action="ToolbarMenuAction">
-    <menuitem name="NewPlaylist" action="NewPlaylistAction"/>
-    <menuitem name="NewSmartPlaylist" action="NewSmartPlaylistAction"/>
-    <separator/>
-    <menuitem name="Import" action="ImportAction"/>
-    <menuitem name="ImportPlaylist" action="ImportPlaylistAction"/>
-    <menuitem name="OpenLocation" action="OpenLocationAction"/>
-    <separator/>
-    <placeholder name="BelowOpenLocation"/>
-    <separator/>
-    <menu name="ToolsMenu" action="ToolsMenuAction">
-      <menuitem name="Rescan" action="RescanAction"/>
-      <menuitem name="ShowEqualizer" action="ShowEqualizerAction"/>
-    </menu>
-    <menuitem name="Preferences" action="PreferencesAction"/>
-    <menuitem name="About" action="AboutAction"/>
-  </popup>
-
-  <menubar name="MainMenu" action="MainMenuAction">
-    <menu name="MediaMenu" action="MediaMenuAction">
-      <menuitem name="NewPlaylist" action="NewPlaylistAction"/>
-      <menuitem name="NewSmartPlaylist" action="NewSmartPlaylistAction"/>
-      <!--<menuitem name="NewSmartPlaylistFromSearch" action="NewSmartPlaylistFromSearchAction"/>-->
-      <separator/>
-      <menuitem name="Import" action="ImportAction"/>
-      <menuitem name="ImportPlaylist" action="ImportPlaylistAction"/>
-      <menuitem name="OpenLocation" action="OpenLocationAction"/>
-      <menuitem action="OpenSourceSwitcher"/>
-      <separator/>
-      <placeholder name="BelowOpenLocation"/>
-      <separator/>
-      <placeholder name="ClosePlaceholder"/>
-      <menuitem name="Quit" action="QuitAction"/>
-    </menu>
-
-    <menu name="EditMenu" action="EditMenuAction">
-      <placeholder name="AboveAddToPlaylist"/>
-      <menu name="AddToPlaylist" action="AddToPlaylistAction"></menu>
-      <placeholder name="BelowAddToPlaylist"/>
-      <menuitem name="TrackEditor" action="TrackEditorAction"/>
-      <separator/>
-      <menuitem name="SelectAll" action="SelectAllAction"/>
-      <menuitem name="SelectNone" action="SelectNoneAction"/>
-      <separator/>
-      <menuitem name="RemoveTracks" action="RemoveTracksAction"/>
-      <menuitem name="RemoveTracksFromLibrary" action="RemoveTracksFromLibraryAction"/>
-      <menuitem name="DeleteTracksFromDrive" action="DeleteTracksFromDriveAction"/>
-      <separator/>
-      <menuitem name="OpenContainingFolder" action="OpenContainingFolderAction"/>
-      <separator/>
-      <menuitem name="RenameSource" action="RenameSourceAction"/>
-      <menuitem name="RefreshSmartPlaylist" action="RefreshSmartPlaylistAction"/>
-      <menuitem name="ExportPlaylist" action="ExportPlaylistAction"/>
-      <menuitem name="SourceProperties" action="SourcePropertiesAction"/>
-      <menuitem name="UnmapSource" action="UnmapSourceAction"/>
-      <menuitem name="TrackProperties" action="TrackPropertiesAction"/>
-      <separator/>
-      <menuitem name="Preferences" action="PreferencesAction"/>
-    </menu>
-
-    <menu name="ViewMenu" action="ViewMenuAction">
-      <placeholder name="BrowserViews"/>
-      <placeholder name="ViewMenuAdditions"/>
-      <menuitem name="ShowCoverArt" action="ShowCoverArtAction"/>
-      <menuitem name="ShowContextPane" action="ShowContextPaneAction"/>
-      <menuitem name="FullScreen" action="FullScreenAction"/>
-      <separator/>
-      <menuitem name="ShowEqualizer" action="ShowEqualizerAction"/>
-    </menu>
-
-    <menu name="PlaybackMenu" action="PlaybackMenuAction">
-      <menuitem name="PlayPause" action="PlayPauseAction"/>
-      <menuitem name="StopWhenFinished" action="StopWhenFinishedAction"/>
-      <separator/>
-      <menuitem name="Next" action="NextAction"/>
-      <menuitem name="Previous" action="PreviousAction"/>
-      <separator/>
-      <!--
-      <menuitem name="SeekBackward" action="SeekBackwardAction"/>
-      <menuitem name="SeekForward" action="SeekForwardAction"/>
-      -->
-      <menuitem name="SeekTo" action="SeekToAction"/>
-      <menuitem name="JumpToPlayingTrack" action="JumpToPlayingTrackAction"/>
-      <menuitem name="RestartSong" action="RestartSongAction"/>
-      <separator/>
-      <placeholder name="PlaybackMenuAdditions"/>
-      <menuitem name="RepeatMenu" action="RepeatMenuAction"/>
-      <menuitem name="ShuffleMenu" action="ShuffleMenuAction"/>
-      <menuitem name="SubtitleMenu" action="SubtitleMenuAction"/>
-    </menu>
-    
-    <menu name="ToolsMenu" action="ToolsMenuAction">
-      <menuitem name="Rescan" action="RescanAction"/>
-    </menu>
-
-    <menu name="HelpMenu" action="HelpMenuAction">
-      <menuitem action="UserHelp"/>
-      <separator/>
-      <menuitem name="Wiki" action="WikiAction"/>
-      <menuitem name="WikiDeveloper" action="WikiDeveloperAction"/>
-      <separator/>
-      <menuitem name="VersionInformation" action="VersionInformationAction"/>
-      <menuitem name="About" action="AboutAction"/>
-    </menu>
-  </menubar>
-
-  <popup name="LibraryContextMenu" action="LibraryContextMenuAction">
-    <menuitem name="NewPlaylist" action="NewPlaylistAction"/>
-    <menuitem name="NewSmartPlaylist" action="NewSmartPlaylistAction"/>
-    <menu name="SortChildren" action="SortChildrenAction" />
-    <separator/>
-    <menuitem name="Import" action="ImportAction"/>
-    <menuitem name="SourcePreferences" action="SourcePreferencesAction"/>
-    <separator/>
-  </popup>
-
-  <popup name="RemovableSourceContextMenu" action="RemovableSourceContextMenuAction">
-    <menuitem name="NewPlaylist" action="NewPlaylistAction"/>
-    <menuitem name="NewSmartPlaylist" action="NewSmartPlaylistAction"/>
-    <menu name="SortChildren" action="SortChildrenAction" />
-    <separator/>
-    <placeholder name="AboveImportSource"/>
-    <menuitem name="ImportSource" action="ImportSourceAction"/>
-    <menuitem name="RenameSource" action="RenameSourceAction"/>
-    <menuitem name="SourcePreferences" action="SourcePreferencesAction"/>
-    <menuitem name="UnmapSource" action="UnmapSourceAction"/>
-    <separator/>
-    <menuitem name="SourceProperties" action="SourcePropertiesAction"/>
-  </popup>
-
-  <popup name="ErrorSourceContextMenu" action="ErrorSourceContextMenuAction">
-    <menuitem name="UnmapSource" action="UnmapSourceAction"/>
-  </popup>
-
-  <popup name="SourceContextMenu" action="SourceContextMenuAction">
-    <menuitem name="ImportSource" action="ImportSourceAction"/>
-    <separator/>
-    <menuitem name="RenameSource" action="RenameSourceAction"/>
-    <menuitem name="RefreshSmartPlaylist" action="RefreshSmartPlaylistAction"/>
-    <menuitem name="ExportPlaylist" action="ExportPlaylistAction"/>
-    <menuitem name="UnmapSource" action="UnmapSourceAction"/>
-    <separator/>
-    <menuitem name="SourceProperties" action="SourcePropertiesAction"/>
-    <menuitem name="SourcePreferences" action="SourcePreferencesAction"/>
-  </popup>
-
-  <popup name="TrackContextMenu" action="TrackContextMenuAction">
-    <menuitem action="PlayTrack"/>
-    <separator/>
-    <placeholder name="AboveAddToPlaylist"/>
-    <menu name="AddToPlaylist" action="AddToPlaylistAction"></menu>
-    <placeholder name="BelowAddToPlaylist"/>
-    <separator/>
-    <menuitem name="RemoveTracks" action="RemoveTracksAction"/>
-    <menuitem name="RemoveTracksFromLibrary" action="RemoveTracksFromLibraryAction"/>
-    <menuitem name="DeleteTracksFromDrive" action="DeleteTracksFromDriveAction"/>
-    <separator/>
-    <menuitem name="OpenContainingFolder" action="OpenContainingFolderAction"/>
-    <menu name="SearchMenu" action="SearchMenuAction">
-      <menuitem name="SearchForSameArtist" action="SearchForSameArtistAction"/>
-      <menuitem name="SearchForSameAlbum" action="SearchForSameAlbumAction"/>
-    </menu>
-    <separator/>
-    <placeholder name="AboveTrackProperties"/>
-    <menuitem name="TrackProperties" action="TrackPropertiesAction"/>
-    <menuitem name="TrackEditor" action="TrackEditorAction"/>
-  </popup>
-</ui>
-
-<!--<menubar name="MainMenu">
-<menu name="MusicMenu" action="MusicMenuAction">
-  <menuitem name="NewCD" action="NewCDAction"/>
-  <placeholder name="NewMusicMenuAdditions"/>
-  /*<menuitem name="ImportFolder" action="ImportFolderAction"/>
-  <menuitem name="ImportFiles" action="ImportFilesAction"/>*/
-  <separator/>
-  <menuitem name="ImportMusic" action="ImportMusicAction"/>
-  <menuitem name="OpenLocation" action="OpenLocationAction"/>
-  <placeholder name="MusicMenuAdditions"/>
-  <separator/>
-  <menuitem name="ImportSource" action="ImportSourceAction"/>
-  <menuitem name="WriteCD" action="WriteCDAction"/>
-  <separator/>
-  <menuitem name="SyncDap" action="SyncDapAction"/>
-</menu>
-<menu name="EditMenu" action="EditMenuAction">
-  <menuitem name="CopySongs" action="CopySongsAction"/>
-  <separator/>
-  <menuitem name="RemoveSongs" action="RemoveSongsAction"/>
-  <menuitem name="DeleteSongsFromDrive" action="DeleteSongsFromDriveAction"/>
-  <menuitem name="RenameSource" action="RenameSourceAction"/>
-  <menuitem name="UnmapSource" action="UnmapSourceAction"/>
-  <separator/>
-  <menuitem name="SelectAll" action="SelectAllAction"/>
-  <menuitem name="SelectNone" action="SelectNoneAction"/>
-  <separator/>
-  <menuitem name="Properties" action="PropertiesAction"/>
-  <menuitem name="SelectedSourceProperties" action="SelectedSourcePropertiesAction"/>
-  <separator/>
-  <menuitem name="Plugins" action="PluginsAction"/>
-  <menuitem name="Preferences" action="PreferencesAction"/>
-</menu>
-
-<menu name="ToolsMenu" action="ToolsMenuAction">
-  <menuitem name="Scripts" action="ScriptsAction"/>
-</menu>
-
- 
-<menu name="DebugMenu" action="DebugMenuAction">
-  
-  <menuitem name="LoggedEvents" action="LoggedEventsAction"/>
-</menu>
-</menubar>
-<popup name="SongViewPopup" action="SongViewPopupAction">
-</popup>-->

=== removed directory '.pc/04_enable-switching-between-the-2-interfaces.patch/src/Extensions'
=== removed directory '.pc/04_enable-switching-between-the-2-interfaces.patch/src/Extensions/Banshee.MeeGo'
=== removed directory '.pc/04_enable-switching-between-the-2-interfaces.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo'
=== removed file '.pc/04_enable-switching-between-the-2-interfaces.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs'
--- .pc/04_enable-switching-between-the-2-interfaces.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs	2011-02-20 14:48:54 +0000
+++ .pc/04_enable-switching-between-the-2-interfaces.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs	1970-01-01 00:00:00 +0000
@@ -1,113 +0,0 @@
-//
-// MeeGoPanel.cs
-//
-// Author:
-//   Aaron Bockover <[e-mail]>
-//
-// Copyright 2009-2010 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using Mono.Unix;
-
-using Gtk;
-using MeeGo.Panel;
-
-using Hyena;
-using Banshee.Base;
-using Banshee.ServiceStack;
-
-namespace Banshee.MeeGo
-{
-    public class MeeGoPanel : IDisposable
-    {
-        public static MeeGoPanel Instance { get; private set; }
-
-        private PanelGtk embedded_panel;
-        private Window window_panel;
-
-        public MediaPanelContents Contents { get; private set; }
-
-        public MeeGoPanel ()
-        {
-            if (Instance != null) {
-                throw new InvalidOperationException ("Only one Netbook Panel (MeegoPanel) instance should exist");
-            }
-
-            Instance = this;
-
-            var timer = Log.DebugTimerStart ();
-
-            try {
-                Log.Debug ("Attempting to create Netbook toolbar panel");
-                embedded_panel = new PanelGtk ("banshee", Catalog.GetString ("media"),
-                    null, "media-button", true);
-                embedded_panel.ShowBeginEvent += (o, e) => {
-                    ServiceManager.SourceManager.SetActiveSource (ServiceManager.SourceManager.MusicLibrary);
-                    if (Contents != null) {
-                        Contents.SyncSearchEntry ();
-                    }
-                };
-                while (Gtk.Application.EventsPending ()) {
-                    Gtk.Application.RunIteration ();
-                }
-            } catch (Exception e) {
-                if (!(e is DllNotFoundException)) {
-                    Log.Exception ("Could not bind to Netbook panel", e);
-                }
-                window_panel = new Gtk.Window ("Netbook Media Panel");
-            }
-
-            Log.DebugTimerPrint (timer, "Netbook panel created: {0}");
-        }
-
-        public void Dispose ()
-        {
-        }
-
-        public void BuildContents ()
-        {
-            var timer = Log.DebugTimerStart ();
-            Contents = new MediaPanelContents ();
-            Contents.ShowAll ();
-            Log.DebugTimerPrint (timer, "Netbook panel contents created: {0}");
-
-            if (embedded_panel != null) {
-                embedded_panel.SetChild (Contents);
-            } else if (window_panel != null) {
-                window_panel.Add (Contents);
-                window_panel.SetDefaultSize (1000, 500);
-                window_panel.WindowPosition = WindowPosition.Center;
-                window_panel.Show ();
-                GLib.Timeout.Add (1000, () => {
-                    window_panel.Present ();
-                    return false;
-                });
-            }
-        }
-
-        public void Hide ()
-        {
-            if (embedded_panel != null) {
-                embedded_panel.Hide ();
-            }
-        }
-    }
-}

=== removed file '.pc/04_enable-switching-between-the-2-interfaces.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs'
--- .pc/04_enable-switching-between-the-2-interfaces.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs	2011-02-20 14:48:54 +0000
+++ .pc/04_enable-switching-between-the-2-interfaces.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs	1970-01-01 00:00:00 +0000
@@ -1,142 +0,0 @@
-//
-// MeeGoService.cs
-//
-// Authors:
-//   Aaron Bockover <[e-mail]>
-//
-// Copyright 2009-2010 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Gtk;
-using MeeGo.Panel;
-
-using Hyena;
-
-using Banshee.Base;
-using Banshee.Collection;
-using Banshee.Sources;
-using Banshee.ServiceStack;
-using Banshee.MediaEngine;
-using Banshee.Gui;
-
-namespace Banshee.MeeGo
-{
-    public class MeeGoService : IExtensionService
-    {
-        private GtkElementsService elements_service;
-        private InterfaceActionService interface_action_service;
-        private SourceManager source_manager;
-        private PlayerEngineService player;
-        private MeeGoPanel panel;
-
-        void IExtensionService.Initialize ()
-        {
-            elements_service = ServiceManager.Get<GtkElementsService> ();
-            interface_action_service = ServiceManager.Get<InterfaceActionService> ();
-            source_manager = ServiceManager.SourceManager;
-            player = ServiceManager.PlayerEngine;
-
-            if (!ServiceStartup ()) {
-                ServiceManager.ServiceStarted += OnServiceStarted;
-            }
-        }
-
-        private void OnServiceStarted (ServiceStartedArgs args)
-        {
-            if (args.Service is Banshee.Gui.InterfaceActionService) {
-                interface_action_service = (InterfaceActionService)args.Service;
-            } else if (args.Service is GtkElementsService) {
-                elements_service = (GtkElementsService)args.Service;
-            } else if (args.Service is SourceManager) {
-                source_manager = ServiceManager.SourceManager;
-            } else if (args.Service is PlayerEngineService) {
-                player = ServiceManager.PlayerEngine;
-            }
-
-            ServiceStartup ();
-        }
-
-        private bool ServiceStartup ()
-        {
-            if (elements_service == null || interface_action_service == null ||
-                source_manager == null || player == null) {
-                return false;
-            }
-
-            Initialize ();
-
-            ServiceManager.ServiceStarted -= OnServiceStarted;
-
-            return true;
-        }
-
-        private void Initialize ()
-        {
-            // If Banshee is running from the MeeGo client entry assembly,
-            // the MeeGoPanel will have already been created. If not, we
-            // assume we're probably not really running in a MeeGo environment,
-            // so we just create the panel here (which is likely to just be
-            // a separate top-level window for testing).
-            panel = MeeGoPanel.Instance;
-
-            if (panel == null) {
-                Log.Warning ("Netbook extension initialized without a panel");
-                return;
-            } else {
-                elements_service.PrimaryWindow.Hide ();
-            }
-
-            panel.BuildContents ();
-
-            elements_service.PrimaryWindowClose = () => {
-                elements_service.PrimaryWindow.Hide ();
-                return true;
-            };
-
-        }
-
-        public void PresentPrimaryInterface ()
-        {
-            elements_service.PrimaryWindow.Maximize ();
-            elements_service.PrimaryWindow.Present ();
-            if (panel != null) {
-                panel.Hide ();
-            }
-        }
-
-        public void Dispose ()
-        {
-            if (panel != null) {
-                panel.Dispose ();
-                panel = null;
-            }
-
-            interface_action_service = null;
-            elements_service = null;
-        }
-
-        string IService.ServiceName {
-            get { return "MeeGoService"; }
-        }
-    }
-}

=== removed directory '.pc/05_show-a-empty-library-message-in-banshee.patch'
=== removed directory '.pc/05_show-a-empty-library-message-in-banshee.patch/src'
=== removed directory '.pc/05_show-a-empty-library-message-in-banshee.patch/src/Core'
=== removed directory '.pc/05_show-a-empty-library-message-in-banshee.patch/src/Core/Banshee.Services'
=== removed directory '.pc/05_show-a-empty-library-message-in-banshee.patch/src/Core/Banshee.Services/Banshee.Library'
=== removed file '.pc/05_show-a-empty-library-message-in-banshee.patch/src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs'
--- .pc/05_show-a-empty-library-message-in-banshee.patch/src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs	2011-02-20 14:48:54 +0000
+++ .pc/05_show-a-empty-library-message-in-banshee.patch/src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs	1970-01-01 00:00:00 +0000
@@ -1,174 +0,0 @@
-//
-// MusicLibrarySource.cs
-//
-// Authors:
-//   Aaron Bockover <[e-mail]>
-//   Gabriel Burt <[e-mail]>
-//
-// Copyright (C) 2005-2008 Novell, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-
-using Mono.Unix;
-
-using Banshee.Base;
-using Banshee.Collection;
-using Banshee.Query;
-using Banshee.SmartPlaylist;
-using Banshee.Preferences;
-using Banshee.Configuration;
-using Banshee.Configuration.Schema;
-
-namespace Banshee.Library
-{
-    public class MusicLibrarySource : LibrarySource
-    {
-        private static PathPattern music_filename_pattern = new MusicFileNamePattern ();
-        public static PathPattern MusicFileNamePattern {
-            get { return music_filename_pattern; }
-        }
-
-        static MusicLibrarySource ()
-        {
-            music_filename_pattern.FolderSchema = LibrarySchema.FolderPattern;
-            music_filename_pattern.FileSchema   = LibrarySchema.FilePattern;
-            Banshee.Base.FileNamePattern.MusicPattern = music_filename_pattern;
-        }
-
-        // Catalog.GetString ("Music Library")
-        public MusicLibrarySource () : base (Catalog.GetString ("Music"), "Library", 40)
-        {
-            MediaTypes = TrackMediaAttributes.Music | TrackMediaAttributes.AudioStream;
-            NotMediaTypes = TrackMediaAttributes.Podcast | TrackMediaAttributes.VideoStream | TrackMediaAttributes.AudioBook;
-            Properties.SetStringList ("Icon.Name", "audio-x-generic", "source-library");
-
-            Properties.Set<string> ("SearchEntryDescription", Catalog.GetString ("Search your music"));
-
-            // Migrate the old library-location schema, if necessary
-            if (DatabaseConfigurationClient.Client.Get<int> ("MusicLibraryLocationMigrated", 0) != 1) {
-                string old_location = OldLocationSchema.Get ();
-                if (!String.IsNullOrEmpty (old_location)) {
-                    BaseDirectory = old_location;
-                }
-                DatabaseConfigurationClient.Client.Set<int> ("MusicLibraryLocationMigrated", 1);
-            }
-
-            SetFileNamePattern (MusicFileNamePattern);
-
-            Section misc = PreferencesPage.Add (new Section ("misc",
-                Catalog.GetString ("Miscellaneous"), 10));
-
-            misc.Add (new SchemaPreference<bool> (LibrarySchema.SortByAlbumYear,
-                Catalog.GetString ("_Sort an artist's albums by year, not title"), null,
-                delegate {
-                    DatabaseTrackModel.Resort ();
-                    DatabaseTrackModel.Reload ();
-                }
-            ));
-        }
-
-        public override string GetPluralItemCountString (int count)
-        {
-            return Catalog.GetPluralString ("{0} song", "{0} songs", count);
-        }
-
-        public static string GetDefaultBaseDirectory ()
-        {
-            return Hyena.XdgBaseDirectorySpec.GetXdgDirectoryUnderHome ("XDG_MUSIC_DIR", "Music");
-        }
-
-        public override string DefaultBaseDirectory {
-            get { return GetDefaultBaseDirectory (); }
-        }
-
-        public override IEnumerable<SmartPlaylistDefinition> DefaultSmartPlaylists {
-            get { return default_smart_playlists; }
-        }
-
-        public override IEnumerable<SmartPlaylistDefinition> NonDefaultSmartPlaylists {
-            get { return non_default_smart_playlists; }
-        }
-
-        protected override string SectionName {
-            get { return Catalog.GetString ("Music Folder"); }
-        }
-
-        private static SmartPlaylistDefinition [] default_smart_playlists = new SmartPlaylistDefinition [] {
-            new SmartPlaylistDefinition (
-                Catalog.GetString ("Favorites"),
-                Catalog.GetString ("Songs rated four and five stars"),
-                "rating>=4", true),
-
-            new SmartPlaylistDefinition (
-                Catalog.GetString ("Recent Favorites"),
-                Catalog.GetString ("Songs listened to often in the past week"),
-                "played<\"1 week ago\" playcount>3", true),
-
-            new SmartPlaylistDefinition (
-                Catalog.GetString ("Recently Added"),
-                Catalog.GetString ("Songs imported within the last week"),
-                "added<\"1 week ago\"", true) { Order = BansheeQuery.FindOrder (BansheeQuery.DateAddedField, false) },
-
-            new SmartPlaylistDefinition (
-                Catalog.GetString ("Recently Played"),
-                Catalog.GetString ("Recently played songs"),
-                "played<\"2 weeks ago\" plays>0", true) { Order = BansheeQuery.FindOrder (BansheeQuery.LastPlayedField, false) },
-
-            new SmartPlaylistDefinition (
-                Catalog.GetString ("Unheard"),
-                Catalog.GetString ("Songs that have not been played or skipped"),
-                "playcount:0 skips:0", true),
-        };
-
-        private static SmartPlaylistDefinition [] non_default_smart_playlists = new SmartPlaylistDefinition [] {
-
-            new SmartPlaylistDefinition (
-                Catalog.GetString ("Neglected Favorites"),
-                Catalog.GetString ("Favorites not played in over two months"),
-                "rating>=4 played>=\"2 months ago\""),
-
-            new SmartPlaylistDefinition (
-                Catalog.GetString ("Least Favorite"),
-                Catalog.GetString ("Songs rated one or two stars or that you have frequently skipped"),
-                "rating<3 or skips>4"),
-
-            new SmartPlaylistDefinition (
-                Catalog.GetString ("700 MB of Favorites"),
-                Catalog.GetString ("A data CD worth of favorite songs"),
-                "rating>=4",
-                700, "MB", "PlayCount-DESC"),
-
-            new SmartPlaylistDefinition (
-                Catalog.GetString ("80 Minutes of Favorites"),
-                Catalog.GetString ("An audio CD worth of favorite songs"),
-                "rating>=4",
-                80, "minutes", "PlayCount-DESC"),
-
-            new SmartPlaylistDefinition (
-                Catalog.GetString ("Unrated"),
-                Catalog.GetString ("Songs that haven't been rated"),
-                "rating=0"),
-        };
-    }
-}

=== removed directory '.pc/05_show-a-empty-library-message-in-banshee.patch/src/Extensions'
=== removed directory '.pc/05_show-a-empty-library-message-in-banshee.patch/src/Extensions/Banshee.MeeGo'
=== removed directory '.pc/05_show-a-empty-library-message-in-banshee.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo'
=== removed file '.pc/05_show-a-empty-library-message-in-banshee.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs'
--- .pc/05_show-a-empty-library-message-in-banshee.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs	2011-02-20 14:48:54 +0000
+++ .pc/05_show-a-empty-library-message-in-banshee.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs	1970-01-01 00:00:00 +0000
@@ -1,412 +0,0 @@
-//
-// MediaPanelContents.cs
-// 
-// Author:
-//   Aaron Bockover <[e-mail]>
-// 
-// Copyright 2010 Novell, Inc.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-
-using Mono.Unix;
-using Gtk;
-
-using Hyena;
-using Hyena.Data;
-using Hyena.Gui;
-using Hyena.Data.Gui;
-
-using Banshee.ServiceStack;
-using Banshee.Sources;
-using Banshee.Sources.Gui;
-using Banshee.Collection;
-using Banshee.Collection.Gui;
-using Banshee.MediaEngine;
-using Banshee.Gui;
-using Banshee.Gui.Widgets;
-
-namespace Banshee.MeeGo
-{
-    public class MediaPanelContents : Table, ITrackModelSourceContents
-    {
-        private ArtistListView artist_view;
-        private AlbumListView album_view;
-        private TerseTrackListView track_view;
-
-        private SourceComboBox source_combo_box;
-        private SearchEntry search_entry;
-        private MeeGoTrackInfoDisplay track_info_display;
-
-        private ISource source;
-        private Dictionary<object, double> model_positions = new Dictionary<object, double> ();
-
-        protected MediaPanelContents (IntPtr raw) : base (raw)
-        {
-        }
-
-        public MediaPanelContents () : base (2, 2, false)
-        {
-            BorderWidth = 5;
-            RowSpacing = 6;
-            ColumnSpacing = 7;
-            RedrawOnAllocate = true;
-            AppPaintable = true;
-
-            BuildHeader ();
-            BuildLibrary ();
-            BuildNowPlaying ();
-            ConnectEvents ();
-
-            SetSource (ServiceManager.SourceManager.ActiveSource);
-        }
-
-        private void ConnectEvents ()
-        {
-            ServiceManager.SourceManager.ActiveSourceChanged += OnActiveSourceChanged;
-
-            ServiceManager.Get<InterfaceActionService> ().TrackActions ["SearchForSameArtistAction"].Activated += OnProgrammaticSearch;
-            ServiceManager.Get<InterfaceActionService> ().TrackActions ["SearchForSameAlbumAction"].Activated += OnProgrammaticSearch;
-
-            ServiceManager.PlayerEngine.ConnectEvent ((args) => track_info_display.Visible =
-                ServiceManager.PlayerEngine.CurrentState != PlayerState.Idle,
-                PlayerEvent.StateChange | PlayerEvent.StartOfStream);
-
-            source_combo_box.Model.Filter = (source) =>
-                source == ServiceManager.SourceManager.MusicLibrary ||
-                source.Parent == ServiceManager.SourceManager.MusicLibrary ||
-                source.GetType ().FullName == "Banshee.PlayQueue.PlayQueueSource";
-            source_combo_box.Model.Refresh ();
-            source_combo_box.UpdateActiveSource ();
-
-            search_entry.Changed += OnSearchEntryChanged;
-
-            artist_view.SelectionProxy.Changed += OnBrowserViewSelectionChanged;
-            album_view.SelectionProxy.Changed += OnBrowserViewSelectionChanged;
-        }
-
-#region UI Construction
-
-        private void BuildHeader ()
-        {
-            Attach (new Label {
-                    Markup = String.Format ("<span font_desc=\"Droid Sans Bold\" " +
-                        "size=\"x-large\" foreground=\"#606eff\">{0}</span>",
-                        GLib.Markup.EscapeText (Catalog.GetString ("Media"))),
-                    Xalign = 0.0f
-                },
-                0, 2, 0, 1,
-                AttachOptions.Fill | AttachOptions.Expand,
-                AttachOptions.Shrink, 12, 0);
-        }
-
-        private void BuildLibrary ()
-        {
-            var box = new MeeGoHeaderBox () { Title = Catalog.GetString ("Library") };
-
-            // Build the Library Header
-            var header = new HBox () {
-                Spacing = 5,
-                BorderWidth = 5
-            };
-
-            var app_button = new Button (new Image () {
-                IconSize = (int)IconSize.LargeToolbar,
-                IconName = "media-player-banshee"
-            }) {
-                TooltipText = Catalog.GetString ("Launch the Banshee Media Player")
-            };
-            app_button.Clicked += (o, e) => {
-                ServiceManager.SourceManager.SetActiveSource (ServiceManager.SourceManager.MusicLibrary);
-                ServiceManager.Get<MeeGoService> ().PresentPrimaryInterface ();
-            };
-
-            header.PackStart (source_combo_box = new SourceComboBox (), false, false, 0);
-            header.PackStart (app_button, false, false, 0);
-            header.PackStart (search_entry = new SearchEntry (), true, true, 0);
-            box.PackStartHighlighted (header, false, false, 0, MeeGoHeaderBox.HighlightFlags.Background);
-
-            // Build the Library Views
-            var views = new HBox () { Spacing = 5 };
-            views.PackStart (SetupView (artist_view = new ArtistListView () {
-                    Name = "meego-panel-artists",
-                    WidthRequest = 150,
-                    DoNotRenderNullModel = true
-                }), false, false, 0);
-            views.PackStart (SetupView (album_view = new AlbumListView () {
-                    Name = "meego-panel-albums",
-                    DoNotRenderNullModel = true
-                }), true, true, 0);
-            box.PackStart (views, true, true, 0);
-
-            Attach (box, 0, 1, 1, 2,
-                AttachOptions.Expand | AttachOptions.Fill,
-                AttachOptions.Expand | AttachOptions.Fill,
-                0, 0);
-        }
-
-        private void BuildNowPlaying ()
-        {
-            var box = new MeeGoHeaderBox () { Title = Catalog.GetString ("Now Playing") };
-
-            var seek_slider = new ConnectedSeekSlider (SeekSliderLayout.Horizontal);
-            seek_slider.StreamPositionLabel.FormatString = "<small>{0}</small>";
-
-            track_info_display = new MeeGoTrackInfoDisplay () {
-                HeightRequest = 64,
-                NoShowAll = true
-            };
-
-            track_view = new TerseTrackListView () {
-                Name = "meego-panel-tracks",
-                WidthRequest = 220
-            };
-            track_view.ColumnController.Insert (new Column (null, "indicator",
-                new ColumnCellStatusIndicator (null), 0.05, true, 20, 20), 0);
-
-            box.PackStartHighlighted (track_info_display, false, false, 0, MeeGoHeaderBox.HighlightFlags.Background);
-            box.PackStartHighlighted (seek_slider, false, false, 0, MeeGoHeaderBox.HighlightFlags.Background);
-            box.PackStart (SetupView (track_view), true, true, 0);
-            box.PackStartHighlighted (new PlaybackBox (), false, false, 0, MeeGoHeaderBox.HighlightFlags.TopLine);
-
-            Attach (box, 1, 2, 1, 2,
-                AttachOptions.Shrink,
-                AttachOptions.Expand | AttachOptions.Fill,
-                0, 0);
-        }
-
-        private ScrolledWindow SetupView (Widget view)
-        {
-            var scrolled = new ScrolledWindow () {
-                VscrollbarPolicy = PolicyType.Automatic,
-                HscrollbarPolicy = PolicyType.Never,
-                ShadowType = ShadowType.None
-            };
-            scrolled.Add (view);
-            return scrolled;
-        }
-
-#endregion
-
-#region Background Rendering
-
-        protected override void OnParentSet (Widget previous)
-        {
-            base.OnParentSet (previous);
-
-            if (Parent != null) {
-                Parent.ModifyBg (StateType.Normal, Style.White);
-            }
-        }
-
-        protected override bool OnExposeEvent (Gdk.EventExpose evnt)
-        {
-            if (!Visible || !IsMapped) {
-                return true;
-            }
-
-            RenderBackground (evnt.Window, evnt.Region);
-            foreach (var child in Children) {
-                PropagateExpose (child, evnt);
-            }
-
-            return true;
-        }
-
-        private void RenderBackground (Gdk.Window window, Gdk.Region region)
-        {
-            var cr = Gdk.CairoHelper.Create (window);
-
-            var grad = new Cairo.LinearGradient (0, 0, 0, Allocation.Height);
-            grad.AddColorStop (0, CairoExtensions.RgbToColor (0xffffff));
-            grad.AddColorStop (1, CairoExtensions.RgbToColor (0xc3c3c3));
-            cr.Pattern = grad;
-            cr.Rectangle (0, 0, Allocation.Width, Allocation.Height);
-            cr.Fill ();
-            grad.Destroy ();
-
-            CairoExtensions.DisposeContext (cr);
-        }
-
-#endregion
-
-#region Event Handlers
-
-        private void OnProgrammaticSearch (object o, EventArgs args)
-        {
-            Source source = ServiceManager.SourceManager.ActiveSource;
-            search_entry.Ready = false;
-            search_entry.Query = source.FilterQuery;
-            search_entry.Ready = true;
-        }
-
-        private void OnBrowserViewSelectionChanged (object o, EventArgs args)
-        {
-            // Scroll the raising filter view to the top if "all" is selected
-            var selection = (Hyena.Collections.Selection)o;
-            if (!selection.AllSelected) {
-                return;
-            }
-
-            if (artist_view.Selection == selection) {
-                artist_view.ScrollTo (0);
-            } else if (album_view.Selection == selection) {
-                album_view.ScrollTo (0);
-            }
-        }
-
-        private void OnSearchEntryChanged (object o, EventArgs args)
-        {
-            var source = ServiceManager.SourceManager.ActiveSource;
-            if (source == null) {
-                return;
-            }
-
-            source.FilterType = (TrackFilterType)search_entry.ActiveFilterID;
-            source.FilterQuery = search_entry.Query;
-        }
-
-        private void OnActiveSourceChanged (SourceEventArgs args)
-        {
-            ThreadAssist.ProxyToMain (delegate {
-                var source = ServiceManager.SourceManager.ActiveSource;
-
-                search_entry.Ready = false;
-                search_entry.CancelSearch ();
-                search_entry.SearchSensitive = source != null && source.CanSearch;
-
-                if (source != null && source.FilterQuery != null) {
-                    search_entry.Query = source.FilterQuery;
-                    search_entry.ActivateFilter ((int)source.FilterType);
-                }
-
-                ResetSource ();
-                SetSource (source);
-
-                search_entry.Ready = true;
-            });
-        }
-
-        internal void SyncSearchEntry ()
-        {
-            OnActiveSourceChanged (null);
-        }
-
-#endregion
-
-#region View<->Model binding
-
-        private void SetModel<T> (IListModel<T> model)
-        {
-            ListView<T> view = FindListView <T> ();
-            if (view != null) {
-                SetModel (view, model);
-            } else {
-                Hyena.Log.DebugFormat ("Unable to find view for model {0}", model);
-            }
-        }
-
-        private void SetModel<T> (ListView<T> view, IListModel<T> model)
-        {
-            if (view.Model != null) {
-                model_positions[view.Model] = view.Vadjustment.Value;
-            }
-
-            if (model == null) {
-                view.SetModel (null);
-                return;
-            }
-
-            if (!model_positions.ContainsKey (model)) {
-                model_positions[model] = 0.0;
-            }
-
-            view.SetModel (model, model_positions[model]);
-        }
-
-        private ListView<T> FindListView<T> ()
-        {
-            foreach (var view in new IListView [] { artist_view, album_view, track_view }) {
-                if (view is ListView<T>) {
-                    return (ListView<T>)view;
-                }
-            }
-            return null;
-        }
-
-#endregion
-
-#region ISourceContents
-
-        public bool SetSource (ISource source)
-        {
-            var track_source = source as ITrackModelSource;
-            var filterable_source = source as IFilterableSource;
-            if (track_source == null) {
-                return false;
-            }
-
-            this.source = source;
-
-            SetModel (track_view, track_source.TrackModel);
-
-            if (filterable_source != null && filterable_source.CurrentFilters != null) {
-                foreach (var model in filterable_source.CurrentFilters) {
-                    if (model is IListModel<ArtistInfo>) {
-                        SetModel (artist_view, (model as IListModel<ArtistInfo>));
-                    } else if (model is IListModel<AlbumInfo>) {
-                        SetModel (album_view, (model as IListModel<AlbumInfo>));
-                    }
-                }
-            }
-
-            return true;
-        }
-
-        public void ResetSource ()
-        {
-            source = null;
-            SetModel (track_view, null);
-            SetModel (artist_view, null);
-            SetModel (album_view, null);
-            track_view.HeaderVisible = false;
-        }
-
-        public ISource Source {
-            get { return source; }
-        }
-
-        public Widget Widget {
-            get { return this; }
-        }
-
-#endregion
-
-#region ITrackModelSourceContents
-
-        public IListView<TrackInfo> TrackView {
-            get { return track_view; }
-        }
-
-#endregion
-
-    }
-}

=== removed file '.pc/06_add-meego-desktop-file.patch/src/Extensions/Banshee.MeeGo/Makefile.am'
--- .pc/06_add-meego-desktop-file.patch/src/Extensions/Banshee.MeeGo/Makefile.am	2011-02-20 14:48:54 +0000
+++ .pc/06_add-meego-desktop-file.patch/src/Extensions/Banshee.MeeGo/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-ASSEMBLY = Banshee.MeeGo
-TARGET = library
-LINK = $(REF_EXTENSION_MEEGO) $(LINK_EXTENSION_PLAYQUEUE_DEPS)
-INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
-
-@INTLTOOL_DESKTOP_RULE@
-
-SOURCES =  \
-	Banshee.MeeGo/MediaPanelContents.cs \
-	Banshee.MeeGo/MeeGoHeaderBox.cs \
-	Banshee.MeeGo/MeeGoPanel.cs \
-	Banshee.MeeGo/MeeGoService.cs \
-	Banshee.MeeGo/MeeGoTheme.cs \
-	Banshee.MeeGo/MeeGoTrackInfoDisplay.cs \
-	Banshee.MeeGo/PlaybackBox.cs \
-	Banshee.MeeGo/SearchEntry.cs \
-	MeeGo.Panel/PanelButtonState.cs \
-	MeeGo.Panel/PanelClient.cs \
-	MeeGo.Panel/PanelGtk.cs \
-	MeeGo.Panel/SetPositionHandler.cs \
-	MeeGo.Panel/SetSizeHandler.cs
-
-RESOURCES = Banshee.MeeGo.addin.xml
-
-if HAVE_MEEGO
-
-include $(top_srcdir)/build/build.mk
-
-module_SCRIPTS += Banshee.MeeGo.dll.config
-
-paneldir = $(libexecdir)
-panel_SCRIPTS = meego-panel-banshee
-
-servicedir = $(datadir)/dbus-1/services
-service_DATA = com.meego.UX.Shell.Panels.banshee.service
-
-com.meego.UX.Shell.Panels.banshee.service: com.meego.UX.Shell.Panels.banshee.service.in $(top_builddir)/config.log
-	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-desktopfiles_in_files = meego-panel-banshee.desktop.in
-desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
-desktopfilesdir = $(datadir)/mutter-meego/panels
-desktopfiles_DATA = $(desktopfiles_files)
-
-%.desktop.in: %.desktop.in.in Makefile
-	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-clean-local:
-	rm -f com.meego.UX.Shell.Panels.banshee.service \
-		meego-panel-banshee.desktop \
-		meego-panel-banshee.desktop.in
-
-else
-EXTRA_DIST = $(SOURCES) $(RESOURCES)
-endif
-
-EXTRA_DIST += \
-	Banshee.MeeGo.dll.config \
-	meego-panel-banshee \
-	com.meego.UX.Shell.Panels.banshee.service.in \
-	meego-panel-banshee.desktop.in.in

=== renamed file '.pc/06_add-meego-desktop-file.patch/src/Extensions/Banshee.MeeGo/Makefile.in' => '.pc/06_add-meego-desktop-file.patch/src/Extensions/Banshee.MeeGo/Makefile.in.THIS'
=== removed file '.pc/06_add-meego-desktop-file.patch/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in'
=== removed directory '.pc/07_disable-notification-area-by-default.patch'
=== removed directory '.pc/07_disable-notification-area-by-default.patch/src'
=== removed directory '.pc/07_disable-notification-area-by-default.patch/src/Extensions'
=== removed directory '.pc/07_disable-notification-area-by-default.patch/src/Extensions/Banshee.NotificationArea'
=== removed file '.pc/07_disable-notification-area-by-default.patch/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml'
--- .pc/07_disable-notification-area-by-default.patch/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml	2010-11-26 18:35:59 +0000
+++ .pc/07_disable-notification-area-by-default.patch/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Addin 
-    id="Banshee.NotificationArea"
-    version="1.0"
-    compatVersion="1.0"
-    copyright="© 2005-2008 Novell Inc. Licensed under the MIT X11 license."
-    name="Notification Area Icon"
-    category="Utilities"
-    description="Display an icon in the notification area for controlling Banshee."
-    author="Aaron Bockover, Sebastian Dröge, Alexander Hixon, Gabriel Burt, Ruben Vermeersch"
-    url="http://banshee.fm/"
-    defaultEnabled="true">
-
-  <Dependencies>
-    <Addin id="Banshee.Services" version="1.0"/>
-    <Addin id="Banshee.ThickClient" version="1.0"/>
-  </Dependencies>
-
-  <Extension path="/Banshee/ServiceManager/Service">
-    <Service class="Banshee.NotificationArea.NotificationAreaService"/>
-  </Extension>
-  
-</Addin>

=== removed directory '.pc/07_enable-library-watch-by-default.patch'
=== removed directory '.pc/07_enable-library-watch-by-default.patch/src'
=== removed directory '.pc/07_enable-library-watch-by-default.patch/src/Extensions'
=== removed directory '.pc/07_enable-library-watch-by-default.patch/src/Extensions/Banshee.LibraryWatcher'
=== removed file '.pc/07_enable-library-watch-by-default.patch/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml'
--- .pc/07_enable-library-watch-by-default.patch/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml	2011-02-26 22:05:24 +0000
+++ .pc/07_enable-library-watch-by-default.patch/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<Addin
-    id="Banshee.LibraryWatcher"
-    version="1.0"
-    compatVersion="1.0"
-    copyright="© 2008-2009 Christian Martellini, Alexander Hixon, Alexander Kojevnikov. Licensed under the MIT X11 license."
-    name="Library Watcher"
-    category="Utilities"
-    description="Automatically update music and video libraries."
-    author="Christian Martellini, Alexander Hixon, Alexander Kojevnikov"
-    url="http://banshee.fm/"
-    defaultEnabled="false">
-
-  <Dependencies>
-    <Addin id="Banshee.Services" version="1.0"/>
-    <Addin id="Banshee.ThickClient" version="1.0"/>
-  </Dependencies>
-
-  <Extension path="/Banshee/ServiceManager/Service">
-    <Service class="Banshee.LibraryWatcher.LibraryWatcherService"/>
-  </Extension>
-
-</Addin>

=== removed directory '.pc/07_enable-mpris-by-default.patch'
=== removed directory '.pc/07_enable-mpris-by-default.patch/src'
=== removed directory '.pc/07_enable-mpris-by-default.patch/src/Extensions'
=== removed directory '.pc/07_enable-mpris-by-default.patch/src/Extensions/Banshee.Mpris'
=== removed file '.pc/07_enable-mpris-by-default.patch/src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml'
--- .pc/07_enable-mpris-by-default.patch/src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml	2011-02-20 14:48:54 +0000
+++ .pc/07_enable-mpris-by-default.patch/src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Addin
-    id="Banshee.Mpris"
-    version="1.0"
-    compatVersion="1.0"
-    copyright="© 2010 John Millikin, Bertrand Lorentz. Licensed under the MIT X11 license."
-    name="MPRIS D-Bus interface"
-    description="Control Banshee using the MPRIS D-Bus interface."
-    author="John Millikin, Bertrand Lorentz"
-    category="Utilities"
-    defaultEnabled="false">
-
-  <Dependencies>
-    <Addin id="Banshee.Services" version="1.0" />
-  </Dependencies>
-
-  <Extension path="/Banshee/ServiceManager/Service">
-    <Service class="Banshee.Mpris.MprisService"/>
-  </Extension>
-
-</Addin>

=== removed directory '.pc/07_enable-soundmenu-by-default.patch'
=== removed directory '.pc/07_enable-soundmenu-by-default.patch/src'
=== removed directory '.pc/07_enable-soundmenu-by-default.patch/src/Extensions'
=== removed directory '.pc/07_enable-soundmenu-by-default.patch/src/Extensions/Banshee.SoundMenu'
=== removed file '.pc/07_enable-soundmenu-by-default.patch/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml'
--- .pc/07_enable-soundmenu-by-default.patch/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml	2011-02-26 22:05:24 +0000
+++ .pc/07_enable-soundmenu-by-default.patch/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Addin
-    id="Banshee.SoundMenu"
-    version="1.0"
-    compatVersion="1.0"
-    copyright="Copyright 2010 Bertrand Lorentz. Licensed under the MIT X11 license."
-    name="Sound Menu Integration"
-    category="Utilities"
-    description="Control Banshee from the Sound Menu."
-    author="Bertrand Lorentz"
-    url="http://banshee-project.org/"
-    defaultEnabled="false">
-
-  <Dependencies>
-    <Addin id="Banshee.Services" version="1.0"/>
-    <Addin id="Banshee.ThickClient" version="1.0"/>
-    <Addin id="Banshee.Mpris" version="1.0"/>
-  </Dependencies>
-
-  <Extension path="/Banshee/ServiceManager/Service">
-    <Service class="Banshee.SoundMenu.SoundMenuService"/>
-  </Extension>
-
-</Addin>

=== removed directory '.pc/08_remove_unrelevant_media.patch'
=== removed directory '.pc/08_remove_unrelevant_media.patch/src'
=== removed directory '.pc/08_remove_unrelevant_media.patch/src/Extensions'
=== removed directory '.pc/08_remove_unrelevant_media.patch/src/Extensions/Banshee.MeeGo'
=== removed directory '.pc/08_remove_unrelevant_media.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo'
=== removed file '.pc/08_remove_unrelevant_media.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs'
--- .pc/08_remove_unrelevant_media.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs	2011-02-20 14:48:54 +0000
+++ .pc/08_remove_unrelevant_media.patch/src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs	1970-01-01 00:00:00 +0000
@@ -1,422 +0,0 @@
-//
-// MediaPanelContents.cs
-// 
-// Author:
-//   Aaron Bockover <[e-mail]>
-// 
-// Copyright 2010 Novell, Inc.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-
-using Mono.Unix;
-using Gtk;
-
-using Hyena;
-using Hyena.Data;
-using Hyena.Gui;
-using Hyena.Data.Gui;
-
-using Banshee.ServiceStack;
-using Banshee.Sources;
-using Banshee.Sources.Gui;
-using Banshee.Collection;
-using Banshee.Collection.Gui;
-using Banshee.MediaEngine;
-using Banshee.Gui;
-using Banshee.Gui.Widgets;
-
-namespace Banshee.MeeGo
-{
-    public class MediaPanelContents : Table, ITrackModelSourceContents
-    {
-        private ArtistListView artist_view;
-        private AlbumListView album_view;
-        private TerseTrackListView track_view;
-
-        private SourceComboBox source_combo_box;
-        private SearchEntry search_entry;
-        private MeeGoTrackInfoDisplay track_info_display;
-
-        private ISource source;
-        private Dictionary<object, double> model_positions = new Dictionary<object, double> ();
-
-        protected MediaPanelContents (IntPtr raw) : base (raw)
-        {
-        }
-
-        public MediaPanelContents () : base (3, 2, false)
-        {
-            BorderWidth = 5;
-            RowSpacing = 6;
-            ColumnSpacing = 7;
-            RedrawOnAllocate = true;
-            AppPaintable = true;
-
-            BuildHeader ();
-            BuildLibrary ();
-            BuildNowPlaying ();
-            BuildMessageBar ();
-            ConnectEvents ();
-
-            SetSource (ServiceManager.SourceManager.ActiveSource);
-        }
-
-        private void ConnectEvents ()
-        {
-            ServiceManager.SourceManager.ActiveSourceChanged += OnActiveSourceChanged;
-
-            ServiceManager.Get<InterfaceActionService> ().TrackActions ["SearchForSameArtistAction"].Activated += OnProgrammaticSearch;
-            ServiceManager.Get<InterfaceActionService> ().TrackActions ["SearchForSameAlbumAction"].Activated += OnProgrammaticSearch;
-
-            ServiceManager.PlayerEngine.ConnectEvent ((args) => track_info_display.Visible =
-                ServiceManager.PlayerEngine.CurrentState != PlayerState.Idle,
-                PlayerEvent.StateChange | PlayerEvent.StartOfStream);
-
-            source_combo_box.Model.Filter = (source) =>
-                source == ServiceManager.SourceManager.MusicLibrary ||
-                source.Parent == ServiceManager.SourceManager.MusicLibrary ||
-                source.GetType ().FullName == "Banshee.PlayQueue.PlayQueueSource";
-            source_combo_box.Model.Refresh ();
-            source_combo_box.UpdateActiveSource ();
-
-            search_entry.Changed += OnSearchEntryChanged;
-
-            artist_view.SelectionProxy.Changed += OnBrowserViewSelectionChanged;
-            album_view.SelectionProxy.Changed += OnBrowserViewSelectionChanged;
-        }
-
-#region UI Construction
-
-        private void BuildHeader ()
-        {
-            Attach (new Label {
-                    Markup = String.Format ("<span font_desc=\"Droid Sans Bold\" " +
-                        "size=\"x-large\" foreground=\"#606eff\">{0}</span>",
-                        GLib.Markup.EscapeText (Catalog.GetString ("Media"))),
-                    Xalign = 0.0f
-                },
-                0, 2, 0, 1,
-                AttachOptions.Fill | AttachOptions.Expand,
-                AttachOptions.Shrink, 12, 0);
-        }
-
-        private void BuildLibrary ()
-        {
-            var box = new MeeGoHeaderBox () { Title = Catalog.GetString ("Library") };
-
-            // Build the Library Header
-            var header = new HBox () {
-                Spacing = 5,
-                BorderWidth = 5
-            };
-
-            var app_button = new Button (new Image () {
-                IconSize = (int)IconSize.LargeToolbar,
-                IconName = "media-player-banshee"
-            }) {
-                TooltipText = Catalog.GetString ("Launch the Banshee Media Player")
-            };
-            app_button.Clicked += (o, e) => {
-                ServiceManager.SourceManager.SetActiveSource (ServiceManager.SourceManager.MusicLibrary);
-                ServiceManager.Get<MeeGoService> ().PresentPrimaryInterface ();
-            };
-
-            header.PackStart (source_combo_box = new SourceComboBox (), false, false, 0);
-            header.PackStart (app_button, false, false, 0);
-            header.PackStart (search_entry = new SearchEntry (), true, true, 0);
-            box.PackStartHighlighted (header, false, false, 0, MeeGoHeaderBox.HighlightFlags.Background);
-
-            // Build the Library Views
-            var views = new HBox () { Spacing = 5 };
-            views.PackStart (SetupView (artist_view = new ArtistListView () {
-                    Name = "meego-panel-artists",
-                    WidthRequest = 150,
-                    DoNotRenderNullModel = true
-                }), false, false, 0);
-            views.PackStart (SetupView (album_view = new AlbumListView () {
-                    Name = "meego-panel-albums",
-                    DoNotRenderNullModel = true
-                }), true, true, 0);
-            box.PackStart (views, true, true, 0);
-
-            Attach (box, 0, 1, 1, 2,
-                AttachOptions.Expand | AttachOptions.Fill,
-                AttachOptions.Expand | AttachOptions.Fill,
-                0, 0);
-        }
-
-        private void BuildNowPlaying ()
-        {
-            var box = new MeeGoHeaderBox () { Title = Catalog.GetString ("Now Playing") };
-
-            var seek_slider = new ConnectedSeekSlider (SeekSliderLayout.Horizontal);
-            seek_slider.StreamPositionLabel.FormatString = "<small>{0}</small>";
-
-            track_info_display = new MeeGoTrackInfoDisplay () {
-                HeightRequest = 64,
-                NoShowAll = true
-            };
-
-            track_view = new TerseTrackListView () {
-                Name = "meego-panel-tracks",
-                WidthRequest = 220
-            };
-            track_view.ColumnController.Insert (new Column (null, "indicator",
-                new ColumnCellStatusIndicator (null), 0.05, true, 20, 20), 0);
-
-            box.PackStartHighlighted (track_info_display, false, false, 0, MeeGoHeaderBox.HighlightFlags.Background);
-            box.PackStartHighlighted (seek_slider, false, false, 0, MeeGoHeaderBox.HighlightFlags.Background);
-            box.PackStart (SetupView (track_view), true, true, 0);
-            box.PackStartHighlighted (new PlaybackBox (), false, false, 0, MeeGoHeaderBox.HighlightFlags.TopLine);
-
-            Attach (box, 1, 2, 1, 2,
-                AttachOptions.Shrink,
-                AttachOptions.Expand | AttachOptions.Fill,
-                0, 0);
-        }
-
-        private void BuildMessageBar ()
-        {
-            ConnectedMessageBar bar = new ConnectedMessageBar ();
-            Attach (bar, 0, 2, 2, 3,
-                    AttachOptions.Expand | AttachOptions.Fill,
-                    AttachOptions.Shrink, 0, 0);
-            bar.ShowAll ();
-        }
-
-        private ScrolledWindow SetupView (Widget view)
-        {
-            var scrolled = new ScrolledWindow () {
-                VscrollbarPolicy = PolicyType.Automatic,
-                HscrollbarPolicy = PolicyType.Never,
-                ShadowType = ShadowType.None
-            };
-            scrolled.Add (view);
-            return scrolled;
-        }
-
-#endregion
-
-#region Background Rendering
-
-        protected override void OnParentSet (Widget previous)
-        {
-            base.OnParentSet (previous);
-
-            if (Parent != null) {
-                Parent.ModifyBg (StateType.Normal, Style.White);
-            }
-        }
-
-        protected override bool OnExposeEvent (Gdk.EventExpose evnt)
-        {
-            if (!Visible || !IsMapped) {
-                return true;
-            }
-
-            RenderBackground (evnt.Window, evnt.Region);
-            foreach (var child in Children) {
-                PropagateExpose (child, evnt);
-            }
-
-            return true;
-        }
-
-        private void RenderBackground (Gdk.Window window, Gdk.Region region)
-        {
-            var cr = Gdk.CairoHelper.Create (window);
-
-            var grad = new Cairo.LinearGradient (0, 0, 0, Allocation.Height);
-            grad.AddColorStop (0, CairoExtensions.RgbToColor (0xffffff));
-            grad.AddColorStop (1, CairoExtensions.RgbToColor (0xc3c3c3));
-            cr.Pattern = grad;
-            cr.Rectangle (0, 0, Allocation.Width, Allocation.Height);
-            cr.Fill ();
-            grad.Destroy ();
-
-            CairoExtensions.DisposeContext (cr);
-        }
-
-#endregion
-
-#region Event Handlers
-
-        private void OnProgrammaticSearch (object o, EventArgs args)
-        {
-            Source source = ServiceManager.SourceManager.ActiveSource;
-            search_entry.Ready = false;
-            search_entry.Query = source.FilterQuery;
-            search_entry.Ready = true;
-        }
-
-        private void OnBrowserViewSelectionChanged (object o, EventArgs args)
-        {
-            // Scroll the raising filter view to the top if "all" is selected
-            var selection = (Hyena.Collections.Selection)o;
-            if (!selection.AllSelected) {
-                return;
-            }
-
-            if (artist_view.Selection == selection) {
-                artist_view.ScrollTo (0);
-            } else if (album_view.Selection == selection) {
-                album_view.ScrollTo (0);
-            }
-        }
-
-        private void OnSearchEntryChanged (object o, EventArgs args)
-        {
-            var source = ServiceManager.SourceManager.ActiveSource;
-            if (source == null) {
-                return;
-            }
-
-            source.FilterType = (TrackFilterType)search_entry.ActiveFilterID;
-            source.FilterQuery = search_entry.Query;
-        }
-
-        private void OnActiveSourceChanged (SourceEventArgs args)
-        {
-            ThreadAssist.ProxyToMain (delegate {
-                var source = ServiceManager.SourceManager.ActiveSource;
-
-                search_entry.Ready = false;
-                search_entry.CancelSearch ();
-                search_entry.SearchSensitive = source != null && source.CanSearch;
-
-                if (source != null && source.FilterQuery != null) {
-                    search_entry.Query = source.FilterQuery;
-                    search_entry.ActivateFilter ((int)source.FilterType);
-                }
-
-                ResetSource ();
-                SetSource (source);
-
-                search_entry.Ready = true;
-            });
-        }
-
-        internal void SyncSearchEntry ()
-        {
-            OnActiveSourceChanged (null);
-        }
-
-#endregion
-
-#region View<->Model binding
-
-        private void SetModel<T> (IListModel<T> model)
-        {
-            ListView<T> view = FindListView <T> ();
-            if (view != null) {
-                SetModel (view, model);
-            } else {
-                Hyena.Log.DebugFormat ("Unable to find view for model {0}", model);
-            }
-        }
-
-        private void SetModel<T> (ListView<T> view, IListModel<T> model)
-        {
-            if (view.Model != null) {
-                model_positions[view.Model] = view.Vadjustment.Value;
-            }
-
-            if (model == null) {
-                view.SetModel (null);
-                return;
-            }
-
-            if (!model_positions.ContainsKey (model)) {
-                model_positions[model] = 0.0;
-            }
-
-            view.SetModel (model, model_positions[model]);
-        }
-
-        private ListView<T> FindListView<T> ()
-        {
-            foreach (var view in new IListView [] { artist_view, album_view, track_view }) {
-                if (view is ListView<T>) {
-                    return (ListView<T>)view;
-                }
-            }
-            return null;
-        }
-
-#endregion
-
-#region ISourceContents
-
-        public bool SetSource (ISource source)
-        {
-            var track_source = source as ITrackModelSource;
-            var filterable_source = source as IFilterableSource;
-            if (track_source == null) {
-                return false;
-            }
-
-            this.source = source;
-
-            SetModel (track_view, track_source.TrackModel);
-
-            if (filterable_source != null && filterable_source.CurrentFilters != null) {
-                foreach (var model in filterable_source.CurrentFilters) {
-                    if (model is IListModel<ArtistInfo>) {
-                        SetModel (artist_view, (model as IListModel<ArtistInfo>));
-                    } else if (model is IListModel<AlbumInfo>) {
-                        SetModel (album_view, (model as IListModel<AlbumInfo>));
-                    }
-                }
-            }
-
-            return true;
-        }
-
-        public void ResetSource ()
-        {
-            source = null;
-            SetModel (track_view, null);
-            SetModel (artist_view, null);
-            SetModel (album_view, null);
-            track_view.HeaderVisible = false;
-        }
-
-        public ISource Source {
-            get { return source; }
-        }
-
-        public Widget Widget {
-            get { return this; }
-        }
-
-#endregion
-
-#region ITrackModelSourceContents
-
-        public IListView<TrackInfo> TrackView {
-            get { return track_view; }
-        }
-
-#endregion
-
-    }
-}

=== renamed file '.pc/99_ltmain_as-needed.patch/ltmain.sh' => '.pc/99_ltmain_as-needed.patch/ltmain.sh.THIS'
=== renamed file '.pc/applied-patches' => '.pc/applied-patches.THIS'
=== modified file 'debian/changelog'
--- debian/changelog	2011-03-11 01:05:18 +0000
+++ debian/changelog	2011-03-28 07:18:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 banshee (1.9.5-1ubuntu1) natty; urgency=low
 
   * Merge from Debian Unstable, remaining changes:
@@ -36,6 +37,15 @@
 
  -- Rodney Dawes <[e-mail]>  Mon, 28 Feb 2011 14:06:16 -0500
 
+=======
+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 <[e-mail]>  Mon, 28 Feb 2011 14:06:16 -0500
+
+>>>>>>> MERGE-SOURCE
 banshee (1.9.4-1ubuntu1) natty; urgency=low
 
   * Merge from Debian Experimental, remaining changes:

=== added file 'debian/patches/0001-Add-support-for-u1ms-links.patch'
--- debian/patches/0001-Add-support-for-u1ms-links.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0001-Add-support-for-u1ms-links.patch	2011-03-28 07:18:25 +0000
@@ -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 <[e-mail]>
++//   Rodney Dawes <[e-mail]>
+ //
+ // 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; } }
+         }
+     }
+ }

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-03-11 01:05:18 +0000
+++ debian/patches/series	2011-03-28 07:18:25 +0000
@@ -10,4 +10,5 @@
 07_enable-soundmenu-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

=== modified file 'ltmain.sh'
--- ltmain.sh	2011-03-11 01:05:18 +0000
+++ ltmain.sh	2011-03-28 07:18:25 +0000
@@ -4716,11 +4716,6 @@
 	arg=$func_stripname_result
 	;;
 
-      -Wl,--as-needed)
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
       -Wl,*)
 	func_stripname '-Wl,' '' "$arg"
 	args=$func_stripname_result
@@ -5072,15 +5067,6 @@
 	lib=
 	found=no
 	case $deplib in
-	-Wl,--as-needed)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	  fi
-	  continue
-	  ;;
 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"

=== modified file 'src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs'
--- src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs	2011-02-20 14:48:54 +0000
+++ src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs	2011-03-28 07:18:25 +0000
@@ -86,15 +86,6 @@
                     DatabaseTrackModel.Reload ();
                 }
             ));
-
-            DatabaseTrackModel.Reloaded += delegate {
-                if (TrackModel.Count == 0) {
-                    SetStatus (String.Format ("Please move your music to {0}", GetDefaultBaseDirectory ()),
-                               false, false, "dialog-info");
-                } else {
-                    HideStatus ();
-                }
-            };
         }
 
         public override string GetPluralItemCountString (int count)

=== modified file 'src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs'
--- src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs	2011-02-20 14:48:54 +0000
+++ src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs	2011-03-28 07:18:25 +0000
@@ -49,6 +49,7 @@
     {
         private Dictionary<int, SurfaceCache> scale_caches  = new Dictionary<int, SurfaceCache> ();
         private HashSet<int> cacheable_cover_sizes = new HashSet<int> ();
+        private HashSet<string> null_artwork_ids = new HashSet<string> ();
 
         private class SurfaceCache : LruCache<string, Cairo.ImageSurface>
         {
@@ -116,8 +117,13 @@
                 return surface;
             }
 
+            if (null_artwork_ids.Contains (id)) {
+                return null;
+            }
+
             Pixbuf pixbuf = LookupScalePixbuf (id, size);
             if (pixbuf == null || pixbuf.Handle == IntPtr.Zero) {
+                null_artwork_ids.Add (id);
                 return null;
             }
 
@@ -157,12 +163,17 @@
                 return null;
             }
 
+            if (null_artwork_ids.Contains (id)) {
+                return null;
+            }
+
             // Find the scaled, cached file
             string path = CoverArtSpec.GetPathForSize (id, size);
             if (File.Exists (new SafeUri (path))) {
                 try {
                     return new Pixbuf (path);
                 } catch {
+                    null_artwork_ids.Add (id);
                     return null;
                 }
             }
@@ -179,6 +190,7 @@
                         Pixbuf pixbuf = new Pixbuf (unconverted_path);
                         if (pixbuf.Width < 50 || pixbuf.Height < 50) {
                             Hyena.Log.DebugFormat ("Ignoring cover art {0} because less than 50x50", unconverted_path);
+                            null_artwork_ids.Add (id);
                             return null;
                         }
 
@@ -219,6 +231,7 @@
                 } catch {}
             }
 
+            null_artwork_ids.Add (id);
             return null;
         }
 
@@ -238,6 +251,8 @@
                 scale_caches[size].Remove (id);
             }
 
+            null_artwork_ids.Remove (id);
+
             if (inMemoryCacheOnly) {
                 return;
             }

=== modified file 'src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml'
--- src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml	2011-02-20 14:48:54 +0000
+++ src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml	2011-03-28 07:18:25 +0000
@@ -5,7 +5,6 @@
     <placeholder name="NextArrowButton"/>
     <placeholder name="SeekSlider"/>
     <placeholder name="TrackInfoDisplay"/>
-    <placeholder name="ExtensionToolBarPlaceHolder"/>
     <placeholder name="SourceActions">
         <toolitem name="RefreshSmartPlaylist" action="RefreshSmartPlaylistAction"/>
     </placeholder>

=== modified file 'src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml'
--- src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml	2011-02-26 22:05:24 +0000
+++ src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml	2011-03-28 07:18:25 +0000
@@ -8,7 +8,7 @@
     description="Automatically update music and video libraries."
     author="Christian Martellini, Alexander Hixon, Alexander Kojevnikov"
     url="http://banshee.fm/"
-    defaultEnabled="true">
+    defaultEnabled="false">
 
   <Dependencies>
     <Addin id="Banshee.Services" version="1.0"/>

=== modified file 'src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs'
--- src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs	2011-02-20 14:48:54 +0000
+++ src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs	2011-03-28 07:18:25 +0000
@@ -63,7 +63,7 @@
         {
         }
 
-        public MediaPanelContents () : base (3, 2, false)
+        public MediaPanelContents () : base (2, 2, false)
         {
             BorderWidth = 5;
             RowSpacing = 6;
@@ -71,10 +71,9 @@
             RedrawOnAllocate = true;
             AppPaintable = true;
 
-            //BuildHeader ();
+            BuildHeader ();
             BuildLibrary ();
             BuildNowPlaying ();
-            BuildMessageBar ();
             ConnectEvents ();
 
             SetSource (ServiceManager.SourceManager.ActiveSource);
@@ -194,15 +193,6 @@
                 0, 0);
         }
 
-        private void BuildMessageBar ()
-        {
-            ConnectedMessageBar bar = new ConnectedMessageBar ();
-            Attach (bar, 0, 2, 2, 3,
-                    AttachOptions.Expand | AttachOptions.Fill,
-                    AttachOptions.Shrink, 0, 0);
-            bar.ShowAll ();
-        }
-
         private ScrolledWindow SetupView (Widget view)
         {
             var scrolled = new ScrolledWindow () {

=== modified file 'src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs'
--- src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs	2011-02-20 14:48:54 +0000
+++ src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs	2011-03-28 07:18:25 +0000
@@ -48,7 +48,7 @@
         public MeeGoPanel ()
         {
             if (Instance != null) {
-                throw new InvalidOperationException ("Only one Netbook Panel (MeegoPanel) instance should exist");
+                throw new InvalidOperationException ("Only one MeeGoPanel instance should exist");
             }
 
             Instance = this;
@@ -56,7 +56,7 @@
             var timer = Log.DebugTimerStart ();
 
             try {
-                Log.Debug ("Attempting to create Netbook toolbar panel");
+                Log.Debug ("Attempting to create MeeGo toolbar panel");
                 embedded_panel = new PanelGtk ("banshee", Catalog.GetString ("media"),
                     null, "media-button", true);
                 embedded_panel.ShowBeginEvent += (o, e) => {
@@ -70,12 +70,12 @@
                 }
             } catch (Exception e) {
                 if (!(e is DllNotFoundException)) {
-                    Log.Exception ("Could not bind to Netbook panel", e);
+                    Log.Exception ("Could not bind to MeeGo panel", e);
                 }
-                window_panel = new Gtk.Window ("Netbook Media Panel");
+                window_panel = new Gtk.Window ("MeeGo Media Panel");
             }
 
-            Log.DebugTimerPrint (timer, "Netbook panel created: {0}");
+            Log.DebugTimerPrint (timer, "MeeGo panel created: {0}");
         }
 
         public void Dispose ()
@@ -87,7 +87,7 @@
             var timer = Log.DebugTimerStart ();
             Contents = new MediaPanelContents ();
             Contents.ShowAll ();
-            Log.DebugTimerPrint (timer, "Netbook panel contents created: {0}");
+            Log.DebugTimerPrint (timer, "MeeGo panel contents created: {0}");
 
             if (embedded_panel != null) {
                 embedded_panel.SetChild (Contents);
@@ -105,18 +105,9 @@
 
         public void Hide ()
         {
-            window_panel.Hide ();
             if (embedded_panel != null) {
                 embedded_panel.Hide ();
             }
         }
-
-        public void Show ()
-        {
-            window_panel.Show ();
-            if (embedded_panel != null) {
-                embedded_panel.Show ();
-            }
-        }
     }
 }

=== modified file 'src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs'
--- src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs	2011-02-20 14:48:54 +0000
+++ src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs	2011-03-28 07:18:25 +0000
@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using Mono.Unix;
 using System;
 using Gtk;
 using MeeGo.Panel;
@@ -39,7 +38,6 @@
 using Banshee.ServiceStack;
 using Banshee.MediaEngine;
 using Banshee.Gui;
-using Banshee.Gui.Widgets;
 
 namespace Banshee.MeeGo
 {
@@ -86,7 +84,6 @@
             }
 
             Initialize ();
-            AddSwitchToPrimaryInterface ();
 
             ServiceManager.ServiceStarted -= OnServiceStarted;
 
@@ -100,15 +97,13 @@
             // assume we're probably not really running in a MeeGo environment,
             // so we just create the panel here (which is likely to just be
             // a separate top-level window for testing).
-            panel = MeeGoPanel.Instance;
+            panel = MeeGoPanel.Instance ?? new MeeGoPanel ();
 
             if (panel == null) {
-                Log.Information ("Netbook extension initialized with hidden panel");
-                //AddSwitchToPrimaryInterface ();
+                Log.Warning ("MeeGo extension initialized without a panel");
                 return;
             }
 
-            elements_service.PrimaryWindow.Hide ();
             panel.BuildContents ();
 
             elements_service.PrimaryWindowClose = () => {
@@ -116,32 +111,15 @@
                 return true;
             };
 
-        }
-
-        private void AddSwitchToPrimaryInterface ()
-        {
-            // Add switcher to primary interface:
-            var app_button = new Button (new Image () {
-                IconSize = (int)IconSize.LargeToolbar,
-                IconName = "media-player-banshee"
-            }) {
-                TooltipText = Catalog.GetString ("Show the Netbook interface")
-            };
-            app_button.Clicked += (o, e) => {
-                //ServiceManager.SourceManager.SetActiveSource (ServiceManager.SourceManager.MusicLibrary);
-                ServiceManager.Get<MeeGoService> ().PresentNetbookInterface ();
-            };
-            Toolbar header_toolbar;
-            InterfaceActionService action_service;
-            action_service = ServiceManager.Get<InterfaceActionService> ();
-            header_toolbar = (Toolbar)action_service.UIManager.GetWidget ("/HeaderToolbar");
-            app_button.ShowAll ();
-            action_service.PopulateToolbarPlaceholder (header_toolbar, "/HeaderToolbar/ExtensionToolBarPlaceHolder", app_button);
+            // Since the Panel is running, we don't actually ever want to quit!
+            Banshee.ServiceStack.Application.ShutdownRequested += () => {
+                elements_service.PrimaryWindow.Hide ();
+                return false;
+            };
         }
 
         public void PresentPrimaryInterface ()
         {
-            Log.Information ("Switch to traditional interface");
             elements_service.PrimaryWindow.Maximize ();
             elements_service.PrimaryWindow.Present ();
             if (panel != null) {
@@ -149,17 +127,6 @@
             }
         }
 
-        public void PresentNetbookInterface ()
-        {
-            Log.Information ("Switch to Netbook interface");
-            if (panel == null) {
-                panel = new MeeGoPanel ();
-                Initialize ();
-            }
-            panel.Show ();
-            elements_service.PrimaryWindow.Hide ();
-        }
-
         public void Dispose ()
         {
             if (panel != null) {

=== modified file 'src/Extensions/Banshee.MeeGo/Makefile.am'
--- src/Extensions/Banshee.MeeGo/Makefile.am	2011-02-20 14:48:54 +0000
+++ src/Extensions/Banshee.MeeGo/Makefile.am	2011-03-28 07:18:25 +0000
@@ -37,8 +37,7 @@
 com.meego.UX.Shell.Panels.banshee.service: com.meego.UX.Shell.Panels.banshee.service.in $(top_builddir)/config.log
 	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
-desktopfiles_in_files = meego-panel-banshee.desktop.in \
-						banshee-1.desktop.in
+desktopfiles_in_files = meego-panel-banshee.desktop.in
 desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
 desktopfilesdir = $(datadir)/mutter-meego/panels
 desktopfiles_DATA = $(desktopfiles_files)
@@ -49,9 +48,7 @@
 clean-local:
 	rm -f com.meego.UX.Shell.Panels.banshee.service \
 		meego-panel-banshee.desktop \
-		meego-panel-banshee.desktop.in \
-		banshee-1.desktop \
-		banshee-1.desktop.in
+		meego-panel-banshee.desktop.in
 
 else
 EXTRA_DIST = $(SOURCES) $(RESOURCES)
@@ -62,4 +59,3 @@
 	meego-panel-banshee \
 	com.meego.UX.Shell.Panels.banshee.service.in \
 	meego-panel-banshee.desktop.in.in
-	banshee-1.desktop.in.in

=== modified file 'src/Extensions/Banshee.MeeGo/Makefile.in'
--- src/Extensions/Banshee.MeeGo/Makefile.in	2011-03-11 01:05:18 +0000
+++ src/Extensions/Banshee.MeeGo/Makefile.in	2011-03-28 07:18:25 +0000
@@ -637,14 +637,12 @@
 @HAVE_MEEGO_FALSE@EXTRA_DIST = $(SOURCES) $(RESOURCES) \
 @HAVE_MEEGO_FALSE@	Banshee.MeeGo.dll.config meego-panel-banshee \
 @HAVE_MEEGO_FALSE@	com.meego.UX.Shell.Panels.banshee.service.in \
-@HAVE_MEEGO_FALSE@	meego-panel-banshee.desktop.in.in \
-@HAVE_MEEGO_FALSE@	banshee-1.desktop.in.in
+@HAVE_MEEGO_FALSE@	meego-panel-banshee.desktop.in.in
 @HAVE_MEEGO_TRUE@EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) \
 @HAVE_MEEGO_TRUE@	$(THEME_ICONS_SOURCE) \
 @HAVE_MEEGO_TRUE@	Banshee.MeeGo.dll.config meego-panel-banshee \
 @HAVE_MEEGO_TRUE@	com.meego.UX.Shell.Panels.banshee.service.in \
-@HAVE_MEEGO_TRUE@	meego-panel-banshee.desktop.in.in \
-@HAVE_MEEGO_TRUE@	banshee-1.desktop.in.in
+@HAVE_MEEGO_TRUE@	meego-panel-banshee.desktop.in.in
 @HAVE_MEEGO_TRUE@CLEANFILES = $(OUTPUT_FILES)
 @HAVE_MEEGO_TRUE@DISTCLEANFILES = *.pidb
 @HAVE_MEEGO_TRUE@MAINTAINERCLEANFILES = Makefile.in
@@ -652,7 +650,7 @@
 @HAVE_MEEGO_TRUE@panel_SCRIPTS = meego-panel-banshee
 @HAVE_MEEGO_TRUE@servicedir = $(datadir)/dbus-1/services
 @HAVE_MEEGO_TRUE@service_DATA = com.meego.UX.Shell.Panels.banshee.service
-@HAVE_MEEGO_TRUE@desktopfiles_in_files = meego-panel-banshee.desktop.in banshee-1.desktop.in
+@HAVE_MEEGO_TRUE@desktopfiles_in_files = meego-panel-banshee.desktop.in
 @HAVE_MEEGO_TRUE@desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
 @HAVE_MEEGO_TRUE@desktopfilesdir = $(datadir)/mutter-meego/panels
 @HAVE_MEEGO_TRUE@desktopfiles_DATA = $(desktopfiles_files)
@@ -975,9 +973,7 @@
 @HAVE_MEEGO_TRUE@clean-local:
 @HAVE_MEEGO_TRUE@	rm -f com.meego.UX.Shell.Panels.banshee.service \
 @HAVE_MEEGO_TRUE@		meego-panel-banshee.desktop \
-@HAVE_MEEGO_TRUE@		meego-panel-banshee.desktop.in \
-@HAVE_MEEGO_TRUE@		banshee-1.desktop \
-@HAVE_MEEGO_TRUE@		banshee-1.desktop.in
+@HAVE_MEEGO_TRUE@		meego-panel-banshee.desktop.in
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

=== removed file 'src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in'
--- src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in	2011-02-20 14:48:54 +0000
+++ src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-_Name=Banshee Netbook
-_GenericName=Netbook Media Player
-_X-GNOME-FullName=Netbook Banshee Media Player
-_Comment=Play and organize your media collection
-Exec=banshee --client=MeeGo
-Terminal=false
-Type=Application
-Icon=media-player-banshee
-Categories=GNOME;Audio;Music;Player;AudioVideo;
-StartupNotify=true

=== modified file 'src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml'
--- src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml	2011-02-20 14:48:54 +0000
+++ src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml	2011-03-28 07:18:25 +0000
@@ -8,7 +8,7 @@
     description="Control Banshee using the MPRIS D-Bus interface."
     author="John Millikin, Bertrand Lorentz"
     category="Utilities"
-    defaultEnabled="true">
+    defaultEnabled="false">
 
   <Dependencies>
     <Addin id="Banshee.Services" version="1.0" />

=== modified file 'src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml'
--- src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml	2010-11-26 18:35:59 +0000
+++ src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml	2011-03-28 07:18:25 +0000
@@ -9,7 +9,7 @@
     description="Display an icon in the notification area for controlling Banshee."
     author="Aaron Bockover, Sebastian Dröge, Alexander Hixon, Gabriel Burt, Ruben Vermeersch"
     url="http://banshee.fm/"
-    defaultEnabled="false">
+    defaultEnabled="true">
 
   <Dependencies>
     <Addin id="Banshee.Services" version="1.0"/>

=== modified file 'src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml'
--- src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml	2011-02-26 22:05:24 +0000
+++ src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml	2011-03-28 07:18:25 +0000
@@ -9,7 +9,7 @@
     description="Control Banshee from the Sound Menu."
     author="Bertrand Lorentz"
     url="http://banshee-project.org/"
-    defaultEnabled="true">
+    defaultEnabled="false">
 
   <Dependencies>
     <Addin id="Banshee.Services" version="1.0"/>

=== modified file 'src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml'
--- src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml	2011-03-11 01:05:18 +0000
+++ src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml	2011-03-28 07:18:25 +0000
@@ -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="true">
+    defaultEnabled="false">
 
   <Dependencies>
     <Addin id="Banshee.Services" version="1.0"/>