[banshee: 17/27] Merge branch 'master' into lastfm-split
- From: Bertrand Lorentz <blorentz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee: 17/27] Merge branch 'master' into lastfm-split
- Date: Sat, 22 May 2010 18:52:59 +0000 (UTC)
commit 0f19a846cccb9a5c755309d8fb3ac9f5760b48df
Merge: b8d2451 680c9e6
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date: Sat May 22 11:22:21 2010 +0200
Merge branch 'master' into lastfm-split
Conflicts:
po/POTFILES.in
src/Extensions/Banshee.Lastfm/Banshee.Lastfm.csproj
src/Extensions/Banshee.Lastfm/Makefile.am
.gitignore | 1 +
Banshee.sln | 16 +-
Makefile.am | 32 +-
NEWS | 217 +-
banshee.doap | 12 +-
build/build.environment.mk | 4 +-
configure.ac | 20 +-
data/addin-xml-strings.cs | 5 -
extras/metrics/Database.cs | 1 +
extras/metrics/Main.cs | 2 +-
extras/metrics/Metrics.csproj | 51 +
extras/monitor-meego | 8 +
extras/push-meego | 53 +
libbanshee/banshee-player-pipeline.c | 9 +
libbanshee/banshee-player-private.h | 6 +
libbanshee/banshee-player-video.c | 10 +
libbanshee/banshee-player.c | 48 +-
libbanshee/banshee-transcoder.c | 13 +-
po/POTFILES.in | 7 +-
po/cs.po | 822 +-
po/da.po | 332 +-
po/de.po | 1107 +-
po/en_GB.po | 5 +
po/es.po | 362 +-
po/fi.po | 5 +
po/ja.po | 5 +
po/ko.po | 5 +
po/lt.po | 317 +-
po/nl.po | 529 +-
po/pt.po | 447 +-
po/pt_BR.po | 629 +-
po/sl.po |13816 +++++++++-----------
po/zh_TW.po | 5 +
profile-configure | 1 -
.../Banshee.GStreamer/PlayerEngine.cs | 41 +-
.../Banshee.GStreamer/Transcoder.cs | 4 +-
.../GConfConfigurationClient.cs | 7 +
.../Banshee.NowPlaying.X11/FullscreenAdapter.cs | 89 +-
src/Clients/Beroe/Beroe/IndexerClient.cs | 2 +
src/Clients/Booter/Booter/Entry.cs | 3 +
src/Clients/Halie/Halie/Client.cs | 2 +
src/Clients/Makefile.am | 3 +-
.../MeeGo/Banshee.MeeGo.Client/MeeGoClient.cs | 84 +
src/Clients/MeeGo/Makefile.am | 10 +
.../MeeGo/MeeGo.csproj} | 77 +-
src/Clients/Nereid/Nereid/PlayerInterface.cs | 71 +-
src/Clients/Nereid/Nereid/ViewContainer.cs | 55 +-
src/Core/Banshee.Core/Banshee.Base/CoverArtSpec.cs | 6 +-
src/Core/Banshee.Core/Banshee.Base/LegacyPaths.cs | 46 +
.../Banshee.Collection/TrackFilterType.cs | 1 +
.../Banshee.Core/Banshee.Collection/TrackInfo.cs | 20 +-
.../XmlConfigurationClient.cs | 16 +-
src/Core/Banshee.Core/Banshee.Core.csproj | 1 -
.../Banshee.Core/Banshee.Streaming/StreamTagger.cs | 6 +
src/Core/Banshee.Core/Makefile.am | 2 +-
src/Core/Banshee.Core/Resources/translators.xml | 4 +-
.../Banshee.Collection.Database/Bookmark.cs | 175 +
.../DatabaseAlbumInfo.cs | 13 +
.../DatabaseArtistInfo.cs | 15 +
.../DatabaseFilterListModel.cs | 60 +-
.../DatabaseTrackInfo.cs | 62 +-
.../Banshee.Collection/AlbumListModel.cs | 8 +-
.../Banshee.Collection/ArtistListModel.cs | 8 +-
.../Banshee.Collection/FilterListModel.cs | 19 +-
.../Banshee.Collection/TrackListModel.cs | 4 +-
.../Banshee.Database/BansheeDbFormatMigrator.cs | 4 +-
.../Banshee.Library/LibrarySource.cs | 2 +-
.../Banshee.Library/Tests/FileNamePatternTests.cs | 12 +-
.../Banshee.MediaEngine/PlayerEngine.cs | 1 +
.../Banshee.MediaEngine/PlayerEngineService.cs | 3 +-
.../Banshee.MediaEngine/PlayerEvent.cs | 3 +-
.../Banshee.MediaEngine/TranscoderService.cs | 1 +
.../Banshee.MediaProfiles/MediaProfileManager.cs | 2 +-
.../PlaylistFormatBase.cs | 15 +-
.../Banshee.ServiceStack/Application.cs | 2 +-
src/Core/Banshee.Services/Banshee.Services.csproj | 1 +
.../Banshee.SmartPlaylist/SmartPlaylistSource.cs | 4 +
.../Banshee.Sources/PrimarySource.cs | 21 +-
.../Banshee.Services/Banshee.Sources/Source.cs | 4 +-
src/Core/Banshee.Services/Makefile.am | 1 +
.../Banshee.Collection.Gui/ArtworkManager.cs | 15 +-
.../Banshee.Collection.Gui/ColumnCellAlbum.cs | 10 +-
.../Banshee.Collection.Gui/CoverArtEditor.cs | 1 +
.../Banshee.Collection.Gui/DataViewChildAlbum.cs | 10 +-
.../DefaultColumnController.cs | 2 +-
.../PersistentColumnController.cs | 17 +-
.../Banshee.Gui.Dialogs/BansheeDialog.cs | 25 +-
.../Banshee.Gui.Dialogs/SeekDialog.cs | 5 +-
.../Banshee.Gui.TrackEditor/TrackEditorDialog.cs | 11 +-
.../Banshee.Gui.Widgets/ClassicTrackInfoDisplay.cs | 15 +-
.../Banshee.Gui.Widgets/ConnectedSeekSlider.cs | 10 +-
.../Banshee.Gui.Widgets/ConnectedVolumeButton.cs | 4 +-
.../Banshee.Gui.Widgets/CoverArtDisplay.cs | 4 +-
.../Banshee.Gui.Widgets/NextButton.cs | 6 +-
.../Banshee.Gui.Widgets/TrackInfoDisplay.cs | 81 +-
.../Banshee.Gui.Widgets/UserJobTile.cs | 5 +-
.../Banshee.Gui/BansheeIconFactory.cs | 2 +-
.../Banshee.Gui/BaseClientWindow.cs | 31 +-
.../Banshee.ThickClient/Banshee.Gui/BookmarkUI.cs | 211 +
.../Banshee.Gui/BookmarksService.cs | 69 +
.../Banshee.Gui/CommonServices.cs | 1 +
.../Banshee.Gui/GtkBaseClient.cs | 31 +-
.../Banshee.Gui/IClientWindow.cs | 1 +
.../Banshee.Gui/SourceActions.cs | 1 +
.../Banshee.Gui/TrackActions.cs | 66 +-
.../Banshee.Library.Gui/ImportDialog.cs | 23 +-
.../Banshee.Library.Gui/PhotoFolderImportSource.cs | 2 +
.../Banshee.Sources.Gui/SourceRowRenderer.cs | 22 +-
.../Banshee.Sources.Gui/SourceView.cs | 15 +-
.../Banshee.ThickClient/Banshee.ThickClient.csproj | 2 +
src/Core/Banshee.ThickClient/Makefile.am | 2 +
.../Resources/BookmarksMenu.xml | 0
.../Banshee.Dap.Ipod/IpodSource.cs | 6 +-
.../Banshee.Dap.Ipod/UnsupportedDatabaseView.cs | 2 +-
.../Banshee.Dap.MassStorage.addin.xml | 3 +-
.../Banshee.Dap.MassStorage/MassStorageSource.cs | 13 +-
.../Banshee.Audiobook/Banshee.Audiobook.csproj | 17 +-
.../Banshee.Audiobook/Banshee.Audiobook/Actions.cs | 198 +
.../Banshee.Audiobook/AudiobookContent.cs | 98 +
.../Banshee.Audiobook/AudiobookGrid.cs | 90 +
.../Banshee.Audiobook/AudiobookLibrarySource.cs | 303 +-
.../Banshee.Audiobook/AudiobookModel.cs | 59 +
.../Banshee.Audiobook/BookCover.cs | 57 +
.../Banshee.Audiobook/BookPlaylist.cs | 72 +
.../Banshee.Audiobook/BookView.cs | 249 +
src/Extensions/Banshee.Audiobook/Makefile.am | 14 +-
.../Banshee.Audiobook/Resources/ActiveSourceUI.xml | 11 +
.../Banshee.Audiobook/Resources/GlobalUI.xml | 10 +
.../Banshee.Bookmarks/Banshee.Bookmarks.addin.xml | 22 -
.../Banshee.Bookmarks/BookmarksService.cs | 348 -
src/Extensions/Banshee.Bookmarks/Makefile.am | 13 -
.../Banshee.Daap/Banshee.Daap/DaapService.cs | 2 +-
.../Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs | 2 +-
.../Banshee.InternetArchive/DetailsSource.cs | 1 +
.../Banshee.InternetRadio/XspfMigrator.cs | 2 +-
.../Banshee.Lastfm.Audioscrobbler/Queue.cs | 2 +-
.../Banshee.Lastfm.Radio/LastfmPreferences.cs | 314 +
.../Banshee.Lastfm/Banshee.Lastfm.csproj | 1 +
.../Banshee.Lastfm/Banshee.Lastfm/LastfmSource.cs | 104 +-
.../LibraryWatcherService.cs | 8 +
.../Banshee.MeeGo/Banshee.MeeGo.addin.xml | 4 +-
.../Banshee.MeeGo/MediaPanelContents.cs | 7 +-
.../Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs | 18 +-
.../Banshee.MeeGo/Banshee.MeeGo/MeeGoService.cs | 60 +-
.../Banshee.MeeGo/Banshee.MeeGo/MeeGoTheme.cs | 104 +-
.../NotificationAreaService.cs | 31 +-
.../Banshee.NowPlaying/FullscreenAdapter.cs | 14 +-
.../Banshee.NowPlaying/FullscreenWindow.cs | 4 +-
.../Banshee.NowPlaying/IFullscreenAdapter.cs | 3 +-
.../Banshee.NowPlaying/NowPlayingContents.cs | 12 +-
.../Banshee.NowPlaying/NowPlayingInterface.cs | 33 +-
.../Banshee.NowPlaying/NowPlayingSource.cs | 7 +
.../Banshee.NowPlaying/OverlayWindow.cs | 4 +-
.../Banshee.NowPlaying/XOverlayVideoDisplay.cs | 35 +-
.../AmarokPlayerImportSource.cs | 1 +
.../RhythmboxPlayerImportSource.cs | 8 +-
.../Dialog/PodcastFeedPropertiesDialog.cs | 2 -
.../Banshee.YouTube.Data/DataFetch.cs | 2 +-
.../Banshee.YouTube.Gui/YouTubeTile.cs | 2 +-
src/Extensions/Makefile.am | 1 -
.../Accessibility/ListViewAccessible.cs | 19 +-
.../ListView/ListView_Interaction.cs | 6 +-
.../Hyena.Data.Gui/ListView/ListView_Model.cs | 10 +-
.../Hyena.Data.Gui/ListView/ListView_Rendering.cs | 8 +-
.../Hyena.Gui/Hyena.Gui.Theming/GtkTheme.cs | 92 +-
src/Libraries/Hyena.Gui/Hyena.Gui.Theming/Theme.cs | 14 +-
.../Hyena.Gui/Hyena.Gui.Theming/ThemeContext.cs | 2 +
.../Hyena.Gui/Hyena.Gui.Theming/ThemeTestModule.cs | 103 +
src/Libraries/Hyena.Gui/Hyena.Gui.csproj | 1 +
.../Hyena.Gui/Hyena.Widgets/ComplexMenuItem.cs | 4 +
.../Hyena.Gui/Hyena.Widgets/HigMessageDialog.cs | 9 +-
.../Hyena.Gui/Hyena.Widgets/ImageButton.cs | 5 +
.../Hyena.Gui/Hyena.Widgets/MenuButton.cs | 4 +-
.../Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs | 4 +
.../Hyena.Gui/Hyena.Widgets/RoundedFrame.cs | 8 +-
src/Libraries/Hyena.Gui/Makefile.am | 1 +
.../Hyena/Hyena.Collections/SelectionProxy.cs | 22 +-
.../Hyena.Data.Sqlite/HyenaSqliteConnection.cs | 2 +-
.../Hyena/Hyena.Data.Sqlite/SqliteModelProvider.cs | 2 +-
.../Hyena/Hyena.Data.Sqlite/SqliteUtils.cs | 20 +
src/Libraries/Hyena/Hyena.Data/BaseListModel.cs | 7 +-
.../Hyena/Hyena.Data/ColumnDescription.cs | 2 +
src/Libraries/Hyena/Hyena.Data/MemoryListModel.cs | 6 +-
src/Libraries/Hyena/Hyena.csproj | 1 +
src/Libraries/Hyena/Hyena/Log.cs | 2 +-
.../Hyena/Hyena}/Paths.cs | 92 +-
src/Libraries/Hyena/Makefile.am | 1 +
src/nuke-dev-keys | 3 +
188 files changed, 12663 insertions(+), 10752 deletions(-)
---
diff --cc po/POTFILES.in
index 7d04b1b,37a96cf..3b2ccae
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -226,12 -232,8 +228,13 @@@ src/Extensions/Banshee.Lastfm/Banshee.L
src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/ContextPage.cs
src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/RecommendationPane.cs
src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Recommendations/SimilarArtistTile.cs
+src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs
+src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingService.cs
+src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs
+src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs
+src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationType.cs
src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MediaPanelContents.cs
+ src/Extensions/Banshee.MeeGo/Banshee.MeeGo/MeeGoPanel.cs
src/Extensions/Banshee.MeeGo/Banshee.MeeGo/SearchEntry.cs
src/Extensions/Banshee.MeeGo/meego-panel-banshee.desktop.in.in
src/Extensions/Banshee.MiniMode/Banshee.MiniMode.addin.xml
diff --cc src/Extensions/Banshee.Lastfm/Banshee.Lastfm.csproj
index bcad22c,668f10e..834f9d3
--- a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.csproj
+++ b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.csproj
@@@ -92,10 -99,8 +92,11 @@@
<Compile Include="Banshee.Lastfm.Recommendations\ContextPage.cs" />
<Compile Include="Banshee.Lastfm.Recommendations\RecommendationPane.cs" />
<Compile Include="Banshee.Lastfm.Recommendations\SimilarArtistTile.cs" />
+ <Compile Include="Banshee.Lastfm\LastfmActions.cs" />
+ <Compile Include="Banshee.Lastfm\LastfmColumnController.cs" />
+ <Compile Include="Banshee.Lastfm\LastfmSource.cs" />
+ <Compile Include="Banshee.Lastfm\LastfmSourceContents.cs" />
+ <Compile Include="Banshee.Lastfm.Radio\LastfmPreferences.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Banshee.Lastfm.addin.xml">
diff --cc src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSource.cs
index 2c470e2,23f1fcc..cc22759
--- a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSource.cs
+++ b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmSource.cs
@@@ -107,9 -114,11 +109,9 @@@ namespace Banshee.Lastf
Properties.Set<bool> ("Nereid.SourceContents.HeaderVisible", false);
actions = new LastfmActions (this);
- InstallPreferences ();
+ preferences = new LastfmPreferences (this);
ServiceManager.SourceManager.AddSource (this);
-
- ServiceManager.Get<DBusCommandService> ().ArgumentPushed += OnCommandLineArgument;
}
public void Dispose ()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
