[banshee/watcher: 189/190] Merge branch 'master' into watcher



commit 5ad0c5578183861845cbab0879b5df6784128e76
Merge: 2c84449 cae3c20
Author: Alexander Kojevnikov <alexander kojevnikov com>
Date:   Wed Jan 20 19:29:39 2010 +1100

    Merge branch 'master' into watcher

 .gitignore                                         |    5 +
 Banshee.sln                                        |   14 +
 COPYING                                            |    3 +-
 Makefile.am                                        |    2 +-
 NEWS                                               |   53 +-
 autogen.osx.sh                                     |    4 -
 bootstrap-bundle                                   |   64 +
 build/build.environment.mk                         |    1 +
 build/bundle/TODO                                  |   11 +
 build/bundle/bockbuild/darwinprofile.py            |  106 +
 build/bundle/bockbuild/environment.py              |   62 +
 build/bundle/bockbuild/package.py                  |  216 ++
 build/bundle/bockbuild/profile.py                  |  110 +
 build/bundle/bockbuild/unixprofile.py              |   32 +
 build/bundle/bockbuild/util.py                     |   83 +
 build/bundle/packages.py                           |   84 +
 build/bundle/packages/atk.py                       |    1 +
 build/bundle/packages/autoconf.py                  |    1 +
 build/bundle/packages/automake.py                  |    1 +
 build/bundle/packages/banshee.py                   |   32 +
 build/bundle/packages/cairo.py                     |   24 +
 build/bundle/packages/flac.py                      |   12 +
 build/bundle/packages/fontconfig.py                |    6 +
 build/bundle/packages/freetype.py                  |    3 +
 build/bundle/packages/gconf-dummy.py               |    9 +
 build/bundle/packages/gettext.py                   |    5 +
 build/bundle/packages/glib.py                      |   44 +
 build/bundle/packages/gst-plugins-bad.py           |    9 +
 build/bundle/packages/gst-plugins-base.py          |   22 +
 build/bundle/packages/gst-plugins-good.py          |   24 +
 build/bundle/packages/gst-plugins-ugly.py          |    9 +
 build/bundle/packages/gstreamer.py                 |    3 +
 build/bundle/packages/gtk+.py                      |   27 +
 build/bundle/packages/gtk-quartz-engine.py         |   11 +
 build/bundle/packages/gtk-sharp.py                 |   33 +
 build/bundle/packages/hicolor-icon-theme.py        |    1 +
 build/bundle/packages/icon-naming-utils.py         |    1 +
 build/bundle/packages/ige-mac-integration-sharp.py |    3 +
 build/bundle/packages/ige-mac-integration.py       |    1 +
 build/bundle/packages/intltool.py                  |    1 +
 build/bundle/packages/libglade.py                  |    1 +
 build/bundle/packages/libiconv.py                  |    7 +
 build/bundle/packages/libjpeg.py                   |    6 +
 build/bundle/packages/libogg.py                    |    1 +
 build/bundle/packages/liboil.py                    |    8 +
 build/bundle/packages/libpng.py                    |    3 +
 build/bundle/packages/libproxy.py                  |    3 +
 build/bundle/packages/librsvg.py                   |    1 +
 build/bundle/packages/libsoup.py                   |    5 +
 build/bundle/packages/libtheora.py                 |    1 +
 build/bundle/packages/libtool.py                   |    1 +
 build/bundle/packages/libvorbis.py                 |    1 +
 build/bundle/packages/libxml2.py                   |    6 +
 build/bundle/packages/moblin-icon-theme.py         |   22 +
 build/bundle/packages/mono-addins.py               |    4 +
 build/bundle/packages/mono.py                      |   26 +
 build/bundle/packages/murrine.py                   |   14 +
 build/bundle/packages/ndesk-dbus-glib.py           |    3 +
 build/bundle/packages/ndesk-dbus.py                |    3 +
 build/bundle/packages/pango.py                     |   21 +
 .../packages/patches/mono-runtime-relocation.patch |   70 +
 build/bundle/packages/patches/murrine-osx.patch    |   43 +
 build/bundle/packages/pixman.py                    |    1 +
 build/bundle/packages/pkg-config.py                |    1 +
 build/bundle/packages/speex.py                     |    1 +
 build/bundle/packages/sqlite.py                    |    3 +
 build/bundle/packages/taglib-sharp.py              |    4 +
 build/bundle/packages/taglib.py                    |    3 +
 build/bundle/packages/tango-icon-theme.py          |    4 +
 build/bundle/packages/wavpack.py                   |    3 +
 build/bundle/profile.darwin.py                     |   66 +
 build/bundle/profile.linux.py                      |   16 +
 build/bundle/profile.mingw-cross.py                |   47 +
 build/bundle/skeleton.darwin/Contents/Info.plist   |   30 +
 .../Contents/Resources/Banshee.icns                |  Bin 0 -> 165218 bytes
 .../Contents/Resources/etc/gtk-2.0/gtkrc           |  318 +++
 build/bundle/solitary/AssemblyItem.cs              |  175 ++
 build/bundle/solitary/DataItem.cs                  |   40 +
 build/bundle/solitary/Entry.cs                     |   91 +
 build/bundle/solitary/Item.cs                      |  168 ++
 build/bundle/solitary/Makefile                     |   23 +
 build/bundle/solitary/NativeLibraryItem.cs         |  117 +
 build/bundle/solitary/PathExtensions.cs            |   53 +
 build/bundle/solitary/ProcessTools.cs              |  109 +
 build/bundle/solitary/Solitary.cs                  |  173 ++
 build/bundle/solitary/SymlinkItem.cs               |   68 +
 build/m4/banshee/bnpx11.m4                         |    1 +
 build/m4/banshee/dap-mtp.m4                        |    2 +
 build/m4/banshee/gio.m4                            |    4 +
 build/osx/README                                   |   14 +
 build/osx/autogen.sh                               |   39 -
 build/osx/build-deps.profile                       |    3 -
 build/osx/build-deps.sh                            |  159 --
 build/osx/build.env                                |   35 -
 build/osx/targets/bundle-00-base-libs.targets      |    7 -
 build/osx/targets/bundle-10-xiph-libs.targets      |   11 -
 build/osx/targets/bundle-20-extra-libs.targets     |    5 -
 build/osx/targets/bundle-30-gstreamer.targets      |   16 -
 build/osx/targets/bundle-40-managed-libs.targets   |    9 -
 build/pkg-config/banshee-1-nowplaying.pc.in        |   10 +
 build/tango/README                                 |    5 -
 build/tango/build-icon-theme                       |   35 -
 build/tango/extract-icon-theme                     |   29 -
 configure.ac                                       |   12 +-
 data/Makefile.am                                   |    2 +-
 data/addin-xml-strings.cs                          |   96 +-
 po/POTFILES.in                                     |    7 +-
 po/ca.po                                           | 2720 ++++++++++++++------
 po/es.po                                           |  827 +++++--
 po/fi.po                                           | 2343 +++++++++++++-----
 po/it.po                                           | 2170 ++++++++++++----
 po/sl.po                                           | 1556 +++++++----
 po/sv.po                                           | 2213 ++++++++++++----
 src/AssemblyInfo.cs.in                             |    2 +-
 .../Banshee.GStreamer/Banshee.GStreamer/Service.cs |    4 +-
 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 +-
 .../Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs  |    5 +-
 src/Clients/Booter/Makefile.am                     |    9 +
 src/Clients/Booter/banshee-1.darwin.in             |   84 +
 .../Booter/{banshee-1.in => banshee-1.linux.in}    |    1 -
 src/Clients/Nereid/Nereid/PlayerInterface.cs       |    9 +-
 src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs |    2 +
 .../Banshee.Core/Banshee.Base/FileNamePattern.cs   |  256 +--
 src/Core/Banshee.Core/Banshee.Base/Paths.cs        |   14 +-
 .../Banshee.Core/Banshee.Base/PlatformHacks.cs     |   33 -
 .../Banshee.Collection/SampleTrackInfo.cs          |    2 +
 .../Banshee.Core/Banshee.Collection/TrackInfo.cs   |  203 +--
 src/Core/Banshee.Core/Banshee.Core.csproj          |    2 -
 src/Core/Banshee.Core/Banshee.IO/Provider.cs       |   31 +-
 .../Banshee.Core/Banshee.Streaming/StreamTagger.cs |   15 +-
 src/Core/Banshee.Core/Makefile.am                  |    5 -
 src/Core/Banshee.Core/Resources/contributors.xml   |   12 +-
 src/Core/Banshee.Core/Resources/translators.xml    |    2 +-
 .../DatabaseTrackInfo.cs                           |   11 +-
 .../DatabaseTrackListModel.cs                      |   13 +-
 .../Banshee.Collection/BansheeListModel.cs         |    9 +-
 .../Banshee.Collection/FilterListModel.cs          |    3 +-
 .../Banshee.Database/BansheeDbConnection.cs        |    4 +-
 .../Banshee.Hardware/HardwareManager.cs            |    2 +-
 .../Banshee.Library/HomeDirectoryImportSource.cs   |    2 +-
 .../Banshee.Library}/LibrarySchema.cs              |    5 +-
 .../Banshee.Library/LibrarySource.cs               |   10 +-
 .../Banshee.Library/MusicFileNamePattern.cs        |  166 ++
 .../Banshee.Library/MusicLibrarySource.cs          |   23 +-
 .../Banshee.Library}/Tests/FileNamePatternTests.cs |    4 +-
 .../Banshee.Library/ThreadPoolImportSource.cs      |    2 +-
 .../Banshee.Library/VideoLibrarySource.cs          |    2 +-
 .../Banshee.MediaProfiles/Pipeline.cs              |    1 +
 .../FileSystemQueryJob.cs                          |    2 +-
 .../Banshee.Metadata/MetadataService.cs            |    4 +-
 .../Banshee.Metadata/SaveTrackMetadataJob.cs       |    2 +-
 .../Tests/TaglibReadWriteTests.cs                  |    2 +-
 .../PlaybackControllerService.cs                   |   14 +
 .../PlaylistFormatBase.cs                          |    2 +
 .../Banshee.Playlists.Formats/PlaylistParser.cs    |    2 +
 .../Banshee.Playlists.Formats/PlsPlaylistFormat.cs |    2 +
 .../Tests/PlaylistFormatTests.cs                   |   90 +-
 .../Banshee.ServiceStack/Application.cs            |    2 +
 src/Core/Banshee.Services/Banshee.Services.csproj  |    2 -
 .../Banshee.Sources/ErrorSource.cs                 |    5 +-
 .../Banshee.Sources/PrimarySource.cs               |   14 +-
 .../Banshee.Sources/SourceManager.cs               |   10 +-
 src/Core/Banshee.Services/Banshee.Web/Browser.cs   |    2 +-
 src/Core/Banshee.Services/Makefile.am              |    6 +-
 .../Banshee.Addins.Gui/AddinDetailsDialog.cs       |   96 -
 .../Banshee.Addins.Gui/AddinTile.cs                |  225 --
 .../Banshee.Addins.Gui/AddinView.cs                |  272 +--
 .../Banshee.Gui.Dialogs/AboutDialog.cs             |    6 +-
 .../Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs   |    5 +-
 .../DefaultApplicationHelperDialog.cs              |    2 +-
 .../Banshee.Gui.Widgets/ConnectedMessageBar.cs     |    5 +-
 .../Banshee.Gui.Widgets/UserJobTile.cs             |    6 +-
 .../Banshee.Gui.Widgets/UserJobTileHost.cs         |    8 +-
 .../Banshee.Gui/BansheeActionGroup.cs              |  130 +-
 .../Banshee.Gui/BaseClientWindow.cs                |    2 +
 .../Banshee.Gui/GtkBaseClient.cs                   |    5 +-
 .../Banshee.Gui/InterfaceActionService.cs          |  129 +-
 .../Banshee.Gui/PlaybackActions.cs                 |    7 +-
 .../Banshee.Gui/SourceActions.cs                   |    8 +-
 .../Banshee.Gui/TrackActions.cs                    |   10 +-
 .../Banshee.Library.Gui/FileImportSource.cs        |    6 +-
 .../Banshee.Library.Gui/FolderImportSource.cs      |    4 +-
 .../Banshee.Library.Gui/ImportDialog.cs            |   22 +-
 .../Banshee.Library.Gui/PhotoFolderImportSource.cs |    2 +-
 .../ProfileConfigurationDialog.cs                  |    2 +
 .../DefaultPreferenceWidgets.cs                    |   62 +-
 .../Banshee.Preferences.Gui/WidgetFactory.cs       |    4 +-
 .../Banshee.SmartPlaylist.Gui/Editor.cs            |    1 +
 .../FilteredListSourceContents.cs                  |    5 +-
 .../Banshee.Sources.Gui/SourceComboBox.cs          |    6 +-
 .../Banshee.Sources.Gui/SourceModel.cs             |   10 +-
 .../Banshee.Sources.Gui/SourceView.cs              |   11 +-
 .../Banshee.Sources.Gui/SourceView_DragAndDrop.cs  |    4 +-
 .../Banshee.ThickClient/Banshee.ThickClient.csproj |    3 -
 src/Core/Banshee.ThickClient/Makefile.am           |    3 -
 src/Core/Banshee.Widgets/Banshee.Widgets.csproj    |    2 -
 src/Core/Banshee.Widgets/Makefile.am               |    2 -
 .../Banshee.Dap.Ipod/Banshee.Dap.Ipod.addin.xml    |    4 +-
 .../Banshee.Dap.Ipod/UnsupportedDatabaseView.cs    |    2 +
 .../Banshee.Dap.Karma/Banshee.Dap.Karma.addin.xml  |    4 +-
 .../Banshee.Dap.MassStorage.addin.xml              |    7 +-
 .../Banshee.Dap.MassStorage/AndroidDevice.cs       |    2 +-
 .../Banshee.Dap.MassStorage/MassStorageSource.cs   |    9 +-
 src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.addin.xml  |    4 +-
 src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs  |    4 +-
 src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapInfoBar.cs  |    3 +-
 src/Dap/Banshee.Dap/Banshee.Dap.addin.xml          |    1 -
 src/Dap/Banshee.Dap/Banshee.Dap/DapLibrarySync.cs  |    2 +-
 src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs         |    4 +-
 .../Banshee.AudioCd/Banshee.AudioCd.addin.xml      |    4 +-
 .../Banshee.AudioCd/AudioCdRipper.cs               |    7 +-
 .../Banshee.Audiobook/Banshee.Audiobook.addin.xml  |    4 +-
 .../Banshee.Audiobook/Banshee.Audiobook.csproj     |    2 +-
 .../Banshee.Audiobook/AudiobookFileNamePattern.cs  |  148 ++
 .../Banshee.Audiobook/AudiobookLibrarySource.cs    |   10 +-
 src/Extensions/Banshee.Audiobook/Makefile.am       |    4 +-
 .../Banshee.BooScript/Banshee.BooScript.addin.xml  |    4 +-
 .../Banshee.Bookmarks/Banshee.Bookmarks.addin.xml  |    4 +-
 .../Banshee.Bookmarks/BookmarksService.cs          |    6 +-
 src/Extensions/Banshee.Bpm/Banshee.Bpm.addin.xml   |    4 +-
 .../Banshee.CoverArt/Banshee.CoverArt.addin.xml    |    4 +-
 .../Banshee.CoverArt/CoverArtService.cs            |    7 +-
 src/Extensions/Banshee.Daap/Banshee.Daap.addin.xml |    4 +-
 .../Banshee.Daap/Banshee.Daap/DaapService.cs       |    3 +-
 .../Banshee.Emusic/Banshee.Emusic.addin.xml        |   27 +
 .../Banshee.Emusic/Banshee.Emusic.csproj           |   76 +
 .../DownloadManager/DownloadManagerInterface.cs    |  153 ++
 .../DownloadManager/DownloadUserJob.cs             |  144 +
 .../Banshee.Emusic/Banshee.Emusic/EmusicImport.cs  |   93 +
 .../Banshee.Emusic/Banshee.Emusic/EmusicService.cs |  158 ++
 src/Extensions/Banshee.Emusic/Makefile.am          |   15 +
 .../Banshee.FileSystemQueue.addin.xml              |    6 +-
 .../FileSystemQueueSource.cs                       |    4 +-
 .../Banshee.InternetArchive.addin.xml              |    2 +-
 .../Banshee.InternetArchive/DetailsSource.cs       |    1 +
 .../Banshee.InternetArchive/SearchSource.cs        |    1 +
 .../InternetArchive/Search.cs                      |    3 +-
 .../Banshee.InternetRadio.addin.xml                |    4 +-
 .../Banshee.Lastfm.Radio/LastfmActions.cs          |    3 +
 .../Banshee.Lastfm.Radio/LastfmSource.cs           |    5 +
 .../Banshee.Lastfm.Radio/LastfmSourceContents.cs   |    9 +-
 .../Banshee.Lastfm.Radio/LastfmTrackInfo.cs        |    2 +
 .../Banshee.Lastfm.Radio/StationEditor.cs          |    3 +-
 .../RecommendationPane.cs                          |    2 +-
 .../Banshee.Lastfm/Banshee.Lastfm.addin.xml        |    4 +-
 .../Banshee.MiniMode/Banshee.MiniMode.addin.xml    |    3 +-
 .../Banshee.MiniMode/SourceModel.cs                |    4 +-
 .../Banshee.Moblin/Banshee.Moblin.addin.xml        |    1 -
 .../Banshee.MultimediaKeys.addin.xml               |    4 +-
 .../MultimediaKeysService.cs                       |    2 +-
 .../Banshee.NotificationArea.addin.xml             |    4 +-
 .../X11NotificationAreaBox.cs                      |    8 +
 .../Banshee.NowPlaying/NowPlayingContents.cs       |   22 +-
 .../Banshee.NowPlaying/NowPlayingInterface.cs      |   21 +-
 .../Banshee.NowPlaying/NowPlayingSource.cs         |   16 +
 .../Banshee.PlayQueue/Banshee.PlayQueue.addin.xml  |    4 +-
 .../Banshee.PlayQueue/PlayQueueActions.cs          |    5 +-
 .../Banshee.PlayerMigration.addin.xml              |    4 +-
 .../ItunesPlayerImportDialogs.cs                   |   18 +-
 .../ItunesPlayerImportSource.cs                    |    3 +
 .../Banshee.Podcasting.Data/PodcastSource.cs       |    1 +
 .../Banshee.Podcasting.Gui/PodcastActions.cs       |    4 +-
 .../Banshee.Podcasting.addin.xml                   |    4 +-
 .../Banshee.Podcasting/PodcastService.cs           |    3 +-
 .../Banshee.Torrent/Banshee.Torrent.addin.xml      |    4 +-
 .../Banshee.Wikipedia/Banshee.Wikipedia.addin.xml  |    4 +-
 src/Extensions/Banshee.Wikipedia/Makefile.am       |    2 +-
 src/Extensions/Makefile.am                         |    1 +
 src/Libraries/Hyena.Gui/Hyena.Gui.csproj           |    7 +-
 src/Libraries/Hyena.Gui/Hyena.Gui/ActionManager.cs |  170 ++
 .../Hyena.Gui/Hyena.Gui}/DragDropList.cs           |    2 +-
 .../Hyena.Gui/Hyena.Gui/HyenaActionGroup.cs        |  175 ++
 .../Hyena.Gui/Hyena.Widgets/GenericToolItem.cs}    |   19 +-
 .../Hyena.Gui/Hyena.Widgets}/HigMessageDialog.cs   |   54 +-
 src/Libraries/Hyena.Gui/Makefile.am                |    5 +
 src/Libraries/Hyena/Hyena.Collections/LruCache.cs  |   38 +-
 src/Libraries/Hyena/Hyena.csproj                   |    3 +
 .../Hyena/Hyena}/ApplicationContext.cs             |   37 +-
 .../Hyena/Hyena}/ThreadAssist.cs                   |   13 +-
 src/Libraries/Hyena/Hyena/UndoManager.cs           |   24 +-
 .../Hyena/Hyena}/XdgBaseDirectorySpec.cs           |   14 +-
 src/Libraries/Hyena/Makefile.am                    |    5 +-
 src/Libraries/Migo/Migo.Net/AsyncWebClient.cs      |    1 +
 src/Libraries/Migo/Migo.Syndication/Feed.cs        |    1 +
 .../Media.Playlists.Xspf/Tests/XspfTests.cs        |   31 +-
 src/Libraries/Mtp/Makefile.am                      |    4 +
 src/Libraries/Mtp/Mtp/AbstractTrackList.cs         |    2 +-
 src/Libraries/Mtp/Mtp/Album.cs                     |   38 +-
 src/Libraries/Mtp/Mtp/Error.cs                     |   94 +-
 src/Libraries/Mtp/Mtp/ErrorCode.cs                 |   42 +-
 src/Libraries/Mtp/Mtp/FileSampleData.cs            |   32 +-
 src/Libraries/Mtp/Mtp/FileType.cs                  |   90 +-
 src/Libraries/Mtp/Mtp/Folder.cs                    |  462 ++--
 src/Libraries/Mtp/Mtp/MtpDevice.cs                 |  848 +++---
 src/Libraries/Mtp/Mtp/Playlist.cs                  |   44 +-
 src/Libraries/Mtp/Mtp/Track.cs                     |  470 ++--
 tests/Makefile.am                                  |    4 +
 .../Mono.Media/xspf/{xspf-1.xsd => xspf-1_0.2.xsd} |  249 +-
 301 files changed, 15096 insertions(+), 6471 deletions(-)
