[banshee/grid: 50/50] Merge branch 'master' into grid

[Aaron Bockover <abock src gnome org>]

commit 5dcc55433d66acc31b1d33ebd3d6b645e2de2953
Merge: ff2601c c92485c
Author: Aaron Bockover <abockover novell com>
Date:   Wed Jan 20 18:07:22 2010 -0500

    Merge branch 'master' into grid

 Banshee.sln                                        |    7 +
 NEWS                                               |   54 +---
 bootstrap-bundle                                   |    8 +-
 build/build.environment.mk                         |    1 +
 build/bundle/TODO                                  |   11 +
 build/bundle/bockbuild/darwinprofile.py            |   53 ++--
 build/bundle/bockbuild/package.py                  |   36 ++-
 build/bundle/bockbuild/unixprofile.py              |    7 +-
 build/bundle/packages.py                           |    5 +-
 build/bundle/packages/gtk-quartz-engine.py         |   11 +
 build/bundle/packages/moblin-icon-theme.py         |   22 ++
 build/bundle/packages/murrine.py                   |   14 +
 build/bundle/packages/patches/murrine-osx.patch    |   43 +++
 build/bundle/profile.darwin.py                     |   11 +-
 .../Contents/Resources/etc/gtk-2.0/gtkrc           |  318 ++++++++++++++++++++
 build/m4/banshee/gio.m4                            |    4 +
 configure.ac                                       |    8 +-
 data/addin-xml-strings.cs                          |    5 +
 po/sl.po                                           |   14 +-
 src/Backends/Banshee.Gio/Banshee.Gio.addin.xml     |    2 +-
 .../Banshee.Gio/Banshee.IO.Gio/DemuxVfs.cs         |    6 +-
 .../Banshee.Gio/Banshee.IO.Gio/Directory.cs        |   33 +--
 src/Backends/Banshee.Gio/Banshee.IO.Gio/Tests.cs   |   29 ++-
 src/Clients/Booter/Booter/Entry.cs                 |    4 +-
 src/Clients/Booter/Makefile.am                     |    2 +
 src/Clients/Booter/banshee-1.darwin.in             |   43 +++-
 src/Clients/Halie/Halie/Client.cs                  |    6 +
 .../Banshee.Base/ApplicationContext.cs             |   79 -----
 src/Core/Banshee.Core/Banshee.IO/Provider.cs       |   31 ++-
 .../Banshee.Core/Banshee.Streaming/StreamTagger.cs |    4 +-
 .../DatabaseTrackInfo.cs                           |    2 +-
 .../Banshee.Library/HomeDirectoryImportSource.cs   |    2 +-
 .../Banshee.MediaEngine/IPlayerEngineService.cs    |    1 +
 .../Banshee.MediaEngine/PlayerEngineService.cs     |   10 +
 .../FileSystemQueryJob.cs                          |    2 +-
 .../IPlaybackControllerService.cs                  |    1 +
 .../PlaybackControllerService.cs                   |   19 ++
 .../Tests/PlaylistFormatTests.cs                   |   90 +++---
 .../Banshee.Sources/PrimarySource.cs               |    2 +-
 .../Banshee.Gui/PlaybackActions.cs                 |    7 +-
 .../Banshee.Library.Gui/FileImportSource.cs        |    6 +-
 .../Banshee.Library.Gui/FolderImportSource.cs      |    4 +-
 .../Banshee.Library.Gui/ImportDialog.cs            |   14 +-
 .../Banshee.Library.Gui/PhotoFolderImportSource.cs |    2 +-
 .../Banshee.Dap.MassStorage/MassStorageSource.cs   |    7 +-
 .../Banshee.Emusic/Banshee.Emusic/EmusicService.cs |    1 +
 .../Banshee.Lastfm.Radio/LastfmActions.cs          |    3 +
 .../Banshee.LibraryWatcher.addin.xml               |   22 ++
 .../Banshee.LibraryWatcher.csproj                  |   80 +++++
 .../LibraryWatcherService.cs                       |  120 ++++++++
 .../Banshee.LibraryWatcher/SourceWatcher.cs        |  293 ++++++++++++++++++
 src/Extensions/Banshee.LibraryWatcher/Makefile.am  |   16 +
 .../MultimediaKeysService.cs                       |    2 +-
 .../X11NotificationAreaBox.cs                      |    8 +
 src/Extensions/Banshee.Wikipedia/Makefile.am       |    2 +-
 src/Extensions/Makefile.am                         |    2 +
 .../Hyena/Hyena.Query/StringQueryValue.cs          |    4 +-
 src/Libraries/Hyena/Hyena/StringUtil.cs            |    9 +
 .../Media.Playlists.Xspf/Tests/XspfTests.cs        |   31 ++-
 tests/Makefile.am                                  |    4 +
 .../Mono.Media/xspf/{xspf-1.xsd => xspf-1_0.2.xsd} |  249 ++++++++--------
 61 files changed, 1484 insertions(+), 402 deletions(-)
---