---
diff --cc data/addin-xml-strings.cs
index e3e4eae,790cea2..c27e2dc
--- a/data/addin-xml-strings.cs
+++ b/data/addin-xml-strings.cs
@@@ -110,17 -115,13 +115,18 @@@ internal static class AddinXmlStringCat
  
          // ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.addin.xml
          Catalog.GetString (@"Last.fm Radio and Scrobbling");
-         Catalog.GetString (@"Provides tightly integrated Last.fm streaming radio and community features.");
-         Catalog.GetString (@"User Interface");
+         Catalog.GetString (@"Last.fm streaming radio, scrobbling, and context pane recommendations.");
+         Catalog.GetString (@"Online Sources");
  
 +        // ../src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.addin.xml
 +        Catalog.GetString (@"Library Watcher");
 +        Catalog.GetString (@"Automatically update music and video libraries");
 +        Catalog.GetString (@"Hardware");
 +
          // ../src/Extensions/Banshee.MiniMode/Banshee.MiniMode.addin.xml
          Catalog.GetString (@"Mini Mode");
-         Catalog.GetString (@"Mini Mode allows controlling Banshee through a small window with only playback controls and track information.");
+         Catalog.GetString (@"Control Banshee through a small window with only playback controls and track information.");
+         Catalog.GetString (@"Utilities");
  
          // ../src/Extensions/Banshee.Moblin/Banshee.Moblin.addin.xml
          Catalog.GetString (@"Moblin Support");



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]